svn commit: r309357 - head/usr.sbin/i2c

Nick Hibma n_hibma at FreeBSD.org
Thu Dec 1 09:14:59 UTC 2016


Author: n_hibma
Date: Thu Dec  1 09:14:58 2016
New Revision: 309357
URL: https://svnweb.freebsd.org/changeset/base/309357

Log:
  Speling fixes and fix line endings for err_msg output.
  
  In some cases there was not \n, in other cases there was.

Modified:
  head/usr.sbin/i2c/i2c.c

Modified: head/usr.sbin/i2c/i2c.c
==============================================================================
--- head/usr.sbin/i2c/i2c.c	Thu Dec  1 07:50:44 2016	(r309356)
+++ head/usr.sbin/i2c/i2c.c	Thu Dec  1 09:14:58 2016	(r309357)
@@ -310,7 +310,7 @@ i2c_write(char *dev, struct options i2c_
 			error = ioctl(fd, I2CWRITE, &cmd);
 			free(buf);
 			if (error == -1) {
-				err_msg = "ioctl: error when write offset";
+				err_msg = "ioctl: error writing offset";
 				goto err1;
 			}
 		}
@@ -335,7 +335,7 @@ i2c_write(char *dev, struct options i2c_
 		cmd.last = 0;
 		error = ioctl(fd, I2CWRITE, &cmd);
 		if (error == -1) {
-			err_msg = "ioctl: error when write";
+			err_msg = "ioctl: error writing";
 			goto err1;
 		}
 		break;
@@ -350,7 +350,7 @@ i2c_write(char *dev, struct options i2c_
 			error = ioctl(fd, I2CWRITE, &cmd);
 			free(buf);
 			if (error == -1) {
-				err_msg = "ioctl: error when write offset";
+				err_msg = "ioctl: error writing offset";
 				goto err1;
 			}
 		}
@@ -371,7 +371,7 @@ i2c_write(char *dev, struct options i2c_
 		cmd.last = 0;
 		error = ioctl(fd, I2CWRITE, &cmd);
 		if (error == -1) {
-			err_msg = "ioctl: error when write";
+			err_msg = "ioctl: error writing";
 			goto err1;
 		}
 		break;
@@ -394,7 +394,7 @@ i2c_write(char *dev, struct options i2c_
 		error = ioctl(fd, I2CWRITE, &cmd);
 		free(buf);
 		if (error == -1) {
-			err_msg = "ioctl: error when write";
+			err_msg = "ioctl: error writing";
 			goto err1;
 		}
 		break;
@@ -416,7 +416,7 @@ err1:
 		fprintf(stderr, "error sending stop condtion\n");
 err2:
 	if (err_msg)
-		fprintf(stderr, "%s", err_msg);
+		fprintf(stderr, "%s\n", err_msg);
 
 	close(fd);
 	return (1);
@@ -458,7 +458,7 @@ i2c_read(char *dev, struct options i2c_o
 		error = ioctl(fd, I2CWRITE, &cmd);
 		free(buf);
 		if (error == -1) {
-			err_msg = "ioctl: error when write offset";
+			err_msg = "ioctl: error writing offset";
 			goto err1;
 		}
 
@@ -466,7 +466,7 @@ i2c_read(char *dev, struct options i2c_o
 			cmd.slave = i2c_opt.addr;
 			error = ioctl(fd, I2CSTOP, &cmd);
 			if (error == -1) {
-				err_msg = "error sending stop condtion\n";
+				err_msg = "error sending stop condtion";
 				goto err2;
 			}
 		}
@@ -491,7 +491,7 @@ i2c_read(char *dev, struct options i2c_o
 	}
 	error = ioctl(fd, I2CSTOP, &cmd);
 	if (error == -1) {
-		err_msg = "error sending stop condtion\n";
+		err_msg = "error sending stop condtion";
 		goto err2;
 	}
 
@@ -513,7 +513,7 @@ err1:
 		fprintf(stderr, "error sending stop condtion\n");
 err2:
 	if (err_msg)
-		fprintf(stderr, "%s", err_msg);
+		fprintf(stderr, "%s\n", err_msg);
 
 	close(fd);
 	return (1);


More information about the svn-src-all mailing list