Changeset 4806

Show
Ignore:
Timestamp:
09/18/07 22:46:06 (1 year ago)
Author:
khali
Message:

Fix compilation breakage.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • lm-sensors/branches/lm-sensors-3.0.0/prog/sensord/sense.c

    r4757 r4806  
    3838(const sensors_chip_name *name, int feature, const char **label) { 
    3939  const sensors_feature_data *rawFeature; 
    40   int nr1 = 0, nr2 = 0, err = 0; 
     40  int nr = 0, err = 0; 
    4141  do { 
    42     rawFeature = sensors_get_all_features (name, &nr1, &nr2); 
     42    rawFeature = sensors_get_all_features (name, &nr); 
    4343  } while (rawFeature && (rawFeature->number != feature)); 
    4444  /* TODO: Ensure labels match RRD construct and are not repeated! */ 
     
    6666 
    6767  sensorLog (LOG_INFO, "Chip: %s", chipName (chip)); 
    68   adapter = sensors_get_adapter_name (chip->bus); 
     68  adapter = sensors_get_adapter_name (&chip->bus); 
    6969  if (adapter) 
    7070    sensorLog (LOG_INFO, "Adapter: %s", adapter); 
     
    7777(const sensors_chip_name *chip) { 
    7878  const sensors_feature_data *sensor; 
    79   int index0 = 0, index1 = 0
     79  int index0 = 0
    8080  int ret = 0; 
    8181 
    8282  ret = idChip (chip); 
    8383 
    84   while ((ret == 0) && ((sensor = sensors_get_all_features (chip, &index0, &index1)) != NULL)) { 
     84  while ((ret == 0) && ((sensor = sensors_get_all_features (chip, &index0)) != NULL)) { 
    8585    char *label = NULL; 
    8686    double value;