diff options
| author | Bernhard Reutner-Fischer <rep.dot.nop@gmail.com> | 2006-08-18 17:22:23 +0000 |
|---|---|---|
| committer | Bernhard Reutner-Fischer <rep.dot.nop@gmail.com> | 2006-08-18 17:22:23 +0000 |
| commit | 5bd2a4b6ceb253ddb95a4940262c75b71f130d04 (patch) | |
| tree | b0cfcdb9a8d3f7b672609b97be2a2147f8ba433d | |
| parent | 4470b74e29f98ffdd39acf8085e5b7cd0758edaa (diff) | |
| download | busybox-5bd2a4b6ceb253ddb95a4940262c75b71f130d04.tar.gz | |
- remove last reminiscents of IN_BUSYBOX
| -rw-r--r-- | networking/udhcp/Makefile.in | 6 | ||||
| -rw-r--r-- | networking/udhcp/arpping.c | 4 | ||||
| -rw-r--r-- | networking/udhcp/dumpleases.c | 22 |
3 files changed, 4 insertions, 28 deletions
diff --git a/networking/udhcp/Makefile.in b/networking/udhcp/Makefile.in index 77c4b720a..cbc6f2b39 100644 --- a/networking/udhcp/Makefile.in +++ b/networking/udhcp/Makefile.in @@ -43,11 +43,11 @@ APPLET_SRC-a+=$(UDHCP-a) UDHCP_INCLUDES:=$(srcdir) -APPLETS_DEFINE-y+=-DIN_BUSYBOX -I$(UDHCP_INCLUDES) -APPLETS_DEFINE-a+=-DIN_BUSYBOX -I$(UDHCP_INCLUDES) +APPLETS_DEFINE-y+= -I$(UDHCP_INCLUDES) +APPLETS_DEFINE-a+= -I$(UDHCP_INCLUDES) $(UDHCP_DIR)$(UDHCP_AR): $(UDHCP_OBJS) $(do_ar) $(UDHCP_OBJS): $(UDHCP_DIR)%.o : $(srcdir)/%.c - $(compile.c) -DIN_BUSYBOX + $(compile.c) diff --git a/networking/udhcp/arpping.c b/networking/udhcp/arpping.c index 97dfcc185..6e254f604 100644 --- a/networking/udhcp/arpping.c +++ b/networking/udhcp/arpping.c @@ -44,11 +44,7 @@ int arpping(uint32_t yiaddr, uint32_t ip, uint8_t *mac, char *interface) if ((s = socket (PF_PACKET, SOCK_PACKET, htons(ETH_P_ARP))) == -1) { -#ifdef IN_BUSYBOX LOG(LOG_ERR, bb_msg_can_not_create_raw_socket); -#else - LOG(LOG_ERR, "Could not open raw socket"); -#endif return -1; } diff --git a/networking/udhcp/dumpleases.c b/networking/udhcp/dumpleases.c index 08a22f17d..60e6b7edf 100644 --- a/networking/udhcp/dumpleases.c +++ b/networking/udhcp/dumpleases.c @@ -23,27 +23,7 @@ #define REMAINING 0 #define ABSOLUTE 1 - -#ifndef IN_BUSYBOX -static void ATTRIBUTE_NORETURN show_usage(void) -{ - printf( -"Usage: dumpleases -f <file> -[r|a]\n\n" -" -f, --file=FILENAME Leases file to load\n" -" -r, --remaining Interepret lease times as time remaining\n" -" -a, --absolute Interepret lease times as expire time\n"); - exit(0); -} -#else -#define show_usage bb_show_usage -#endif - - -#ifdef IN_BUSYBOX int dumpleases_main(int argc, char *argv[]) -#else -int main(int argc, char *argv[]) -#endif { FILE *fp; int i, c, mode = REMAINING; @@ -71,7 +51,7 @@ int main(int argc, char *argv[]) file = optarg; break; default: - show_usage(); + bb_show_usage(); } } |