Changeset 4642

Timestamp:

07/22/07 14:51:57 (6 years ago)

Author:

khali

Message:

Speed up sensors_get_ignored() a bit. We can return as soon as an ignore
statement is found to match, even if it isn't an exact match.

Location:

lm-sensors/branches/lm-sensors-3.0.0

Files:

• CHANGES (modified) (1 diff)
• lib/access.c (modified) (2 diffs)

lm-sensors/branches/lm-sensors-3.0.0/CHANGES

@@ -17 +17 @@
            Drop all the chip-specific support
            Fix a memory leak on error
+           Speed up sensors_get_ignored() a bit
   Makefile: Drop the package and version targets
   Man page sensors.conf.5: Update the chip statement section

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

@@ -199 +199 @@
         const sensors_chip_feature *featureptr;
         const sensors_chip_feature *alt_featureptr;
-        int i, res;
-
-        /* Default: valid */
-        res = 1;
+        int i;
+
         if (sensors_chip_name_has_wildcards(name))
                 return -SENSORS_ERR_WILDCARDS;
@@ -215 +213 @@
         for (chip = NULL; (chip = sensors_for_all_config_chips(name, chip));)
                 for (i = 0; i < chip->ignores_count; i++)
-                        if (!strcasecmp(featureptr->data.name, chip->ignores[i].name))
-                                return 0; /* Exact match always overrules! */
-                        else if (alt_featureptr &&
-                                 !strcasecmp(alt_featureptr->data.name,
-                                             chip->ignores[i].name))
-                                res = 0;
-        return res;
+                        if (!strcasecmp(featureptr->data.name, chip->ignores[i].name) ||
+                            (alt_featureptr &&
+                             !strcasecmp(alt_featureptr->data.name, chip->ignores[i].name)))
+                                return 0;
+        /* valid */
+        return 1;
 }