Changeset 26521

Timestamp:

Jan 5, 2010, 5:01:17 PM (16 years ago)

Author:

Paul Price

Message:

Fixing order of parameters following warning:
In function ‘memset’, inlined from ‘InitMachines’ at .../MachineOps.c:17:
/usr/include/bits/string3.h:82: error: call to ‘warn_memset_zero_len’ declared with attribute warning: memset used with constant zero length parameter; this could be due to transposed parameters

File:

• trunk/Ohana/src/opihi/pcontrol/MachineOps.c (modified) (7 diffs)

trunk/Ohana/src/opihi/pcontrol/MachineOps.c

@@ -15 +15 @@
 
   ALLOCATE (machines, Machine *, NMACHINES);
-  memset (machines, NMACHINES*sizeof(Machine *), 0);
+  memset (machines, 0, NMACHINES*sizeof(Machine *));
 
   return;
@@ -36 +36 @@
 
   int i;
-  
+
   for (i = 0; i < Nmachines; i++) {
     if (!strcmp (machines[i][0].name, name)) {
@@ -65 +65 @@
     NMACHINES += 10;
     REALLOCATE (machines, Machine *, NMACHINES);
-    memset (&machines[Nmachines], (NMACHINES - Nmachines)*sizeof(Machine *), 0);
+    memset (&machines[Nmachines], 0, (NMACHINES - Nmachines)*sizeof(Machine *));
   }
 
@@ -113 +113 @@
   ASSERT (machine, "cannot find machine associated with host");
   machine[0].NjobsRealhost ++;
-  
+
   // skip jobs that do not have a targeted host
   if (job[0].hostname == NULL) {
@@ -128 +128 @@
   if (machine == NULL) return (TRUE);
   machine[0].NjobsWanthost ++;
-  
+
   return (TRUE);
 }
@@ -155 +155 @@
   if (machine == NULL) return (TRUE);
   machine[0].NjobsWanthost --;
-  
+
   return (TRUE);
 }
@@ -164 +164 @@
   Machine *machine;
 
-  gprint (GP_LOG, "Nmachines: %d\n", Nmachines); 
+  gprint (GP_LOG, "Nmachines: %d\n", Nmachines);
   for (i = 0; i < Nmachines; i++) {
     machine = machines[i];
-    gprint (GP_LOG, "%s : %d : %d : %d\n", machine[0].name, machine[0].Nhosts, machine[0].NjobsRealhost, machine[0].NjobsWanthost); 
+    gprint (GP_LOG, "%s : %d : %d : %d\n", machine[0].name, machine[0].Nhosts, machine[0].NjobsRealhost, machine[0].NjobsWanthost);
   }