From: Ivan Maidanski <ivmai@mail.ru>
Date: Sun, 5 Mar 2017 05:22:39 +0000 (+0300)
Subject: Eliminate 'condition ret==NULL always true' cppcheck style warning (Amiga)
X-Git-Tag: v8.0.0~888
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=dc590cf006271e42eb4e9b6dfd1c4778696c2d34;p=gc

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.
---

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)();