From 856be770a66a4d928f13c9d2f401dc1092e5270e Mon Sep 17 00:00:00 2001 From: Denis Vlasenko Date: Fri, 17 Aug 2007 08:29:48 +0000 Subject: assorted fixes for breakage found by randomconfig --- miscutils/devfsd.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'miscutils/devfsd.c') 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); -- cgit v1.2.3