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

Timestamp:

06/30/09 22:47:53 (4 years ago)

Author:

khali

Message:

Consolidate strdup calls in sensors_get_label (patch from George Spelvin).

There were multiple in-line calls that then fell through to
a common exit. Instead, set up a pointer to the original
strings, and have a single strdup in the common code.

Files:

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

lm-sensors/trunk/lib/access.c

@@ -179 +179 @@
                 for (i = 0; i < chip->labels_count; i++)
                         if (!strcmp(feature->name, chip->labels[i].name)) {
-                                label = strdup(chip->labels[i].value);
+                                label = chip->labels[i].value;
                                 goto sensors_get_label_exit;
                         }
@@ -192 +192 @@
                         /* i - 1 to strip the '\n' at the end */
                         buf[i - 1] = 0;
-                        label = strdup(buf);
+                        label = buf;
                         goto sensors_get_label_exit;
                 }
@@ -198 +198 @@
 
         /* No label, return the feature name instead */
-        label = strdup(feature->name);
+        label = feature->name;
         
 sensors_get_label_exit:
+        label = strdup(label);
         if (!label)
                 sensors_fatal_error(__func__, "Allocating label text");