diff options
author | Bernhard Reutner-Fischer <rep.dot.nop@gmail.com> | 2006-01-23 01:55:11 +0300 |
---|---|---|
committer | Bernhard Reutner-Fischer <rep.dot.nop@gmail.com> | 2006-01-23 01:55:11 +0300 |
commit | 86f5c9906beac527f3d7966f24811b571a589e08 (patch) | |
tree | 1c9eba853c728b5d734506e1c66c269d96fe46ea /networking/udhcp | |
parent | 2edf52643d3eb3d13f26d31f9678cf122f2063bc (diff) |
- add platform.h.
- use shorter boilerplate while at it.
Diffstat (limited to 'networking/udhcp')
-rw-r--r-- | networking/udhcp/arpping.h | 2 | ||||
-rw-r--r-- | networking/udhcp/dhcpc.c | 18 | ||||
-rw-r--r-- | networking/udhcp/dumpleases.c | 6 |
3 files changed, 9 insertions, 17 deletions
diff --git a/networking/udhcp/arpping.h b/networking/udhcp/arpping.h index 6f27d9f75..30959ca99 100644 --- a/networking/udhcp/arpping.h +++ b/networking/udhcp/arpping.h @@ -27,7 +27,7 @@ struct arpMsg { uint8_t tHaddr[6]; /* target's hardware address */ uint8_t tInaddr[4]; /* target's IP address */ uint8_t pad[18]; /* pad for min. Ethernet payload (60 bytes) */ -} __attribute__ ((packed)); +} ATTRIBUTE_PACKED; /* function prototypes */ int arpping(uint32_t yiaddr, uint32_t ip, uint8_t *arp, char *interface); diff --git a/networking/udhcp/dhcpc.c b/networking/udhcp/dhcpc.c index d5c69db42..c4277e3f1 100644 --- a/networking/udhcp/dhcpc.c +++ b/networking/udhcp/dhcpc.c @@ -4,19 +4,7 @@ * * Russ Dill <Russ.Dill@asu.edu> July 2001 * - * 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 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + * Licensed under the GPL v2 or later, see the file LICENSE in this tarball. */ #include <sys/time.h> @@ -74,7 +62,7 @@ struct client_config_t client_config = { }; #ifndef IN_BUSYBOX -static void __attribute__ ((noreturn)) show_usage(void) +static void ATTRIBUTE_NORETURN show_usage(void) { printf( "Usage: udhcpc [OPTIONS]\n\n" @@ -101,7 +89,7 @@ static void __attribute__ ((noreturn)) show_usage(void) } #else #define show_usage bb_show_usage -extern void show_usage(void) __attribute__ ((noreturn)); +extern void show_usage(void) ATTRIBUTE_NORETURN; #endif diff --git a/networking/udhcp/dumpleases.c b/networking/udhcp/dumpleases.c index a9036dfbd..ca5c6059e 100644 --- a/networking/udhcp/dumpleases.c +++ b/networking/udhcp/dumpleases.c @@ -1,3 +1,7 @@ +/* vi: set sw=4 ts=4: */ +/* + Licensed under the GPL v2 or later, see the file LICENSE in this tarball. + */ #include <fcntl.h> #include <string.h> #include <stdlib.h> @@ -21,7 +25,7 @@ #ifndef IN_BUSYBOX -static void __attribute__ ((noreturn)) show_usage(void) +static void ATTRIBUTE_NORETURN show_usage(void) { printf( "Usage: dumpleases -f <file> -[r|a]\n\n" |