Changeset 592 for trunk/src/sh_mem.c

Timestamp:

Oct 31, 2026, 7:16:07 PM (3 days ago)

Author:

katerina

Message:

Fixes for compiler warnings.

File:

• trunk/src/sh_mem.c (modified) (5 diffs)

trunk/src/sh_mem.c

@@ -150 +150 @@
     {
       memlist_t   * merr = calloc(1,sizeof(memlist_t));
-
-      memcpy(merr, this, sizeof(memlist_t));
-      merr->next = merrlist;
-      merrlist   = merr;
-
+      if (merr) {
+          memcpy(merr, this, sizeof(memlist_t));
+          merr->next = merrlist;
+          merrlist   = merr;
+        }
       this = this->next;
     }
@@ -198 +198 @@
         {
           merr = calloc (1,sizeof(memlist_t));
-
-          memcpy(merr, this, sizeof(memlist_t));
-          merr->size = 2;
-
-          merr->next = merrlist;
-          merrlist   = merr;
+          if (merr) {
+            memcpy(merr, this, sizeof(memlist_t));
+            merr->size = 2;
+            merr->next = merrlist;
+            merrlist   = merr;
+          }
         }
       else
@@ -210 +210 @@
             {
               merr = calloc(1, sizeof(memlist_t));
-              
-              memcpy(merr, this, sizeof(memlist_t));
-              merr->size = 1;
-              
-              merr->next = merrlist;
-              merrlist   = merr;
+              if (merr) {
+                memcpy(merr, this, sizeof(memlist_t));
+                merr->size = 1;
+                merr->next = merrlist;
+                merrlist   = merr;
+              }
             }
           if ( this->real_address[SH_MEMMULT-1] != CHECKBYTE )
             {
               merr = calloc(1, sizeof(memlist_t));
-              
-              memcpy(merr, this, sizeof(memlist_t));
-              merr->size = 0;
-              
-              merr->next = merrlist;
-              merrlist   = merr;
+              if (merr) {
+                memcpy(merr, this, sizeof(memlist_t));
+                merr->size = 0;
+                merr->next = merrlist;
+                merrlist   = merr;
+              }
             }
         }
@@ -378 +378 @@
         {
           merr = calloc(1, sizeof(memlist_t));
-
-          memcpy(merr, this, sizeof(memlist_t));
-          merr->size = 1;
-
-          merr->next = merrlist;
-          merrlist = merr;
+          if (merr) {
+            memcpy(merr, this, sizeof(memlist_t));
+            merr->size = 1;
+            merr->next = merrlist;
+            merrlist = merr;
+          }
         }
 
@@ -389 +389 @@
         {
           merr = calloc(1,sizeof(memlist_t));
-
-          memcpy(merr, this, sizeof(memlist_t));
-          merr->size = 0;
-
-          merr->next = merrlist;
-          merrlist = merr;
+          if (merr) {
+            memcpy(merr, this, sizeof(memlist_t));
+            merr->size = 0;
+            merr->next = merrlist;
+            merrlist = merr;
+          }
         }