From: Nate Rosenblum <natr@google.com>
Date: Wed, 13 Apr 2016 23:14:02 +0000 (-0700)
Subject: Fix C90 build errors
X-Git-Tag: v3.2.0~2^2~5^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=refs%2Fpull%2F683%2Fhead;p=thirdparty%2Flibarchive.git

Fix C90 build errors
---

diff --git a/libarchive/archive_read_support_format_mtree.c b/libarchive/archive_read_support_format_mtree.c
index 2b8cca7e5..81d965211 100644
--- a/libarchive/archive_read_support_format_mtree.c
+++ b/libarchive/archive_read_support_format_mtree.c
@@ -857,7 +857,7 @@ process_add_entry(struct archive_read *a, struct mtree *mtree,
 	struct mtree_option *iter;
 	const char *next, *eq, *name, *end;
 	size_t name_len, len;
-	int r;
+	int r, i;
 
 	if ((entry = malloc(sizeof(*entry))) == NULL) {
 		archive_set_error(&a->archive, errno, "Can't allocate memory");
@@ -892,7 +892,7 @@ process_add_entry(struct archive_read *a, struct mtree *mtree,
 		}
 		/* Name starts after the last whitespace separator */
 		name = line;
-		for (int i = 0; i < line_len; i++) {
+		for (i = 0; i < line_len; i++) {
 			if (line[i] == '\r'
 			    || line[i] == '\n'
 			    || line[i] == '\t'
diff --git a/libarchive/test/main.c b/libarchive/test/main.c
index 88d72b311..f9ca55d60 100644
--- a/libarchive/test/main.c
+++ b/libarchive/test/main.c
@@ -789,10 +789,11 @@ assertion_memory_filled_with(const char *file, int line,
 	const char *v1 = (const char *)_v1;
 	size_t c = 0;
 	(void)ld; /* UNUSED */
+	size_t i;
 
 	assertion_count(file, line);
 
-	for (size_t i = 0; i < l; ++i) {
+	for (i = 0; i < l; ++i) {
 		if (v1[i] == b) {
 			++c;
 		}