X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fudev%2Fudevd.c;h=9d7fa033b637f40e55c6cd2816129cc56015540c;hb=955d98c9c1104d469c2989dbfb58f58ee6fe9bdc;hp=d7c172cc75aea0c6039fb242341e6cc199ded9ac;hpb=9f6445e34a57c270f013c9416c123e56261553dd;p=elogind.git

diff --git a/src/udev/udevd.c b/src/udev/udevd.c
index d7c172cc7..9d7fa033b 100644
--- a/src/udev/udevd.c
+++ b/src/udev/udevd.c
@@ -200,7 +200,7 @@ static void worker_new(struct event *event)
         udev_monitor_allow_unicast_sender(worker_monitor, monitor);
         udev_monitor_enable_receiving(worker_monitor);
 
-        worker = calloc(1, sizeof(struct worker));
+        worker = new0(struct worker, 1);
         if (worker == NULL) {
                 udev_monitor_unref(worker_monitor);
                 return;
@@ -247,12 +247,12 @@ static void worker_new(struct event *event)
                         goto out;
                 }
 
-                memset(&ep_signal, 0, sizeof(struct epoll_event));
+                memzero(&ep_signal, sizeof(struct epoll_event));
                 ep_signal.events = EPOLLIN;
                 ep_signal.data.fd = fd_signal;
 
                 fd_monitor = udev_monitor_get_fd(worker_monitor);
-                memset(&ep_monitor, 0, sizeof(struct epoll_event));
+                memzero(&ep_monitor, sizeof(struct epoll_event));
                 ep_monitor.events = EPOLLIN;
                 ep_monitor.data.fd = fd_monitor;
 
@@ -303,7 +303,7 @@ static void worker_new(struct event *event)
                         udev_monitor_send_device(worker_monitor, NULL, dev);
 
                         /* send udevd the result of the event execution */
-                        memset(&msg, 0, sizeof(struct worker_message));
+                        memzero(&msg, sizeof(struct worker_message));
                         if (err != 0)
                                 msg.exitcode = err;
                         msg.pid = getpid();
@@ -431,7 +431,7 @@ static int event_queue_insert(struct udev_device *dev)
 {
         struct event *event;
 
-        event = calloc(1, sizeof(struct event));
+        event = new0(struct event, 1);
         if (event == NULL)
                 return -1;
 
@@ -635,7 +635,7 @@ static struct udev_ctrl_connection *handle_ctrl_msg(struct udev_ctrl *uctrl)
 
         i = udev_ctrl_get_set_log_level(ctrl_msg);
         if (i >= 0) {
-                log_debug("udevd message (SET_LOG_PRIORITY) received, log_priority=%i", i);
+                log_debug("udevd message (SET_LOG_LEVEL) received, log_priority=%i", i);
                 log_set_max_level(i);
                 udev_set_log_priority(udev, i);
                 worker_kill(udev);
@@ -1159,23 +1159,23 @@ int main(int argc, char *argv[])
                 goto exit;
         }
 
-        memset(&ep_ctrl, 0, sizeof(struct epoll_event));
+        memzero(&ep_ctrl, sizeof(struct epoll_event));
         ep_ctrl.events = EPOLLIN;
         ep_ctrl.data.fd = fd_ctrl;
 
-        memset(&ep_inotify, 0, sizeof(struct epoll_event));
+        memzero(&ep_inotify, sizeof(struct epoll_event));
         ep_inotify.events = EPOLLIN;
         ep_inotify.data.fd = fd_inotify;
 
-        memset(&ep_signal, 0, sizeof(struct epoll_event));
+        memzero(&ep_signal, sizeof(struct epoll_event));
         ep_signal.events = EPOLLIN;
         ep_signal.data.fd = fd_signal;
 
-        memset(&ep_netlink, 0, sizeof(struct epoll_event));
+        memzero(&ep_netlink, sizeof(struct epoll_event));
         ep_netlink.events = EPOLLIN;
         ep_netlink.data.fd = fd_netlink;
 
-        memset(&ep_worker, 0, sizeof(struct epoll_event));
+        memzero(&ep_worker, sizeof(struct epoll_event));
         ep_worker.events = EPOLLIN;
         ep_worker.data.fd = fd_worker;