aboutsummaryrefslogtreecommitdiff
path: root/miscutils/devfsd.c
diff options
context:
space:
mode:
authorlandley <landley@69ca8d6d-28ef-0310-b511-8ec308f3f277>2006-08-03 15:41:12 +0000
committerlandley <landley@69ca8d6d-28ef-0310-b511-8ec308f3f277>2006-08-03 15:41:12 +0000
commit5e2a5391f9142bca773aab4c829615895b69a6b7 (patch)
treee4a2769349867c441cf2983d83097bb66701a733 /miscutils/devfsd.c
parente883e03918a0e26e390ea23996abdb8fc1925f88 (diff)
downloadbusybox-w32-5e2a5391f9142bca773aab4c829615895b69a6b7.tar.gz
busybox-w32-5e2a5391f9142bca773aab4c829615895b69a6b7.tar.bz2
busybox-w32-5e2a5391f9142bca773aab4c829615895b69a6b7.zip
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.) git-svn-id: svn://busybox.net/trunk/busybox@15767 69ca8d6d-28ef-0310-b511-8ec308f3f277
Diffstat (limited to 'miscutils/devfsd.c')
-rw-r--r--miscutils/devfsd.c8
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)
475 if (chdir (mount_point) != 0) 475 if (chdir (mount_point) != 0)
476 devfsd_perror_msg_and_die(mount_point); 476 devfsd_perror_msg_and_die(mount_point);
477 477
478 fd = bb_xopen (".devfsd", O_RDONLY); 478 fd = xopen (".devfsd", O_RDONLY);
479 479
480 if (fcntl (fd, F_SETFD, FD_CLOEXEC) != 0) 480 if (fcntl (fd, F_SETFD, FD_CLOEXEC) != 0)
481 devfsd_perror_msg_and_die("FD_CLOEXEC"); 481 devfsd_perror_msg_and_die("FD_CLOEXEC");
@@ -704,7 +704,7 @@ static void process_config_line (const char *line, unsigned long *event_mask)
704 num_args -= 3; 704 num_args -= 3;
705 705
706 for (count = 0; count < num_args; ++count) 706 for (count = 0; count < num_args; ++count)
707 new->u.execute.argv[count] = bb_xstrdup (p[count]); 707 new->u.execute.argv[count] = xstrdup (p[count]);
708 708
709 new->u.execute.argv[num_args] = NULL; 709 new->u.execute.argv[num_args] = NULL;
710 break; 710 break;
@@ -714,8 +714,8 @@ static void process_config_line (const char *line, unsigned long *event_mask)
714 if (num_args != 2) 714 if (num_args != 2)
715 goto process_config_line_err; /* missing path and function in line */ 715 goto process_config_line_err; /* missing path and function in line */
716 716
717 new->u.copy.source = bb_xstrdup (p[0]); 717 new->u.copy.source = xstrdup (p[0]);
718 new->u.copy.destination = bb_xstrdup (p[1]); 718 new->u.copy.destination = xstrdup (p[1]);
719 break; 719 break;
720 case 8: /* IGNORE */ 720 case 8: /* IGNORE */
721 /* FALLTROUGH */ 721 /* FALLTROUGH */