diff options
| author | Bernhard Reutner-Fischer <rep.dot.nop@gmail.com> | 2006-01-22 22:55:11 +0000 |
|---|---|---|
| committer | Bernhard Reutner-Fischer <rep.dot.nop@gmail.com> | 2006-01-22 22:55:11 +0000 |
| commit | 86f5c9906beac527f3d7966f24811b571a589e08 (patch) | |
| tree | 1c9eba853c728b5d734506e1c66c269d96fe46ea /util-linux | |
| parent | 2edf52643d3eb3d13f26d31f9678cf122f2063bc (diff) | |
| download | busybox-86f5c9906beac527f3d7966f24811b571a589e08.tar.gz | |
- add platform.h.
- use shorter boilerplate while at it.
Diffstat (limited to 'util-linux')
| -rw-r--r-- | util-linux/fdisk.c | 9 | ||||
| -rw-r--r-- | util-linux/fsck_minix.c | 2 |
2 files changed, 4 insertions, 7 deletions
diff --git a/util-linux/fdisk.c b/util-linux/fdisk.c index eec82a6be..6edf9c31e 100644 --- a/util-linux/fdisk.c +++ b/util-linux/fdisk.c @@ -2,10 +2,7 @@ * * Copyright (C) 1992 A. V. Le Blanc (LeBlanc@mcc.ac.uk) * - * This program is free software. You can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation: either version 1 or - * (at your option) any later version. + * Licensed under the GPL v1 or later, see the file LICENSE in this tarball. * * Vladimir Oleynik <dzo@simtreas.ru> 2001,2002 Busybox port */ @@ -200,7 +197,7 @@ struct partition { unsigned char end_cyl; /* end cylinder */ unsigned char start4[4]; /* starting sector counting from 0 */ unsigned char size4[4]; /* nr of sectors in partition */ -} __attribute__((__packed__)); +} ATTRIBUTE_PACKED; enum failure { ioctl_error, unable_to_open, unable_to_read, unable_to_seek, @@ -224,7 +221,7 @@ static void list_types(const struct systypes *sys); static uint read_int(uint low, uint dflt, uint high, uint base, char *mesg); #endif static const char *partition_type(unsigned char type); -static void fdisk_fatal(enum failure why) __attribute__ ((noreturn)); +static void fdisk_fatal(enum failure why) ATTRIBUTE_NORETURN; static void get_geometry(void); static int get_boot(enum action what); diff --git a/util-linux/fsck_minix.c b/util-linux/fsck_minix.c index f6d7deaab..1814537c5 100644 --- a/util-linux/fsck_minix.c +++ b/util-linux/fsck_minix.c @@ -269,7 +269,7 @@ static inline int bit(char * a,unsigned int i) #define mark_zone(x) (setbit(zone_map,(x)-FIRSTZONE+1),changed=1) #define unmark_zone(x) (clrbit(zone_map,(x)-FIRSTZONE+1),changed=1) -static void leave(int) __attribute__ ((noreturn)); +static void leave(int) ATTRIBUTE_NORETURN; static void leave(int status) { if (termios_set) |