commit cc171bdc45f785383b766cf01c6770634ee087ce
author Elliott Hughes <enh@google.com> Tue Oct 20 21:54:14 2015 +0000
committer android-build-merger <android-build-merger@google.com> Tue Oct 20 21:54:14 2015 +0000
tree 927019cc1ea21e00f0d90e32d25ea6c16e24430a
parent 6cdb2bf1a5b9400c855f43581d92bde3cc311be5
parent bada7fb5fbbc6c415fc6dcfe90fad5d7845fccd7

Merge "Fix parameter to lseek" am: 4a8d1255de
am: 9f1edaece7

* commit '9f1edaece773f6d0a6f0365cfd934871d73136c2':
  Fix parameter to lseek

libsparse/simg2img.c

diff --git a/libsparse/simg2img.c b/libsparse/simg2img.c
index 95e9b5b..b9b438e 100644
--- a/libsparse/simg2img.c
+++ b/libsparse/simg2img.c
@@ -40,7 +40,6 @@
 	int in;
 	int out;
 	int i;
-	int ret;
 	struct sparse_file *s;
 
 	if (argc < 3) {
@@ -71,10 +70,12 @@
 			exit(-1);
 		}
 
-		lseek(out, SEEK_SET, 0);
+		if (lseek(out, 0, SEEK_SET) == -1) {
+			perror("lseek failed");
+			exit(EXIT_FAILURE);
+		}
 
-		ret = sparse_file_write(s, out, false, false, false);
-		if (ret < 0) {
+		if (sparse_file_write(s, out, false, false, false) < 0) {
 			fprintf(stderr, "Cannot write output file\n");
 			exit(-1);
 		}