Fix build failure without zlib on Windows; avoid unreachable code.

ggcueroad · ggcueroad · commit 807ea6193cb8 · 2012-02-27T17:29:47.000+09:00
diff --git a/libarchive/archive_read_support_format_zip.c b/libarchive/archive_read_support_format_zip.c
@@ -1165,7 +1165,7 @@ archive_read_format_zip_read_data_skip(struct archive_read *a)
 			if (r != ARCHIVE_OK)
 				return (r);
 		}
-		break;
+		return ARCHIVE_OK;
 #endif
 	default: /* Uncompressed or unknown. */
 		/* Scan for a PK\007\010 signature. */
@@ -1194,7 +1194,6 @@ archive_read_format_zip_read_data_skip(struct archive_read *a)
 			zip_read_consume(a, p - buff);
 		}
 	}
-	return ARCHIVE_OK;
 }
 
 static int

Original file line number	Diff line number	Diff line change
`@@ -1165,7 +1165,7 @@ archive_read_format_zip_read_data_skip(struct archive_read *a)`
`1165`	`1165`	`if (r != ARCHIVE_OK)`
`1166`	`1166`	`return (r);`
`1167`	`1167`	`}`
`1168`		`- break;`
	`1168`	`+ return ARCHIVE_OK;`
`1169`	`1169`	`#endif`
`1170`	`1170`	`default: /* Uncompressed or unknown. */`
`1171`	`1171`	`/* Scan for a PK\007\010 signature. */`
`@@ -1194,7 +1194,6 @@ archive_read_format_zip_read_data_skip(struct archive_read *a)`
`1194`	`1194`	`zip_read_consume(a, p - buff);`
`1195`	`1195`	`}`
`1196`	`1196`	`}`
`1197`		`- return ARCHIVE_OK;`
`1198`	`1197`	`}`
`1199`	`1198`
`1200`	`1199`	`static int`