aboutsummaryrefslogtreecommitdiff
path: root/miscutils
diff options
context:
space:
mode:
authorGravatar Denis Vlasenko <vda.linux@googlemail.com>2007-08-17 08:29:48 +0000
committerGravatar Denis Vlasenko <vda.linux@googlemail.com>2007-08-17 08:29:48 +0000
commit856be770a66a4d928f13c9d2f401dc1092e5270e (patch)
tree62c6391260ae26ec9a383e72265a4ab3f6894373 /miscutils
parent7f175ccbc38c0de2423a9554f8ee1663431845d9 (diff)
downloadbusybox-856be770a66a4d928f13c9d2f401dc1092e5270e.tar.gz
busybox-856be770a66a4d928f13c9d2f401dc1092e5270e.tar.bz2
assorted fixes for breakage found by randomconfig
Diffstat (limited to 'miscutils')
-rw-r--r--miscutils/devfsd.c9
1 files changed, 4 insertions, 5 deletions
diff --git a/miscutils/devfsd.c b/miscutils/devfsd.c
index 6b31f368a..bfa5c1727 100644
--- a/miscutils/devfsd.c
+++ b/miscutils/devfsd.c
@@ -631,7 +631,8 @@ static void process_config_line(const char *line, unsigned long *event_mask)
last_config->next = new;
last_config = new;
return;
-process_config_line_err:
+
+ process_config_line_err:
msg_logger_and_die(LOG_ERR, bb_msg_bad_config, msg , line);
} /* End Function process_config_line */
@@ -644,11 +645,9 @@ static int do_servicing(int fd, unsigned long event_mask)
{
ssize_t bytes;
struct devfsd_notify_struct info;
- unsigned long tmp_event_mask;
- /* Tell devfs what events we care about */
- tmp_event_mask = event_mask;
- xioctl(fd, DEVFSDIOC_SET_EVENT_MASK, tmp_event_mask);
+ /* (void*) cast is only in order to match prototype */
+ xioctl(fd, DEVFSDIOC_SET_EVENT_MASK, (void*)event_mask);
while (!caught_signal) {
errno = 0;
bytes = read(fd,(char *) &info, sizeof info);