Changeset 5207 for i2c-tools/trunk/tools

Timestamp:

04/24/08 14:38:54 (4 years ago)

Author:

khali

Message:

Minor optimizations and cleanups.

Location:

i2c-tools/trunk/tools

Files:

• i2cget.c (modified) (3 diffs)
• i2cset.c (modified) (1 diff)

i2c-tools/trunk/tools/i2cget.c

@@ -155 +155 @@
 {
         char *end;
-        int res, i2cbus, address, file;
-        int size = I2C_SMBUS_BYTE_DATA;
+        int res, i2cbus, address, size, file;
         int daddress;
         char filename[20];
@@ -194 +193 @@
                 help();
 
-        if (!(flags+3 < argc)) {
-                size = I2C_SMBUS_BYTE;
-                daddress = -1;
-        } else {
+        if (argc > flags + 3) {
+                size = I2C_SMBUS_BYTE_DATA;
                 daddress = strtol(argv[flags+3], &end, 0);
                 if (*end || daddress < 0 || daddress > 0xff) {
@@ -203 +200 @@
                         help();
                 }
-        }
-
-        if (flags+4 < argc) {
+        } else {
+                size = I2C_SMBUS_BYTE;
+                daddress = -1;
+        }
+
+        if (argc > flags + 4) {
                 switch (argv[flags+4][0]) {
                 case 'b': size = I2C_SMBUS_BYTE_DATA; break;

i2c-tools/trunk/tools/i2cset.c

@@ -100 +100 @@
         }
 
-        if (argc < flags + 6) {
-                fprintf(stderr, "No size specified (using byte-data access)\n");
+        if (argc > flags + 5) {
+                switch (argv[flags+5][0]) {
+                case 'b': size = I2C_SMBUS_BYTE_DATA; break;
+                case 'w': size = I2C_SMBUS_WORD_DATA; break;
+                default:
+                        fprintf(stderr, "Error: Invalid mode!\n");
+                        help();
+                }
+                pec = argv[flags+5][1] == 'p';
+        } else {
                 size = I2C_SMBUS_BYTE_DATA;
-        } else if (argv[flags+5][0] == 'b') {
-                size = I2C_SMBUS_BYTE_DATA;
-                pec = argv[flags+5][1] == 'p';
-        } else if (argv[flags+5][0] == 'w') {
-                size = I2C_SMBUS_WORD_DATA;
-                pec = argv[flags+5][1] == 'p';
-        } else {
-                fprintf(stderr, "Error: Invalid mode!\n");
-                help();
-        }
-
-        if (argc >= flags + 7) {
+        }
+
+        if (argc > flags + 6) {
                 vmask = strtol(argv[flags+6], &end, 0);
                 if (*end || vmask == 0) {