From a60f84ebf07863e390b72a2b6150e461a1ec18e9 Mon Sep 17 00:00:00 2001 From: Denis Vlasenko Date: Sat, 5 Jul 2008 09:18:54 +0000 Subject: *: rename ATTRIBUTE_XXX to just XXX. --- e2fsprogs/chattr.c | 2 +- e2fsprogs/fsck.c | 4 ++-- e2fsprogs/lsattr.c | 4 ++-- e2fsprogs/old_e2fsprogs/ext2fs/getsize.c | 2 +- e2fsprogs/old_e2fsprogs/uuid/uuid.h | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) (limited to 'e2fsprogs') diff --git a/e2fsprogs/chattr.c b/e2fsprogs/chattr.c index e783d3e89..b41919be2 100644 --- a/e2fsprogs/chattr.c +++ b/e2fsprogs/chattr.c @@ -125,7 +125,7 @@ static void change_attributes(const char *name, struct globals *gp) } int chattr_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; -int chattr_main(int argc ATTRIBUTE_UNUSED, char **argv) +int chattr_main(int argc UNUSED_PARAM, char **argv) { struct globals g; char *arg; diff --git a/e2fsprogs/fsck.c b/e2fsprogs/fsck.c index 0707d295d..c17693699 100644 --- a/e2fsprogs/fsck.c +++ b/e2fsprogs/fsck.c @@ -1122,13 +1122,13 @@ static void parse_args(char **argv) max_running = xatoi(tmp); } -static void signal_cancel(int sig ATTRIBUTE_UNUSED) +static void signal_cancel(int sig UNUSED_PARAM) { cancel_requested = 1; } int fsck_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; -int fsck_main(int argc ATTRIBUTE_UNUSED, char **argv) +int fsck_main(int argc UNUSED_PARAM, char **argv) { int i, status; /*int interactive;*/ diff --git a/e2fsprogs/lsattr.c b/e2fsprogs/lsattr.c index 066af86c7..23a54b72e 100644 --- a/e2fsprogs/lsattr.c +++ b/e2fsprogs/lsattr.c @@ -58,7 +58,7 @@ static void list_attributes(const char *name) } static int lsattr_dir_proc(const char *dir_name, struct dirent *de, - void *private ATTRIBUTE_UNUSED) + void *private UNUSED_PARAM) { struct stat st; char *path; @@ -96,7 +96,7 @@ static void lsattr_args(const char *name) } int lsattr_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; -int lsattr_main(int argc ATTRIBUTE_UNUSED, char **argv) +int lsattr_main(int argc UNUSED_PARAM, char **argv) { getopt32(argv, "Radlv"); argv += optind; diff --git a/e2fsprogs/old_e2fsprogs/ext2fs/getsize.c b/e2fsprogs/old_e2fsprogs/ext2fs/getsize.c index 63a0dcad9..ff11fe98c 100644 --- a/e2fsprogs/old_e2fsprogs/ext2fs/getsize.c +++ b/e2fsprogs/old_e2fsprogs/ext2fs/getsize.c @@ -78,7 +78,7 @@ errcode_t ext2fs_get_device_size(const char *file, int blocksize, dev = CreateFile(file, GENERIC_READ, FILE_SHARE_READ | FILE_SHARE_WRITE , - NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); + NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); if (dev == INVALID_HANDLE_VALUE) return EBADF; diff --git a/e2fsprogs/old_e2fsprogs/uuid/uuid.h b/e2fsprogs/old_e2fsprogs/uuid/uuid.h index bd53b15d0..b30ca3c62 100644 --- a/e2fsprogs/old_e2fsprogs/uuid/uuid.h +++ b/e2fsprogs/old_e2fsprogs/uuid/uuid.h @@ -54,7 +54,7 @@ typedef unsigned char uuid_t[16]; /* Allow UUID constants to be defined */ #ifdef __GNUC__ #define UUID_DEFINE(name,u0,u1,u2,u3,u4,u5,u6,u7,u8,u9,u10,u11,u12,u13,u14,u15) \ - static const uuid_t name ATTRIBUTE_UNUSED = {u0,u1,u2,u3,u4,u5,u6,u7,u8,u9,u10,u11,u12,u13,u14,u15} + static const uuid_t name UNUSED_PARAM = {u0,u1,u2,u3,u4,u5,u6,u7,u8,u9,u10,u11,u12,u13,u14,u15} #else #define UUID_DEFINE(name,u0,u1,u2,u3,u4,u5,u6,u7,u8,u9,u10,u11,u12,u13,u14,u15) \ static const uuid_t name = {u0,u1,u2,u3,u4,u5,u6,u7,u8,u9,u10,u11,u12,u13,u14,u15} -- cgit v1.2.3