diff options
| author | Denis Vlasenko <vda.linux@googlemail.com> | 2008-07-05 09:18:54 +0000 |
|---|---|---|
| committer | Denis Vlasenko <vda.linux@googlemail.com> | 2008-07-05 09:18:54 +0000 |
| commit | a60f84ebf07863e390b72a2b6150e461a1ec18e9 (patch) | |
| tree | f59bc665cfe3d2d32622450d80523e3c1265e501 /archival/unzip.c | |
| parent | f6efccc0659a2e2978f2021153f34ce92257ad2b (diff) | |
| download | busybox-w32-a60f84ebf07863e390b72a2b6150e461a1ec18e9.tar.gz busybox-w32-a60f84ebf07863e390b72a2b6150e461a1ec18e9.tar.bz2 busybox-w32-a60f84ebf07863e390b72a2b6150e461a1ec18e9.zip | |
*: rename ATTRIBUTE_XXX to just XXX.
Diffstat (limited to 'archival/unzip.c')
| -rw-r--r-- | archival/unzip.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/archival/unzip.c b/archival/unzip.c index 2c8971295..7c92f5d9a 100644 --- a/archival/unzip.c +++ b/archival/unzip.c | |||
| @@ -51,13 +51,13 @@ typedef union { | |||
| 51 | uint16_t method; /* 4-5 */ | 51 | uint16_t method; /* 4-5 */ |
| 52 | uint16_t modtime; /* 6-7 */ | 52 | uint16_t modtime; /* 6-7 */ |
| 53 | uint16_t moddate; /* 8-9 */ | 53 | uint16_t moddate; /* 8-9 */ |
| 54 | uint32_t crc32 ATTRIBUTE_PACKED; /* 10-13 */ | 54 | uint32_t crc32 PACKED; /* 10-13 */ |
| 55 | uint32_t cmpsize ATTRIBUTE_PACKED; /* 14-17 */ | 55 | uint32_t cmpsize PACKED; /* 14-17 */ |
| 56 | uint32_t ucmpsize ATTRIBUTE_PACKED; /* 18-21 */ | 56 | uint32_t ucmpsize PACKED; /* 18-21 */ |
| 57 | uint16_t filename_len; /* 22-23 */ | 57 | uint16_t filename_len; /* 22-23 */ |
| 58 | uint16_t extra_len; /* 24-25 */ | 58 | uint16_t extra_len; /* 24-25 */ |
| 59 | } formatted ATTRIBUTE_PACKED; | 59 | } formatted PACKED; |
| 60 | } zip_header_t; /* ATTRIBUTE_PACKED - gcc 4.2.1 doesn't like it (spews warning) */ | 60 | } zip_header_t; /* PACKED - gcc 4.2.1 doesn't like it (spews warning) */ |
| 61 | 61 | ||
| 62 | /* Check the offset of the last element, not the length. This leniency | 62 | /* Check the offset of the last element, not the length. This leniency |
| 63 | * allows for poor packing, whereby the overall struct may be too long, | 63 | * allows for poor packing, whereby the overall struct may be too long, |