diff options
| author | Pierre Bourdon <delroth@gmail.com> | 2014-12-20 16:47:55 +0100 |
|---|---|---|
| committer | Pierre Bourdon <delroth@gmail.com> | 2014-12-20 16:47:55 +0100 |
| commit | dad791121427f2d3f076756d1b3c10130740dc63 (patch) | |
| tree | 8a74b385f3b9c913b5f20d747e72e36d76cf19df /Source/Core/Common/MemArena.cpp | |
| parent | cee4a85a12205ba801659854b66126e74fe9c10d (diff) | |
| parent | a53c5217bb8e5f724821efc764eec78b97926361 (diff) | |
Merge pull request #1486 from rohit-n/goto
Remove some gotos.
Diffstat (limited to 'Source/Core/Common/MemArena.cpp')
| -rw-r--r-- | Source/Core/Common/MemArena.cpp | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/Source/Core/Common/MemArena.cpp b/Source/Core/Common/MemArena.cpp index a227c49501..544f9354cf 100644 --- a/Source/Core/Common/MemArena.cpp +++ b/Source/Core/Common/MemArena.cpp @@ -208,18 +208,17 @@ static bool Memory_TryBase(u8 *base, MemoryView *views, int num_views, u32 flags } if (!view->view_ptr) - goto bail; + { + // Argh! ERROR! Free what we grabbed so far so we can try again. + MemoryMap_Shutdown(views, i+1, flags, arena); + return false; + } if (view->out_ptr) *(view->out_ptr) = (u8*) view->view_ptr; } return true; - -bail: - // Argh! ERROR! Free what we grabbed so far so we can try again. - MemoryMap_Shutdown(views, i+1, flags, arena); - return false; } static u32 MemoryMap_InitializeViews(MemoryView *views, int num_views, u32 flags) |