Changeset 5001

Timestamp:

11/01/07 14:59:55 (6 years ago)

Author:

khali

Message:

Final status messages go to stdout.
Fix two harmless file descriptor leaks.
Don't return an error when readback fails or doesn't match, it might be OK.

Location:

i2c-tools/trunk

Files:

• CHANGES (modified) (1 diff)
• tools/i2cset.c (modified) (6 diffs)

i2c-tools/trunk/CHANGES

@@ -2 +2 @@
 -----------------
 
+SVN
+  i2cset: Final status messages go to stdout
+          Return success even when readback fails or doesn't match
+
 3.0.0 (2007-10-14)
   Initial release

i2c-tools/trunk/tools/i2cset.c

@@ -49 +49 @@
         int res, i2cbus, address, size, file;
         int value, daddress, vmask = 0;
-        int e1;
         char filename[20];
         unsigned long funcs;
@@ -233 +232 @@
                         fprintf(stderr, "Error: Could not set PEC: %s\n",
                                 strerror(errno));
+                        close(file);
                         exit(1);
                 }
@@ -241 +241 @@
         }
 
-        e1 = 0;
         if (size == I2C_SMBUS_WORD_DATA) {
                 res = i2c_smbus_write_word_data(file, daddress, value);
@@ -248 +247 @@
         }
         if (res < 0) {
-                fprintf(stderr, "Warning - write failed\n");
-                e1++;
+                fprintf(stderr, "Error: Write failed\n");
+                close(file);
+                exit(1);
         }
 
@@ -257 +257 @@
                                 strerror(errno));
                         close(file);
-                        exit(e1);
+                        exit(1);
                 }
         }
@@ -269 +269 @@
 
         if (res < 0) {
-                fprintf(stderr, "Warning - readback failed\n");
-                e1++;
+                printf("Warning - readback failed\n");
         } else
         if (res != value) {
-                e1++;
-                fprintf(stderr, "Warning - data mismatch - wrote "
-                        "0x%0*x, read back 0x%0*x\n",
-                        size == I2C_SMBUS_WORD_DATA ? 4 : 2, value,
-                        size == I2C_SMBUS_WORD_DATA ? 4 : 2, res);
-        } else {
-                fprintf(stderr, "Value 0x%0*x written, readback matched\n",
-                        size == I2C_SMBUS_WORD_DATA ? 4 : 2, value);
-        }
-
-        exit(e1);
+                printf("Warning - data mismatch - wrote "
+                       "0x%0*x, read back 0x%0*x\n",
+                       size == I2C_SMBUS_WORD_DATA ? 4 : 2, value,
+                       size == I2C_SMBUS_WORD_DATA ? 4 : 2, res);
+        } else {
+                printf("Value 0x%0*x written, readback matched\n",
+                       size == I2C_SMBUS_WORD_DATA ? 4 : 2, value);
+        }
+
+        exit(0);
 }