Changeset 4673

Show
Ignore:
Timestamp:
08/16/07 11:56:07 (6 years ago)
Author:
khali
Message:

Rename sensors_chip_name.busname to path, as this is what we are using
it for by now.

Location:
lm-sensors/branches/lm-sensors-3.0.0/lib
Files:
5 modified

Legend:

Unmodified
Added
Removed

  • lm-sensors/branches/lm-sensors-3.0.0/lib/access.c

    r4672 r4673  
    171171 
    172172        /* No user specified label, check for a _label sysfs file */ 
    173         snprintf(path, PATH_MAX, "%s/%s_label", name->busname, 
     173        snprintf(path, PATH_MAX, "%s/%s_label", name->path, 
    174174                featureptr->data.name); 
    175175         

  • lm-sensors/branches/lm-sensors-3.0.0/lib/data.c

    r4672 r4673  
    7979  int i; 
    8080 
    81   /* Play it safe */ 
    82   res->busname = NULL; 
    83    
    8481  if (! name) 
    8582    sensors_fatal_error("sensors_parse_chip_name","Allocating new name"); 

  • lm-sensors/branches/lm-sensors-3.0.0/lib/init.c

    r4667 r4673  
    9191{ 
    9292  free(name->prefix); 
    93   free(name->busname); 
     93  free(name->path); 
    9494} 
    9595 

  • lm-sensors/branches/lm-sensors-3.0.0/lib/sensors.h

    r4672 r4673  
    4444  int bus; 
    4545  int addr; 
    46   char *busname; 
     46  char *path; 
    4747} sensors_chip_name; 
    4848 

  • lm-sensors/branches/lm-sensors-3.0.0/lib/sysfs.c

    r4672 r4673  
    223223                sensors_fatal_error(__FUNCTION__, "out of memory"); 
    224224 
    225         entry.chip.busname = strdup(dev->path); 
    226         if (!entry.chip.busname) 
     225        entry.chip.path = strdup(dev->path); 
     226        if (!entry.chip.path) 
    227227                sensors_fatal_error(__FUNCTION__, "out of memory"); 
    228228 
    … …  
    271271exit_free: 
    272272        free(entry.chip.prefix); 
    273         free(entry.chip.busname); 
     273        free(entry.chip.path); 
    274274        return err; 
    275275} 
    … …  
    417417                suffix = "_input"; 
    418418 
    419         snprintf(n, NAME_MAX, "%s/%s%s", name->busname, the_feature->data.name, 
     419        snprintf(n, NAME_MAX, "%s/%s%s", name->path, the_feature->data.name, 
    420420                 suffix); 
    421421        if ((f = fopen(n, "r"))) { 
    … …  
    452452                suffix = "_input"; 
    453453 
    454         snprintf(n, NAME_MAX, "%s/%s%s", name->busname, the_feature->data.name, 
     454        snprintf(n, NAME_MAX, "%s/%s%s", name->path, the_feature->data.name, 
    455455                 suffix); 
    456456        if ((f = fopen(n, "w"))) {