Changeset 732

Timestamp:

02/07/00 04:16:03 (13 years ago)

Author:

mds

Message:

(mds) -Wall cleanup.

Location:

lm-sensors/trunk/prog/sensord

Files:

• chips.c (modified) (12 diffs)
• sensord.c (modified) (9 diffs)

lm-sensors/trunk/prog/sensord/chips.c

@@ -90 +90 @@
 /** LM75 **/
 
-static char *lm75_names[] = {
+static const char *lm75_names[] = {
   SENSORS_LM75_PREFIX, NULL
 };
@@ -102 +102 @@
 /** ADM1021 **/
 
-static char *adm1021_names[] = {
+static const char *adm1021_names[] = {
   SENSORS_ADM1021_PREFIX, NULL
 };
@@ -118 +118 @@
 /** MAX1617 **/
 
-static char *max1617_names[] = {
+static const char *max1617_names[] = {
   SENSORS_MAX1617_PREFIX, SENSORS_MAX1617A_PREFIX, SENSORS_THMC10_PREFIX, SENSORS_LM84_PREFIX, SENSORS_GL523_PREFIX, NULL
 };
@@ -132 +132 @@
 /** ADM9240 **/
 
-static char *adm9240_names[] = {
+static const char *adm9240_names[] = {
   SENSORS_ADM9240_PREFIX, SENSORS_DS1780_PREFIX, SENSORS_LM81_PREFIX, NULL
 };
@@ -162 +162 @@
 /** SIS5595 **/
 
-static char *sis5595_names[] = {
+static const char *sis5595_names[] = {
   SENSORS_SIS5595_PREFIX, NULL
 };
@@ -186 +186 @@
 /** LM78 **/
 
-static char *lm78_names[] = {
+static const char *lm78_names[] = {
   SENSORS_LM78_PREFIX, SENSORS_LM78J_PREFIX, SENSORS_LM79_PREFIX, /*"sis5595",*/ NULL
 };
@@ -220 +220 @@
 /** GL518 **/
 
-static char *gl518_names[] = {
+static const char *gl518_names[] = {
   SENSORS_GL518_PREFIX, NULL
 };
@@ -251 +251 @@
 }
 
-static char *lm80_names[] = {
+static const char *lm80_names[] = {
   SENSORS_LM80_PREFIX, NULL
 };
@@ -281 +281 @@
 /** W83781D **/
 
-static char *w83781d_names[] = {
+static const char *w83781d_names[] = {
   SENSORS_W83781D_PREFIX, NULL
 };
@@ -328 +328 @@
 }
 
-static char *w83782d_names[] = {
+static const char *w83782d_names[] = {
   SENSORS_W83782D_PREFIX, SENSORS_W83627HF_PREFIX, SENSORS_AS99127F_PREFIX, NULL
 };
@@ -368 +368 @@
 /** W83783S **/
 
-static char *w83783s_names[] = {
+static const char *w83783s_names[] = {
   SENSORS_W83783S_PREFIX, NULL
 };
@@ -413 +413 @@
 }
 
-static char *maxilife_names[] = {
+static const char *maxilife_names[] = {
   SENSORS_MAXI_CG_PREFIX, SENSORS_MAXI_CO_PREFIX, SENSORS_MAXI_AS_PREFIX, NULL
 };

lm-sensors/trunk/prog/sensord/sensord.c

@@ -40 +40 @@
 #include "sensord.h"
 
-static char *version = "0.2.0";
-
-static char *sensorsCfgPaths[] = {
+static const char *version = "0.2.0";
+
+static const char *sensorsCfgPaths[] = {
   "/etc", "/usr/lib/sensors", "/usr/local/lib/sensors", "/usr/lib", "/usr/local/lib", NULL
 };
-static char *sensorsCfgFile = "sensors.conf";
-static char *sensorsLogFile = "/var/log/sensors";
+static const char *sensorsCfgFile = "sensors.conf";
+static const char *sensorsLogFile = "/var/log/sensors";
 static int sleepTime = 5 * 60;
 
@@ -80 +80 @@
 
 static char *
-now
+nowf
 (void) {
   time_t now;
@@ -129 +129 @@
 (const sensors_chip_name *chip, ChipDescriptor *descriptor) {
   FeatureDescriptor *features = descriptor->features;
-  int index, subindex;
-  int ret = 0;
-
-  for (index = 0; !done && (ret == 0) && features[index].format; ++ index) {
-    FeatureDescriptor *feature = features + index;
+  int index0, subindex;
+  int ret = 0;
+
+  for (index0 = 0; !done && (ret == 0) && features[index0].format; ++ index0) {
+    FeatureDescriptor *feature = features + index0;
     char *label = NULL;
     double values[MAX_DATA];
@@ -159 +159 @@
 (const sensors_chip_name *chip) {
   const char *adapter, *algorithm;
-  int index, subindex, chipindex = -1;
+  int index0, subindex, chipindex = -1;
   int ret = 0;
 
   if (chip->bus == SENSORS_CHIP_NAME_BUS_ISA)
-    fprintf (sensorsLog, "%s: Chip: %s-isa-%04x\n", now (), chip->prefix, chip->addr);
+    fprintf (sensorsLog, "%s: Chip: %s-isa-%04x\n", nowf(), chip->prefix, chip->addr);
   else
-    fprintf (sensorsLog, "%s: Chip: %s-i2c-%d-%02x\n", now (), chip->prefix, chip->bus, chip->addr);
+    fprintf (sensorsLog, "%s: Chip: %s-i2c-%d-%02x\n", nowf(), chip->prefix, chip->bus, chip->addr);
   adapter = sensors_get_adapter_name (chip->bus);
   if (adapter)
-    fprintf (sensorsLog, "%s: Adapter: %s\n", now (), adapter);
+    fprintf (sensorsLog, "%s: Adapter: %s\n", nowf(), adapter);
   algorithm = sensors_get_algorithm_name (chip->bus);
   if (algorithm)
-    fprintf (sensorsLog, "%s: Algorithm: %s\n", now (), algorithm);
+    fprintf (sensorsLog, "%s: Algorithm: %s\n", nowf(), algorithm);
   /* assert adapter || algorithm */
 
-  for (index = 0; knownChips[index].names; ++ index)
-    for (subindex = 0; knownChips[index].names[subindex]; ++ subindex)
-      if (!strcmp (chip->prefix, knownChips[index].names[subindex]))
-        chipindex = index;
+  for (index0 = 0; knownChips[index0].names; ++ index0)
+    for (subindex = 0; knownChips[index0].names[subindex]; ++ subindex)
+      if (!strcmp (chip->prefix, knownChips[index0].names[subindex]))
+        chipindex = index0;
   
   if (chipindex >= 0)
@@ -191 +191 @@
 (void) {
   const sensors_chip_name *chip;
-  int index = 0;
-  int ret = 0;
-
-  fprintf (sensorsLog, "%s: Sense.\n", now ());
+  int index0 = 0;
+  int ret = 0;
+
+  fprintf (sensorsLog, "%s: Sense.\n", nowf());
   fflush (sensorsLog);
 
-  while (!done && (ret == 0) && ((chip = sensors_get_detected_chips (&index)) != NULL)) {
+  while (!done && (ret == 0) && ((chip = sensors_get_detected_chips (&index0)) != NULL)) {
     ret = readChip (chip);
   }
 
-  fprintf (sensorsLog, "%s: Done.\n", now ());
+  fprintf (sensorsLog, "%s: Done.\n", nowf());
   fflush (sensorsLog);
 
@@ -213 +213 @@
 
   if (sensorsLog != NULL) {
-    fprintf (sensorsLog, "%s: Rotate.\n", now ());
+    fprintf (sensorsLog, "%s: Rotate.\n", nowf());
     fclose (sensorsLog);
   }
@@ -220 +220 @@
     ret = 1;
   } else {
-    fprintf (sensorsLog, "%s: Started.\n", now ());
+    fprintf (sensorsLog, "%s: Started.\n", nowf());
     fflush (sensorsLog);
   }
@@ -241 +241 @@
       strcpy (cfgPath, sensorsCfgFile);
     } else {
-      int index;
-      for (index = 0; sensorsCfgPaths[index]; ++ index) {
-        sprintf (cfgPath, "%s/%s", sensorsCfgPaths[index], sensorsCfgFile);
+      int index0;
+      for (index0 = 0; sensorsCfgPaths[index0]; ++ index0) {
+        sprintf (cfgPath, "%s/%s", sensorsCfgPaths[index0], sensorsCfgFile);
         if (stat (cfgPath, &stats) == 0)
           break;
       }
-      if (!sensorsCfgPaths[index]) {
+      if (!sensorsCfgPaths[index0]) {
         syslog (LOG_ERR, "Error locating sensors configuration: %s", sensorsCfgFile);
         return 9;
@@ -299 +299 @@
 
   if (sensorsLog) {
-    fprintf (sensorsLog, "%s: %s.\n", now (), ret ? "Failed" : "Stopped");
+    fprintf (sensorsLog, "%s: %s.\n", nowf(), ret ? "Failed" : "Stopped");
     fclose (sensorsLog);
   }