Changeset 4807

Show
Ignore:
Timestamp:
09/18/07 22:53:42 (7 years ago)
Author:
khali
Message:

Warning fixes.

Location:
lm-sensors/branches/lm-sensors-3.0.0/prog/sensord
Files:
2 modified

Legend:

Unmodified
Added
Removed
  • lm-sensors/branches/lm-sensors-3.0.0/prog/sensord/args.c

    r4802 r4807  
    8181  { "local6", LOG_LOCAL6 }, { "local7", LOG_LOCAL7 }, 
    8282  { "daemon", LOG_DAEMON }, { "user", LOG_USER }, 
    83   { NULL } 
     83  { NULL, 0 } 
    8484}; 
    8585 
  • lm-sensors/branches/lm-sensors-3.0.0/prog/sensord/rrd.c

    r4804 r4807  
    8787static void 
    8888rrdCheckLabel 
    89 (const char *rawLabel, int index) { 
    90   char *buffer = rrdLabels[index]; 
     89(const char *rawLabel, int index0) { 
     90  char *buffer = rrdLabels[index0]; 
    9191  int i, j, okay; 
    9292   
     
    105105  j = 0; 
    106106  okay = (i > 0); 
    107   while (okay && (j < index)) /* locate duplicates */ 
     107  while (okay && (j < index0)) /* locate duplicates */ 
    108108    okay = strcmp (rrdLabels[j ++], buffer); 
    109109 
     
    129129    j = 0; 
    130130    okay = 1; 
    131     while (okay && (j < index)) 
     131    while (okay && (j < index0)) 
    132132      okay = strcmp (rrdLabels[j ++], buffer); 
    133133  } 
     
    275275struct gr { 
    276276  DataType type; 
    277   char *h2; 
    278   char *image; 
    279   char *title; 
    280   char *axisTitle; 
    281   char *axisDefn; 
    282   char *options; 
     277  const char *h2; 
     278  const char *image; 
     279  const char *title; 
     280  const char *axisTitle; 
     281  const char *axisDefn; 
     282  const char *options; 
    283283  int loadAvg; 
    284284}; 
     
    358358    0 
    359359  }, { 
    360     DataType_other 
     360    DataType_other, 
     361    NULL, 
     362    NULL, 
     363    NULL, 
     364    NULL, 
     365    NULL, 
     366    NULL, 
     367    0 
    361368  }   
    362369};