diff options
| author | Ivan Maidanski <ivmai@mail.ru> | 2017-03-05 08:22:39 +0300 |
|---|---|---|
| committer | Ivan Maidanski <ivmai@mail.ru> | 2017-03-05 08:22:39 +0300 |
| commit | dc590cf006271e42eb4e9b6dfd1c4778696c2d34 (patch) | |
| tree | 837c8f3a66f0c65c6d83189f69e9ec3bf8599670 /extra | |
| parent | 8651400c1e6d8afe98f932bab6ade539d6bc4e4d (diff) | |
| download | bdwgc-dc590cf006271e42eb4e9b6dfd1c4778696c2d34.tar.gz | |
Eliminate 'condition ret==NULL always true' cppcheck style warning (Amiga)
* extra/AmigaOS.c [GC_AMIGA_FASTALLOC && !GC_AMIGA_ONLYFAST
&& GC_AMIGA_GC] (GC_amiga_allocwrapper_any): Do not check ret==NULL
twice.
* extra/AmigaOS.c [GC_AMIGA_FASTALLOC && GC_AMIGA_GC]
(GC_amiga_allocwrapper_fast): Likewise.
* extra/AmigaOS.c [GC_AMIGA_GC] (GC_amiga_realloc): Likewise.
Diffstat (limited to 'extra')
| -rw-r--r-- | extra/AmigaOS.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/extra/AmigaOS.c b/extra/AmigaOS.c index e7bc7079..549e20fb 100644 --- a/extra/AmigaOS.c +++ b/extra/AmigaOS.c @@ -371,8 +371,9 @@ void *GC_amiga_allocwrapper_any(size_t size,void *(*AllocFunction)(size_t size2) #endif ret=(*AllocFunction)(size); } + if(ret==NULL) #endif - if(ret==NULL){ + { GC_amiga_dontalloc=FALSE; ret=(*AllocFunction)(size); if(ret==NULL){ @@ -454,8 +455,9 @@ void *GC_amiga_allocwrapper_fast(size_t size,void *(*AllocFunction)(size_t size2 #endif ret=(*AllocFunction)(size); } + if(ret==NULL) #endif - if(ret==NULL){ + { #ifndef GC_AMIGA_ONLYFAST GC_AMIGA_MEMF=MEMF_ANY | MEMF_CLEAR; if(GC_amiga_toany!=NULL) (*GC_amiga_toany)(); @@ -507,8 +509,9 @@ void *GC_amiga_realloc(void *old_object,size_t new_size_in_bytes){ #endif ret=GC_realloc(old_object,new_size_in_bytes); } + if(ret==NULL) #endif - if(ret==NULL){ + { #ifndef GC_AMIGA_ONLYFAST GC_AMIGA_MEMF=MEMF_ANY | MEMF_CLEAR; if(GC_amiga_toany!=NULL) (*GC_amiga_toany)(); |