aboutsummaryrefslogtreecommitdiff
path: root/archival
diff options
context:
space:
mode:
authorDenis Vlasenko <vda.linux@googlemail.com>2008-07-05 09:18:54 +0000
committerDenis Vlasenko <vda.linux@googlemail.com>2008-07-05 09:18:54 +0000
commita60f84ebf07863e390b72a2b6150e461a1ec18e9 (patch)
treef59bc665cfe3d2d32622450d80523e3c1265e501 /archival
parentf6efccc0659a2e2978f2021153f34ce92257ad2b (diff)
downloadbusybox-w32-a60f84ebf07863e390b72a2b6150e461a1ec18e9.tar.gz
busybox-w32-a60f84ebf07863e390b72a2b6150e461a1ec18e9.tar.bz2
busybox-w32-a60f84ebf07863e390b72a2b6150e461a1ec18e9.zip
*: rename ATTRIBUTE_XXX to just XXX.
Diffstat (limited to 'archival')
-rw-r--r--archival/bbunzip.c8
-rw-r--r--archival/bz/bzlib_private.h4
-rw-r--r--archival/bzip2.c2
-rw-r--r--archival/cpio.c2
-rw-r--r--archival/dpkg.c2
-rw-r--r--archival/gzip.c2
-rw-r--r--archival/libunarchive/decompress_unzip.c2
-rw-r--r--archival/libunarchive/header_skip.c2
-rw-r--r--archival/tar.c4
-rw-r--r--archival/unzip.c10
10 files changed, 19 insertions, 19 deletions
diff --git a/archival/bbunzip.c b/archival/bbunzip.c
index b2e816145..65bb8b7f4 100644
--- a/archival/bbunzip.c
+++ b/archival/bbunzip.c
@@ -165,7 +165,7 @@ USE_DESKTOP(long long) int unpack_bunzip2(void)
165} 165}
166 166
167int bunzip2_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; 167int bunzip2_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
168int bunzip2_main(int argc ATTRIBUTE_UNUSED, char **argv) 168int bunzip2_main(int argc UNUSED_PARAM, char **argv)
169{ 169{
170 getopt32(argv, "cfvdt"); 170 getopt32(argv, "cfvdt");
171 argv += optind; 171 argv += optind;
@@ -277,7 +277,7 @@ USE_DESKTOP(long long) int unpack_gunzip(void)
277 */ 277 */
278 278
279int gunzip_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; 279int gunzip_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
280int gunzip_main(int argc ATTRIBUTE_UNUSED, char **argv) 280int gunzip_main(int argc UNUSED_PARAM, char **argv)
281{ 281{
282 getopt32(argv, "cfvdtn"); 282 getopt32(argv, "cfvdtn");
283 argv += optind; 283 argv += optind;
@@ -315,7 +315,7 @@ USE_DESKTOP(long long) int unpack_unlzma(void)
315} 315}
316 316
317int unlzma_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; 317int unlzma_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
318int unlzma_main(int argc ATTRIBUTE_UNUSED, char **argv) 318int unlzma_main(int argc UNUSED_PARAM, char **argv)
319{ 319{
320 getopt32(argv, "cf"); 320 getopt32(argv, "cf");
321 argv += optind; 321 argv += optind;
@@ -357,7 +357,7 @@ USE_DESKTOP(long long) int unpack_uncompress(void)
357} 357}
358 358
359int uncompress_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; 359int uncompress_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
360int uncompress_main(int argc ATTRIBUTE_UNUSED, char **argv) 360int uncompress_main(int argc UNUSED_PARAM, char **argv)
361{ 361{
362 getopt32(argv, "cf"); 362 getopt32(argv, "cf");
363 argv += optind; 363 argv += optind;
diff --git a/archival/bz/bzlib_private.h b/archival/bz/bzlib_private.h
index 48676a391..6430ce407 100644
--- a/archival/bz/bzlib_private.h
+++ b/archival/bz/bzlib_private.h
@@ -33,7 +33,7 @@ typedef unsigned char Bool;
33#define False ((Bool)0) 33#define False ((Bool)0)
34 34
35#if BZ_LIGHT_DEBUG 35#if BZ_LIGHT_DEBUG
36static void bz_assert_fail(int errcode) ATTRIBUTE_NORETURN; 36static void bz_assert_fail(int errcode) NORETURN;
37#define AssertH(cond, errcode) \ 37#define AssertH(cond, errcode) \
38do { \ 38do { \
39 if (!(cond)) \ 39 if (!(cond)) \
@@ -170,7 +170,7 @@ typedef struct EState {
170 170
171 /* map of bytes used in block */ 171 /* map of bytes used in block */
172 int32_t nInUse; 172 int32_t nInUse;
173 Bool inUse[256] __attribute__(( aligned(sizeof(long)) )); 173 Bool inUse[256] ALIGNED(sizeof(long));
174 uint8_t unseqToSeq[256]; 174 uint8_t unseqToSeq[256];
175 175
176 /* stuff for coding the MTF values */ 176 /* stuff for coding the MTF values */
diff --git a/archival/bzip2.c b/archival/bzip2.c
index 62df4aab8..1149cad2a 100644
--- a/archival/bzip2.c
+++ b/archival/bzip2.c
@@ -141,7 +141,7 @@ char* make_new_name_bzip2(char *filename)
141} 141}
142 142
143int bzip2_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; 143int bzip2_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
144int bzip2_main(int argc ATTRIBUTE_UNUSED, char **argv) 144int bzip2_main(int argc UNUSED_PARAM, char **argv)
145{ 145{
146 unsigned opt; 146 unsigned opt;
147 147
diff --git a/archival/cpio.c b/archival/cpio.c
index a10bfa85f..4c9fb1f65 100644
--- a/archival/cpio.c
+++ b/archival/cpio.c
@@ -191,7 +191,7 @@ static int cpio_o(void)
191#endif 191#endif
192 192
193int cpio_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; 193int cpio_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
194int cpio_main(int argc ATTRIBUTE_UNUSED, char **argv) 194int cpio_main(int argc UNUSED_PARAM, char **argv)
195{ 195{
196 archive_handle_t *archive_handle; 196 archive_handle_t *archive_handle;
197 char *cpio_filename; 197 char *cpio_filename;
diff --git a/archival/dpkg.c b/archival/dpkg.c
index 22e26f566..637afceef 100644
--- a/archival/dpkg.c
+++ b/archival/dpkg.c
@@ -1583,7 +1583,7 @@ static void configure_package(deb_file_t *deb_file)
1583} 1583}
1584 1584
1585int dpkg_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; 1585int dpkg_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
1586int dpkg_main(int argc ATTRIBUTE_UNUSED, char **argv) 1586int dpkg_main(int argc UNUSED_PARAM, char **argv)
1587{ 1587{
1588 deb_file_t **deb_file = NULL; 1588 deb_file_t **deb_file = NULL;
1589 status_node_t *status_node; 1589 status_node_t *status_node;
diff --git a/archival/gzip.c b/archival/gzip.c
index 5c9d6b3b2..ee051356e 100644
--- a/archival/gzip.c
+++ b/archival/gzip.c
@@ -2043,7 +2043,7 @@ int gzip_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
2043#if ENABLE_GUNZIP 2043#if ENABLE_GUNZIP
2044int gzip_main(int argc, char **argv) 2044int gzip_main(int argc, char **argv)
2045#else 2045#else
2046int gzip_main(int argc ATTRIBUTE_UNUSED, char **argv) 2046int gzip_main(int argc UNUSED_PARAM, char **argv)
2047#endif 2047#endif
2048{ 2048{
2049 unsigned opt; 2049 unsigned opt;
diff --git a/archival/libunarchive/decompress_unzip.c b/archival/libunarchive/decompress_unzip.c
index 3b0ca846a..f25808a1a 100644
--- a/archival/libunarchive/decompress_unzip.c
+++ b/archival/libunarchive/decompress_unzip.c
@@ -244,7 +244,7 @@ static void huft_free_all(STATE_PARAM_ONLY)
244 inflate_codes_td = NULL; 244 inflate_codes_td = NULL;
245} 245}
246 246
247static void abort_unzip(STATE_PARAM_ONLY) ATTRIBUTE_NORETURN; 247static void abort_unzip(STATE_PARAM_ONLY) NORETURN;
248static void abort_unzip(STATE_PARAM_ONLY) 248static void abort_unzip(STATE_PARAM_ONLY)
249{ 249{
250 huft_free_all(PASS_STATE_ONLY); 250 huft_free_all(PASS_STATE_ONLY);
diff --git a/archival/libunarchive/header_skip.c b/archival/libunarchive/header_skip.c
index ba4c0ab4b..a97a9ce80 100644
--- a/archival/libunarchive/header_skip.c
+++ b/archival/libunarchive/header_skip.c
@@ -5,6 +5,6 @@
5#include "libbb.h" 5#include "libbb.h"
6#include "unarchive.h" 6#include "unarchive.h"
7 7
8void FAST_FUNC header_skip(const file_header_t *file_header ATTRIBUTE_UNUSED) 8void FAST_FUNC header_skip(const file_header_t *file_header UNUSED_PARAM)
9{ 9{
10} 10}
diff --git a/archival/tar.c b/archival/tar.c
index bb8920ab2..13cdbd930 100644
--- a/archival/tar.c
+++ b/archival/tar.c
@@ -397,7 +397,7 @@ static int exclude_file(const llist_t *excluded_files, const char *file)
397#endif 397#endif
398 398
399static int FAST_FUNC writeFileToTarball(const char *fileName, struct stat *statbuf, 399static int FAST_FUNC writeFileToTarball(const char *fileName, struct stat *statbuf,
400 void *userData, int depth ATTRIBUTE_UNUSED) 400 void *userData, int depth UNUSED_PARAM)
401{ 401{
402 struct TarBallInfo *tbInfo = (struct TarBallInfo *) userData; 402 struct TarBallInfo *tbInfo = (struct TarBallInfo *) userData;
403 const char *header_name; 403 const char *header_name;
@@ -800,7 +800,7 @@ static const char tar_longopts[] ALIGN1 =
800#endif 800#endif
801 801
802int tar_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; 802int tar_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
803int tar_main(int argc ATTRIBUTE_UNUSED, char **argv) 803int tar_main(int argc UNUSED_PARAM, char **argv)
804{ 804{
805 char FAST_FUNC (*get_header_ptr)(archive_handle_t *) = get_header_tar; 805 char FAST_FUNC (*get_header_ptr)(archive_handle_t *) = get_header_tar;
806 archive_handle_t *tar_handle; 806 archive_handle_t *tar_handle;
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,