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 /miscutils/devfsd.c | |
| 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 'miscutils/devfsd.c')
| -rw-r--r-- | miscutils/devfsd.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/miscutils/devfsd.c b/miscutils/devfsd.c index 39f04780a..0f36970f9 100644 --- a/miscutils/devfsd.c +++ b/miscutils/devfsd.c @@ -475,7 +475,7 @@ int devfsd_main (int argc, char **argv) if (chdir (mount_point) != 0) devfsd_perror_msg_and_die(mount_point); - fd = bb_xopen (".devfsd", O_RDONLY); + fd = xopen (".devfsd", O_RDONLY); if (fcntl (fd, F_SETFD, FD_CLOEXEC) != 0) devfsd_perror_msg_and_die("FD_CLOEXEC"); @@ -704,7 +704,7 @@ static void process_config_line (const char *line, unsigned long *event_mask) num_args -= 3; for (count = 0; count < num_args; ++count) - new->u.execute.argv[count] = bb_xstrdup (p[count]); + new->u.execute.argv[count] = xstrdup (p[count]); new->u.execute.argv[num_args] = NULL; break; @@ -714,8 +714,8 @@ static void process_config_line (const char *line, unsigned long *event_mask) if (num_args != 2) goto process_config_line_err; /* missing path and function in line */ - new->u.copy.source = bb_xstrdup (p[0]); - new->u.copy.destination = bb_xstrdup (p[1]); + new->u.copy.source = xstrdup (p[0]); + new->u.copy.destination = xstrdup (p[1]); break; case 8: /* IGNORE */ /* FALLTROUGH */ |