Changeset 4854

Timestamp:

09/23/07 15:53:11 (6 years ago)

Author:

khali

Message:

Delete unused SENSORS_ERR_ACCESS.
Rename SENSORS_ERR_PROC to the more neutral SENSORS_ERR_KERNEL.
Introduce SENSORS_ERR_NO_DEVS for finer-grained error reporting.
Use SENSORS_ERR_KERNEL and SENSORS_ERR_NO_DEVS where appropriate.
No error message for invalid error codes.

Location:

lm-sensors/branches/lm-sensors-3.0.0

Files:

• lib/error.c (modified) (2 diffs)
• lib/error.h (modified) (2 diffs)
• lib/init.c (modified) (1 diff)
• lib/sysfs.c (modified) (9 diffs)
• prog/sensors/main.c (modified) (1 diff)

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

@@ -2 +2 @@
     error.c - Part of libsensors, a Linux library for reading sensor data.
     Copyright (c) 1998, 1999  Frodo Looijaard <frodol@dds.nl>
+    Copyright (C) 2007        Jean Delvare <khali@linux-fr.org>
 
     This program is free software; you can redistribute it and/or modify
@@ -32 +33 @@
 
 static const char *errorlist[] = {
-        /* Unknown error         */ "sensors_strerror: Unknown error!",
+        /* Invalid error code    */ NULL,
         /* SENSORS_ERR_WILDCARDS */ "Wildcard found in chip name",
         /* SENSORS_ERR_NO_ENTRY  */ "No such subfeature known",
-        /* SENSORS_ERR_ACCESS    */ "Can't read or write",
-        /* SENSORS_ERR_PROC      */ "Can't access sysfs file",
+        /* SENSORS_ERR_NO_DEVS   */ "No devices found",
+        /* SENSORS_ERR_KERNEL    */ "Kernel interface error",
         /* SENSORS_ERR_DIV_ZERO  */ "Divide by zero",
         /* SENSORS_ERR_CHIP_NAME */ "Can't parse chip name",

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

@@ -2 +2 @@
     error.h - Part of libsensors, a Linux library for reading sensor data.
     Copyright (c) 1998, 1999  Frodo Looijaard <frodol@dds.nl>
+    Copyright (C) 2007        Jean Delvare <khali@linux-fr.org>
 
     This program is free software; you can redistribute it and/or modify
@@ -23 +24 @@
 #define SENSORS_ERR_WILDCARDS   1 /* Wildcard found in chip name */
 #define SENSORS_ERR_NO_ENTRY    2 /* No such subfeature known */
-#define SENSORS_ERR_ACCESS      3 /* Can't read or write */
-#define SENSORS_ERR_PROC        4 /* Can't access /proc file */
+#define SENSORS_ERR_NO_DEVS     3 /* No devices found */
+#define SENSORS_ERR_KERNEL      4 /* Kernel interface error */
 #define SENSORS_ERR_DIV_ZERO    5 /* Divide by zero */
 #define SENSORS_ERR_CHIP_NAME   6 /* Can't parse chip name */

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

@@ -34 +34 @@
 
         if (!sensors_init_sysfs())
-                return -SENSORS_ERR_PROC;
+                return -SENSORS_ERR_KERNEL;
         if ((res = sensors_read_sysfs_bus()) ||
             (res = sensors_read_sysfs_chips()))

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

@@ -345 +345 @@
 {
         int domain, bus, slot, fn;
-        int err = -SENSORS_ERR_PARSE;
+        int err = -SENSORS_ERR_KERNEL;
         struct sysfs_attribute *attr, *bus_attr;
         char bus_path[SYSFS_PATH_MAX];
@@ -431 +431 @@
         if (!(bus = sysfs_open_bus("i2c"))) {
                 if (errno && errno != ENOENT)
-                        ret = -SENSORS_ERR_PROC;
+                        ret = -SENSORS_ERR_NO_DEVS;
                 goto exit0;
         }
@@ -437 +437 @@
         if (!(devs = sysfs_get_bus_devices(bus))) {
                 if (errno && errno != ENOENT)
-                        ret = -SENSORS_ERR_PROC;
+                        ret = -SENSORS_ERR_NO_DEVS;
                 goto exit1;
         }
@@ -468 +468 @@
         if (!(clsdevs = sysfs_get_class_devices(cls))) {
                 if (errno && errno != ENOENT)
-                        ret = -SENSORS_ERR_PROC;
+                        ret = -SENSORS_ERR_NO_DEVS;
                 goto exit;
         }
@@ -475 +475 @@
                 struct sysfs_device *dev;
                 if (!(dev = sysfs_get_classdev_device(clsdev))) {
-                        ret = -SENSORS_ERR_PROC;
+                        ret = -SENSORS_ERR_NO_DEVS;
                         goto exit;
                 }
@@ -499 +499 @@
         if (!(cls = sysfs_open_class("i2c-adapter"))) {
                 if (errno && errno != ENOENT)
-                        ret = -SENSORS_ERR_PROC;
+                        ret = -SENSORS_ERR_KERNEL;
                 goto exit0;
         }
@@ -505 +505 @@
         if (!(clsdevs = sysfs_get_class_devices(cls))) {
                 if (errno && errno != ENOENT)
-                        ret = -SENSORS_ERR_PROC;
+                        ret = -SENSORS_ERR_KERNEL;
                 goto exit1;
         }
@@ -554 +554 @@
                 fclose(f);
                 if (res != 1)
-                        return -SENSORS_ERR_PROC;
+                        return -SENSORS_ERR_KERNEL;
                 *value /= get_type_scaling(subfeature->type);
         } else
-                return -SENSORS_ERR_PROC;
+                return -SENSORS_ERR_KERNEL;
 
         return 0;
@@ -575 +575 @@
                 fclose(f);
         } else
-                return -SENSORS_ERR_PROC;
+                return -SENSORS_ERR_KERNEL;
 
         return 0;

lm-sensors/branches/lm-sensors-3.0.0/prog/sensors/main.c

@@ -172 +172 @@
 
         if ((res = sensors_do_chip_sets(name))) {
-                if (res == -SENSORS_ERR_PROC) {
-                        fprintf(stderr, "%s: %s for writing;\n",
+                if (res == -SENSORS_ERR_KERNEL) {
+                        fprintf(stderr, "%s: %s;\n",
                                 sprintf_chip_name(name),
                                 sensors_strerror(res));