chiark / gitweb /
socket: optionally call accept() for incoming connections and spawn one service insta...
[elogind.git] / device.c
index 1c4c32931c0caea39f71d628494d76317579a346..1a4edd29a79fda8757c6e79b89314d7b1f5e5419 100644 (file)
--- a/device.c
+++ b/device.c
@@ -415,21 +415,21 @@ static int device_enumerate(Manager *m) {
         if (epoll_ctl(m->epoll_fd, EPOLL_CTL_ADD, m->udev_watch.fd, &ev) < 0)
                 return -errno;
 
-        /* if (!(e = udev_enumerate_new(m->udev))) { */
-        /*         r = -ENOMEM; */
-        /*         goto fail; */
-        /* } */
+        if (!(e = udev_enumerate_new(m->udev))) {
+                r = -ENOMEM;
+                goto fail;
+        }
 
-        /* if (udev_enumerate_scan_devices(e) < 0) { */
-        /*         r = -EIO; */
-        /*         goto fail; */
-        /* } */
+        if (udev_enumerate_scan_devices(e) < 0) {
+                r = -EIO;
+                goto fail;
+        }
 
-        /* first = udev_enumerate_get_list_entry(e); */
-        /* udev_list_entry_foreach(item, first) */
-        /*         device_process_path(m, udev_list_entry_get_name(item), false); */
+        first = udev_enumerate_get_list_entry(e);
+        udev_list_entry_foreach(item, first)
+                device_process_path(m, udev_list_entry_get_name(item), false);
 
-        /* udev_enumerate_unref(e); */
+        udev_enumerate_unref(e);
         return 0;
 
 fail: