Move intf_EJect() out of core

[vlc] / modules / control / netsync.c

diff --git a/modules/control/netsync.c b/modules/control/netsync.c
index 4408cde0e0f62b70e4b2ee7bdac7e8080056692f..517c12adea25eae4f9d7cd5829d810271ab5be05 100644 (file)
--- a/modules/control/netsync.c
+++ b/modules/control/netsync.c
@@ -73,11 +73,11 @@ vlc_module_begin()
     set_category(CAT_ADVANCED)
     set_subcategory(SUBCAT_ADVANCED_MISC)
 
-    add_bool("netsync-master", false, NULL,
+    add_bool("netsync-master", false,
               NETSYNC_TEXT, NETSYNC_LONGTEXT, true)
     add_string("netsync-master-ip", NULL, MIP_TEXT, MIP_LONGTEXT,
                 true)
-    add_integer("netsync-timeout", 500, NULL,
+    add_integer("netsync-timeout", 500,
                  NETSYNC_TIMEOUT_TEXT, NETSYNC_TIMEOUT_LONGTEXT, true)
 
     set_capability("interface", 0)
@@ -180,7 +180,7 @@ static void *Master(void *handle)
         struct pollfd ufd = { .fd = sys->fd, .events = POLLIN, };
         uint64_t data[2];
 
-        if (poll(&ufd, 1, -1) <= 0)
+        if (poll(&ufd, 1, -1) < 0)
             continue;
 
         /* We received something */
@@ -209,6 +209,7 @@ static void *Master(void *handle)
                  : "non-IPv4", /*date*/ 0);
 #endif
     }
+    return NULL;
 }
 
 static void *Slave(void *handle)
@@ -232,11 +233,8 @@ static void *Slave(void *handle)
             goto wait;
 
         /* Don't block */
-        int ret = poll(&ufd, 1, sys->timeout);
-        if (ret == 0)
+        if (poll(&ufd, 1, sys->timeout) <= 0)
             continue;
-        if (ret < 0)
-            goto wait;
 
         const mtime_t receive_date = mdate();
         if (recv(sys->fd, data, sizeof(data), 0) <= 0)
@@ -268,6 +266,7 @@ static void *Slave(void *handle)
     wait:
         msleep(INTF_IDLE_SLEEP);
     }
+    return NULL;
 }
 
 static int InputEvent(vlc_object_t *object, char const *cmd,