diff options
| author | Rob Landley | 2006-08-03 15:41:12 +0000 |
|---|---|---|
| committer | Rob Landley | 2006-08-03 15:41:12 +0000 |
| commit | d921b2ecc0d294ad4bf8c7458fc52a60c28727d2 (patch) | |
| tree | e4a2769349867c441cf2983d83097bb66701a733 /e2fsprogs/mke2fs.c | |
| parent | 6dce0b6fa79f2d4bb7e9d90e1fbc0f6beb25f855 (diff) | |
| download | busybox-d921b2ecc0d294ad4bf8c7458fc52a60c28727d2.zip 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/mke2fs.c')
| -rw-r--r-- | e2fsprogs/mke2fs.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/e2fsprogs/mke2fs.c b/e2fsprogs/mke2fs.c index f1e4083..ea6afb9 100644 --- a/e2fsprogs/mke2fs.c +++ b/e2fsprogs/mke2fs.c @@ -226,7 +226,7 @@ static void read_bb_file(ext2_filsys fs, badblocks_list *bb_list, FILE *f; errcode_t retval; - f = bb_xfopen(bad_blocks_file, "r"); + f = xfopen(bad_blocks_file, "r"); retval = ext2fs_read_bb_FILE(fs, f, bb_list, invalid_block); fclose (f); mke2fs_error_msg_and_die(retval, "read bad blocks from list"); @@ -692,7 +692,7 @@ static void parse_extended_opts(struct ext2_super_block *sb_param, char *buf, *token, *next, *p, *arg; int r_usage = 0; - buf = bb_xstrdup(opts); + buf = xstrdup(opts); for (token = buf; token && *token; token = next) { p = strchr(token, ','); next = 0; |