svn commit: trunk/busybox/networking/udhcp

[aldot at busybox.net]

Author: aldot
Date: 2006-08-18 10:22:23 -0700 (Fri, 18 Aug 2006)
New Revision: 15824

Log:
- remove last reminiscents of IN_BUSYBOX


Modified:
   trunk/busybox/networking/udhcp/Makefile.in
   trunk/busybox/networking/udhcp/arpping.c
   trunk/busybox/networking/udhcp/dumpleases.c


Changeset:
Modified: trunk/busybox/networking/udhcp/Makefile.in
===================================================================
--- trunk/busybox/networking/udhcp/Makefile.in	2006-08-18 03:54:15 UTC (rev 15823)
+++ trunk/busybox/networking/udhcp/Makefile.in	2006-08-18 17:22:23 UTC (rev 15824)
@@ -43,11 +43,11 @@
 
 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)

Modified: trunk/busybox/networking/udhcp/arpping.c
===================================================================
--- trunk/busybox/networking/udhcp/arpping.c	2006-08-18 03:54:15 UTC (rev 15823)
+++ trunk/busybox/networking/udhcp/arpping.c	2006-08-18 17:22:23 UTC (rev 15824)
@@ -44,11 +44,7 @@
 
 
 	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;
 	}
 

Modified: trunk/busybox/networking/udhcp/dumpleases.c
===================================================================
--- trunk/busybox/networking/udhcp/dumpleases.c	2006-08-18 03:54:15 UTC (rev 15823)
+++ trunk/busybox/networking/udhcp/dumpleases.c	2006-08-18 17:22:23 UTC (rev 15824)
@@ -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 @@
 			file = optarg;
 			break;
 		default:
-			show_usage();
+			bb_show_usage();
 		}
 	}