Changeset 4807

Timestamp:

09/18/07 22:53:42 (6 years ago)

Author:

khali

Message:

Warning fixes.

Location:

lm-sensors/branches/lm-sensors-3.0.0/prog/sensord

Files:

• args.c (modified) (1 diff)
• rrd.c (modified) (5 diffs)

lm-sensors/branches/lm-sensors-3.0.0/prog/sensord/args.c

@@ -81 +81 @@
   { "local6", LOG_LOCAL6 }, { "local7", LOG_LOCAL7 },
   { "daemon", LOG_DAEMON }, { "user", LOG_USER },
-  { NULL }
+  { NULL, 0 }
 };
 

lm-sensors/branches/lm-sensors-3.0.0/prog/sensord/rrd.c

@@ -87 +87 @@
 static void
 rrdCheckLabel
-(const char *rawLabel, int index) {
-  char *buffer = rrdLabels[index];
+(const char *rawLabel, int index0) {
+  char *buffer = rrdLabels[index0];
   int i, j, okay;
   
@@ -105 +105 @@
   j = 0;
   okay = (i > 0);
-  while (okay && (j < index)) /* locate duplicates */
+  while (okay && (j < index0)) /* locate duplicates */
     okay = strcmp (rrdLabels[j ++], buffer);
 
@@ -129 +129 @@
     j = 0;
     okay = 1;
-    while (okay && (j < index))
+    while (okay && (j < index0))
       okay = strcmp (rrdLabels[j ++], buffer);
   }
@@ -275 +275 @@
 struct gr {
   DataType type;
-  char *h2;
-  char *image;
-  char *title;
-  char *axisTitle;
-  char *axisDefn;
-  char *options;
+  const char *h2;
+  const char *image;
+  const char *title;
+  const char *axisTitle;
+  const char *axisDefn;
+  const char *options;
   int loadAvg;
 };
@@ -358 +358 @@
     0
   }, {
-    DataType_other
+    DataType_other,
+    NULL,
+    NULL,
+    NULL,
+    NULL,
+    NULL,
+    NULL,
+    0
   }  
 };