diff options
| author | Rob Landley <rob@landley.net> | 2006-08-03 15:41:12 +0000 |
|---|---|---|
| committer | Rob Landley <rob@landley.net> | 2006-08-03 15:41:12 +0000 |
| commit | d921b2ecc0d294ad4bf8c7458fc52a60c28727d2 (patch) | |
| tree | e4a2769349867c441cf2983d83097bb66701a733 /e2fsprogs/e2p | |
| parent | 6dce0b6fa79f2d4bb7e9d90e1fbc0f6beb25f855 (diff) | |
| download | busybox-d921b2ecc0d294ad4bf8c7458fc52a60c28727d2.tar.gz | |
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.)
Diffstat (limited to 'e2fsprogs/e2p')
| -rw-r--r-- | e2fsprogs/e2p/feature.c | 2 | ||||
| -rw-r--r-- | e2fsprogs/e2p/mntopts.c | 2 | ||||
| -rw-r--r-- | e2fsprogs/e2p/ostype.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/e2fsprogs/e2p/feature.c b/e2fsprogs/e2p/feature.c index 602c2ff02..b45754f97 100644 --- a/e2fsprogs/e2p/feature.c +++ b/e2fsprogs/e2p/feature.c @@ -155,7 +155,7 @@ int e2p_edit_feature(const char *str, __u32 *compat_array, __u32 *ok_array) unsigned int mask; int compat_type; - buf = bb_xstrdup(str); + buf = xstrdup(str); cp = buf; while (cp && *cp) { neg = 0; diff --git a/e2fsprogs/e2p/mntopts.c b/e2fsprogs/e2p/mntopts.c index 1ec3402f7..17c26c480 100644 --- a/e2fsprogs/e2p/mntopts.c +++ b/e2fsprogs/e2p/mntopts.c @@ -100,7 +100,7 @@ int e2p_edit_mntopts(const char *str, __u32 *mntopts, __u32 ok) int neg; unsigned int mask; - buf = bb_xstrdup(str); + buf = xstrdup(str); cp = buf; while (cp && *cp) { neg = 0; diff --git a/e2fsprogs/e2p/ostype.c b/e2fsprogs/e2p/ostype.c index d55f98bb2..0e111d408 100644 --- a/e2fsprogs/e2p/ostype.c +++ b/e2fsprogs/e2p/ostype.c @@ -33,7 +33,7 @@ char *e2p_os2string(int os_type) else os = "(unknown os)"; - ret = bb_xstrdup(os); + ret = xstrdup(os); return ret; } |