aboutsummaryrefslogtreecommitdiff
path: root/archival
diff options
context:
space:
mode:
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)
}
int bunzip2_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
-int bunzip2_main(int argc ATTRIBUTE_UNUSED, char **argv)
+int bunzip2_main(int argc UNUSED_PARAM, char **argv)
{
getopt32(argv, "cfvdt");
argv += optind;
@@ -277,7 +277,7 @@ USE_DESKTOP(long long) int unpack_gunzip(void)
*/
int gunzip_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
-int gunzip_main(int argc ATTRIBUTE_UNUSED, char **argv)
+int gunzip_main(int argc UNUSED_PARAM, char **argv)
{
getopt32(argv, "cfvdtn");
argv += optind;
@@ -315,7 +315,7 @@ USE_DESKTOP(long long) int unpack_unlzma(void)
}
int unlzma_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
-int unlzma_main(int argc ATTRIBUTE_UNUSED, char **argv)
+int unlzma_main(int argc UNUSED_PARAM, char **argv)
{
getopt32(argv, "cf");
argv += optind;
@@ -357,7 +357,7 @@ USE_DESKTOP(long long) int unpack_uncompress(void)
}
int uncompress_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
-int uncompress_main(int argc ATTRIBUTE_UNUSED, char **argv)
+int uncompress_main(int argc UNUSED_PARAM, char **argv)
{
getopt32(argv, "cf");
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;
#define False ((Bool)0)
#if BZ_LIGHT_DEBUG
-static void bz_assert_fail(int errcode) ATTRIBUTE_NORETURN;
+static void bz_assert_fail(int errcode) NORETURN;
#define AssertH(cond, errcode) \
do { \
if (!(cond)) \
@@ -170,7 +170,7 @@ typedef struct EState {
/* map of bytes used in block */
int32_t nInUse;
- Bool inUse[256] __attribute__(( aligned(sizeof(long)) ));
+ Bool inUse[256] ALIGNED(sizeof(long));
uint8_t unseqToSeq[256];
/* 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)
}
int bzip2_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
-int bzip2_main(int argc ATTRIBUTE_UNUSED, char **argv)
+int bzip2_main(int argc UNUSED_PARAM, char **argv)
{
unsigned opt;
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)
#endif
int cpio_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
-int cpio_main(int argc ATTRIBUTE_UNUSED, char **argv)
+int cpio_main(int argc UNUSED_PARAM, char **argv)
{
archive_handle_t *archive_handle;
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)
}
int dpkg_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
-int dpkg_main(int argc ATTRIBUTE_UNUSED, char **argv)
+int dpkg_main(int argc UNUSED_PARAM, char **argv)
{
deb_file_t **deb_file = NULL;
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;
#if ENABLE_GUNZIP
int gzip_main(int argc, char **argv)
#else
-int gzip_main(int argc ATTRIBUTE_UNUSED, char **argv)
+int gzip_main(int argc UNUSED_PARAM, char **argv)
#endif
{
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)
inflate_codes_td = NULL;
}
-static void abort_unzip(STATE_PARAM_ONLY) ATTRIBUTE_NORETURN;
+static void abort_unzip(STATE_PARAM_ONLY) NORETURN;
static void abort_unzip(STATE_PARAM_ONLY)
{
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 @@
#include "libbb.h"
#include "unarchive.h"
-void FAST_FUNC header_skip(const file_header_t *file_header ATTRIBUTE_UNUSED)
+void FAST_FUNC header_skip(const file_header_t *file_header UNUSED_PARAM)
{
}
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)
#endif
static int FAST_FUNC writeFileToTarball(const char *fileName, struct stat *statbuf,
- void *userData, int depth ATTRIBUTE_UNUSED)
+ void *userData, int depth UNUSED_PARAM)
{
struct TarBallInfo *tbInfo = (struct TarBallInfo *) userData;
const char *header_name;
@@ -800,7 +800,7 @@ static const char tar_longopts[] ALIGN1 =
#endif
int tar_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
-int tar_main(int argc ATTRIBUTE_UNUSED, char **argv)
+int tar_main(int argc UNUSED_PARAM, char **argv)
{
char FAST_FUNC (*get_header_ptr)(archive_handle_t *) = get_header_tar;
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 {
uint16_t method; /* 4-5 */
uint16_t modtime; /* 6-7 */
uint16_t moddate; /* 8-9 */
- uint32_t crc32 ATTRIBUTE_PACKED; /* 10-13 */
- uint32_t cmpsize ATTRIBUTE_PACKED; /* 14-17 */
- uint32_t ucmpsize ATTRIBUTE_PACKED; /* 18-21 */
+ uint32_t crc32 PACKED; /* 10-13 */
+ uint32_t cmpsize PACKED; /* 14-17 */
+ uint32_t ucmpsize PACKED; /* 18-21 */
uint16_t filename_len; /* 22-23 */
uint16_t extra_len; /* 24-25 */
- } formatted ATTRIBUTE_PACKED;
-} zip_header_t; /* ATTRIBUTE_PACKED - gcc 4.2.1 doesn't like it (spews warning) */
+ } formatted PACKED;
+} zip_header_t; /* PACKED - gcc 4.2.1 doesn't like it (spews warning) */
/* Check the offset of the last element, not the length. This leniency
* allows for poor packing, whereby the overall struct may be too long,