consistency + inform the caller if a iomux_remove() call failed

xant · Mar 26, 2014 · 769431d · 769431d
1 parent 85051f4
commit 769431d
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/src/iomux.c b/src/iomux.c
@@ -245,14 +245,14 @@ iomux_add(iomux_t *iomux, int fd, iomux_callbacks_t *cbs)
     return 0;
 }
 
-void
+int
 iomux_remove(iomux_t *iomux, int fd)
 {
     MUTEX_LOCK(iomux);
 
     if (!iomux->connections[fd]) {
         MUTEX_UNLOCK(iomux);
-        return;
+        return 0;
     }
     iomux_unschedule(iomux, iomux->connections[fd]->timeout_id);
 
@@ -289,6 +289,7 @@ iomux_remove(iomux_t *iomux, int fd)
             iomux->minfd = iomux->maxfd;
     }
     MUTEX_UNLOCK(iomux);
+    return 1;
 }
 
 iomux_timeout_id_t
@@ -1063,7 +1064,7 @@ iomux_close(iomux_t *iomux, int fd)
     iomux_connection_t *conn = iomux->connections[fd];
     if (!conn) { // fd is not registered within iomux
         MUTEX_UNLOCK(iomux);
-        return -1;
+        return 0;
     }
 
     if (fcntl(fd, F_GETFD, 0) != -1 && conn->outlen) { // there is pending data
@@ -1094,7 +1095,7 @@ iomux_close(iomux_t *iomux, int fd)
 
     MUTEX_UNLOCK(iomux);
 
-    return 0;
+    return 1;
 }
 
 int

diff --git a/src/iomux.h b/src/iomux.h
@@ -128,8 +128,9 @@ int  iomux_add(iomux_t *iomux, int fd, iomux_callbacks_t *cbs);
  * @brief Remove a filedescriptor from the mux
  * @param iomux A valid iomux handler
  * @param fd The fd to remove
+ * @return TRUE on success; FALSE otherwise
  */
-void iomux_remove(iomux_t *iomux, int fd);
+int iomux_remove(iomux_t *iomux, int fd);
 
 /**
  * @brief Register a timeout on a connection.
@@ -278,6 +279,7 @@ int iomux_write(iomux_t *iomux, int fd, const void *buf, int len);
  * @brief Close a file handled by the iomux
  * @param iomux A valid iomux handler
  * @param fd The fd to close
+ * @return TRUE on success; FALSE otherwise
  */
 int iomux_close(iomux_t *iomux, int fd);