svn commit: r276876 - stable/10/usr.sbin/i2c

[Luiz Otavio O Souza]

Author: loos
Date: Fri Jan  9 03:26:18 2015
New Revision: 276876
URL: https://svnweb.freebsd.org/changeset/base/276876

Log:
  MFC r274416:
  
  Fix a few cases of use of uninitialized variables.  Found with -Wall.

Modified:
  stable/10/usr.sbin/i2c/i2c.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/usr.sbin/i2c/i2c.c
==============================================================================
--- stable/10/usr.sbin/i2c/i2c.c	Fri Jan  9 02:51:06 2015	(r276875)
+++ stable/10/usr.sbin/i2c/i2c.c	Fri Jan  9 03:26:18 2015	(r276876)
@@ -142,6 +142,7 @@ scan_bus(struct iiccmd cmd, char *dev, i
 			if (tokens == NULL) {
 				fprintf(stderr, "Error allocating tokens "
 				    "buffer\n");
+				error = -1;
 				goto out;
 			}
 			index = skip_get_tokens(skip_addr, tokens,
@@ -150,6 +151,7 @@ scan_bus(struct iiccmd cmd, char *dev, i
 
 		if (!no_range && (addr_range.start > addr_range.end)) {
 			fprintf(stderr, "Skip address out of range\n");
+			error = -1;
 			goto out;
 		}
 	}
@@ -409,8 +411,10 @@ i2c_read(char *dev, struct options i2c_o
 		if (i2c_opt.mode == I2C_MODE_STOP_START) {
 			cmd.slave = i2c_opt.addr;
 			error = ioctl(fd, I2CSTOP, &cmd);
-			if (error == -1)
+			if (error == -1) {
+				err_msg = "error sending stop condtion\n";
 				goto err2;
+			}
 		}
 	}
 	cmd.slave = i2c_opt.addr;
@@ -432,8 +436,10 @@ i2c_read(char *dev, struct options i2c_o
 		}
 	}
 	error = ioctl(fd, I2CSTOP, &cmd);
-	if (error == -1)
+	if (error == -1) {
+		err_msg = "error sending stop condtion\n";
 		goto err2;
+	}
 
 	for (i = 0; i < i2c_opt.count; i++) {
 		error = read(fd, &i2c_buf[i], 1);