Fix compile warnings for an unused variable and return values

jonas · Apr 25, 2012 · e108e28 · e108e28
1 parent 3525ca9
commit e108e28
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/io.c b/io.c
@@ -276,10 +276,14 @@ open_trace(int devnull, const char *argv[])
 		int i;
 
 		for (i = 0; argv[i]; i++) {
-			write(fd, argv[i], strlen(argv[i]));
-			write(fd, " ", 1);
+			if (write(fd, argv[i], strlen(argv[i])) == -1
+			    || write(fd, " ", 1) == -1)
+				break;
+		}
+		if (argv[i] || write(fd, "\n", 1) == -1) {
+			close(fd);
+			return devnull;
 		}
-		write(fd, "\n", 1);
 
 		return fd;
 	}

diff --git a/tig.c b/tig.c
@@ -644,8 +644,6 @@ get_line_type_from_ref(const struct ref *ref)
 static inline struct line_info *
 get_line(enum line_type type)
 {
-	struct line_info *info;
-
 	if (type > LINE_NONE) {
 		assert(TO_CUSTOM_COLOR_OFFSET(type) < custom_colors);
 		return &custom_color[TO_CUSTOM_COLOR_OFFSET(type)];