From d921b2ecc0d294ad4bf8c7458fc52a60c28727d2 Mon Sep 17 00:00:00 2001 From: Rob Landley Date: Thu, 3 Aug 2006 15:41:12 +0000 Subject: Remove bb_ prefixes from xfuncs.c (and a few other places), consolidate things like xasprintf() into xfuncs.c, remove xprint_file_by_name() (it only had one user), clean up lots of #includes... General cleanup pass. What I've been doing for the last couple days. And it conflicts! I've removed httpd.c from this checkin due to somebody else touching that file. It builds for me. I have to catch a bus. (Now you know why I'm looking forward to Mercurial.) --- util-linux/getopt.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) (limited to 'util-linux/getopt.c') diff --git a/util-linux/getopt.c b/util-linux/getopt.c index fab8f83..bf05f91 100644 --- a/util-linux/getopt.c +++ b/util-linux/getopt.c @@ -31,14 +31,8 @@ * */ -#include -#include -#include -#include -#include -#include - #include "busybox.h" +#include /* NON_OPT is the code that is returned when a non-option is found in '+' mode */ @@ -86,7 +80,7 @@ const char *normalize(const char *arg) free(BUFFER); if (!quote) { /* Just copy arg */ - BUFFER=bb_xstrdup(arg); + BUFFER=xstrdup(arg); return BUFFER; } @@ -215,7 +209,7 @@ void add_longopt(const char *name,int has_arg) long_options[long_options_nr-1].has_arg=has_arg; long_options[long_options_nr-1].flag=NULL; long_options[long_options_nr-1].val=LONG_OPT; - long_options[long_options_nr-1].name=bb_xstrdup(name); + long_options[long_options_nr-1].name=xstrdup(name); } long_options_nr++; } -- cgit v1.1