From 132d839fb326bae66a060dd99f4633de22ad4e1a Mon Sep 17 00:00:00 2001 From: Konrad Kleine Date: Fri, 13 Sep 2013 16:01:36 +0200 Subject: [PATCH] Removed compression_method struct type Since it was only used in one place, I've remove the struct type. --- libarchive/archive_read_support_format_zip.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/libarchive/archive_read_support_format_zip.c b/libarchive/archive_read_support_format_zip.c index db874938b..84e545e0f 100644 --- a/libarchive/archive_read_support_format_zip.c +++ b/libarchive/archive_read_support_format_zip.c @@ -1129,12 +1129,10 @@ zip_read_local_file_header(struct archive_read *a, struct archive_entry *entry, return (ret); } -struct compression_method { +static struct { int id; const char * name; -}; - -static const struct compression_method compression_methods[] = { +} compression_methods[] = { {0, "uncompressed"}, /* The file is stored (no compression) */ {1, "shrinking"}, /* The file is Shrunk */ {2, "reduced-1"}, /* The file is Reduced with compression factor 1 */ @@ -1162,7 +1160,7 @@ static const struct compression_method compression_methods[] = { static const char * compression_name(const int compression) { - static const int num_compression_methods = sizeof(compression_methods)/sizeof(struct compression_method); + static const int num_compression_methods = sizeof(compression_methods)/sizeof(compression_methods[0]); int i=0; while(compression >= 0 && i++ < num_compression_methods) { if (compression_methods[i].id == compression) { -- 2.47.2