diff options
| author | aldot <aldot@69ca8d6d-28ef-0310-b511-8ec308f3f277> | 2006-01-22 22:55:11 +0000 |
|---|---|---|
| committer | aldot <aldot@69ca8d6d-28ef-0310-b511-8ec308f3f277> | 2006-01-22 22:55:11 +0000 |
| commit | 992cb48d69edf2d39dd860e116b2c81ef0b57caa (patch) | |
| tree | 1c9eba853c728b5d734506e1c66c269d96fe46ea /e2fsprogs | |
| parent | 109a761214fa3176bf09b23b4b3f2cb7da5a6971 (diff) | |
| download | busybox-w32-992cb48d69edf2d39dd860e116b2c81ef0b57caa.tar.gz busybox-w32-992cb48d69edf2d39dd860e116b2c81ef0b57caa.tar.bz2 busybox-w32-992cb48d69edf2d39dd860e116b2c81ef0b57caa.zip | |
- add platform.h.
- use shorter boilerplate while at it.
git-svn-id: svn://busybox.net/trunk/busybox@13494 69ca8d6d-28ef-0310-b511-8ec308f3f277
Diffstat (limited to 'e2fsprogs')
| -rw-r--r-- | e2fsprogs/tune2fs.c | 2 | ||||
| -rw-r--r-- | e2fsprogs/uuid/uuid.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/e2fsprogs/tune2fs.c b/e2fsprogs/tune2fs.c index e36c47734..f23688bc3 100644 --- a/e2fsprogs/tune2fs.c +++ b/e2fsprogs/tune2fs.c | |||
| @@ -566,7 +566,7 @@ MOUNTS_COUNT_ERROR: | |||
| 566 | } | 566 | } |
| 567 | 567 | ||
| 568 | #ifdef CONFIG_FINDFS | 568 | #ifdef CONFIG_FINDFS |
| 569 | static attribute_noreturn void do_findfs(int argc, char **argv) | 569 | static ATTRIBUTE_NORETURN void do_findfs(int argc, char **argv) |
| 570 | { | 570 | { |
| 571 | if ((argc != 2) || | 571 | if ((argc != 2) || |
| 572 | (strncmp(argv[1], "LABEL=", 6) && strncmp(argv[1], "UUID=", 5))) | 572 | (strncmp(argv[1], "LABEL=", 6) && strncmp(argv[1], "UUID=", 5))) |
diff --git a/e2fsprogs/uuid/uuid.h b/e2fsprogs/uuid/uuid.h index ec6ba52d7..a05f1c690 100644 --- a/e2fsprogs/uuid/uuid.h +++ b/e2fsprogs/uuid/uuid.h | |||
| @@ -54,7 +54,7 @@ typedef unsigned char uuid_t[16]; | |||
| 54 | /* Allow UUID constants to be defined */ | 54 | /* Allow UUID constants to be defined */ |
| 55 | #ifdef __GNUC__ | 55 | #ifdef __GNUC__ |
| 56 | #define UUID_DEFINE(name,u0,u1,u2,u3,u4,u5,u6,u7,u8,u9,u10,u11,u12,u13,u14,u15) \ | 56 | #define UUID_DEFINE(name,u0,u1,u2,u3,u4,u5,u6,u7,u8,u9,u10,u11,u12,u13,u14,u15) \ |
| 57 | static const uuid_t name __attribute__ ((unused)) = {u0,u1,u2,u3,u4,u5,u6,u7,u8,u9,u10,u11,u12,u13,u14,u15} | 57 | static const uuid_t name ATTRIBUTE_UNUSED = {u0,u1,u2,u3,u4,u5,u6,u7,u8,u9,u10,u11,u12,u13,u14,u15} |
| 58 | #else | 58 | #else |
| 59 | #define UUID_DEFINE(name,u0,u1,u2,u3,u4,u5,u6,u7,u8,u9,u10,u11,u12,u13,u14,u15) \ | 59 | #define UUID_DEFINE(name,u0,u1,u2,u3,u4,u5,u6,u7,u8,u9,u10,u11,u12,u13,u14,u15) \ |
| 60 | static const uuid_t name = {u0,u1,u2,u3,u4,u5,u6,u7,u8,u9,u10,u11,u12,u13,u14,u15} | 60 | static const uuid_t name = {u0,u1,u2,u3,u4,u5,u6,u7,u8,u9,u10,u11,u12,u13,u14,u15} |