From: Tim Kientzle Date: Sun, 5 Jul 2015 17:05:31 +0000 (-0700) Subject: Whitespace cleanup after 41965bf X-Git-Tag: v3.1.900a~80 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=900b7ce26ebe72217916ad76ace224f23ec8c8be;p=thirdparty%2Flibarchive.git Whitespace cleanup after 41965bf --- diff --git a/libarchive/archive_read.c b/libarchive/archive_read.c index 56dd8877b..41842d4e5 100644 --- a/libarchive/archive_read.c +++ b/libarchive/archive_read.c @@ -667,7 +667,7 @@ _archive_read_next_header2(struct archive *_a, struct archive_entry *entry) break; } - __archive_reset_read_data(&a->archive); + __archive_reset_read_data(&a->archive); a->data_start_node = a->client.cursor; /* EOF always wins; otherwise return the worst error. */ @@ -893,11 +893,9 @@ archive_read_data(struct archive *_a, void *buff, size_t s) return (bytes_read); } - - - /* - * Reset the read_data_* variables, used for starting a new entry. - */ +/* + * Reset the read_data_* variables, used for starting a new entry. + */ void __archive_reset_read_data(struct archive * a) { a->read_data_output_offset = 0; @@ -910,9 +908,6 @@ void __archive_reset_read_data(struct archive * a) a->read_data_offset = 0; } - - - /* * Skip over all remaining data in this entry. */ diff --git a/libarchive/archive_read_disk_posix.c b/libarchive/archive_read_disk_posix.c index 0063ddd93..c76b1d6ba 100644 --- a/libarchive/archive_read_disk_posix.c +++ b/libarchive/archive_read_disk_posix.c @@ -1152,8 +1152,7 @@ _archive_read_next_header2(struct archive *_a, struct archive_entry *entry) break; } - __archive_reset_read_data(&a->archive); - + __archive_reset_read_data(&a->archive); return (r); } diff --git a/libarchive/archive_read_disk_windows.c b/libarchive/archive_read_disk_windows.c index 3fb6f15b1..65734535e 100644 --- a/libarchive/archive_read_disk_windows.c +++ b/libarchive/archive_read_disk_windows.c @@ -1000,8 +1000,7 @@ _archive_read_next_header2(struct archive *_a, struct archive_entry *entry) break; } - __archive_reset_read_data(&a->archive); - + __archive_reset_read_data(&a->archive); return (r); }