Changeset 5748 for lm-sensors/trunk/lib/access.c

Timestamp:

06/30/09 22:52:20 (3 years ago)

Author:

khali

Message:

sensors_get_label: Merge pathname and label buffers (patch from
George Spelvin).

The lifetimes of the path and label name buffers are
disjoint, so a single buffer can be used for both purposes.

Files:

• lm-sensors/trunk/lib/access.c (modified) (2 diffs)

lm-sensors/trunk/lib/access.c

@@ -169 +169 @@
         char *label;
         const sensors_chip *chip;
-        char buf[128], path[PATH_MAX];
+        char buf[PATH_MAX];
         FILE *f;
         int i;
@@ -184 +184 @@
 
         /* No user specified label, check for a _label sysfs file */
-        snprintf(path, PATH_MAX, "%s/%s_label", name->path, feature->name);
+        snprintf(buf, PATH_MAX, "%s/%s_label", name->path, feature->name);
         
-        if ((f = fopen(path, "r"))) {
-                i = fread(buf, 1, sizeof(buf) - 1, f);
+        if ((f = fopen(buf, "r"))) {
+                i = fread(buf, 1, sizeof(buf), f);
                 fclose(f);
                 if (i > 0) {