Przeglądaj źródła

faux.list: faux_list_del() and faux_list_kdel() functions return bool_t instead int

Serj Kalichev 3 lat temu
rodzic
commit
6a88d45fd3
3 zmienionych plików z 12 dodań i 12 usunięć
  1. 1 1
      faux/eloop/eloop.c
  2. 2 2
      faux/list.h
  3. 9 9
      faux/list/list.c

+ 1 - 1
faux/eloop/eloop.c

@@ -398,7 +398,7 @@ bool_t faux_eloop_del_fd(faux_eloop_t *eloop, int fd)
 	if (!eloop || (fd < 0))
 		return BOOL_FALSE;
 
-	if (faux_list_kdel(eloop->fds, &fd) < 0)
+	if (!faux_list_kdel(eloop->fds, &fd))
 		return BOOL_FALSE;
 
 	if (!faux_pollfd_del_by_fd(eloop->pollfds, fd))

+ 2 - 2
faux/list.h

@@ -50,8 +50,8 @@ size_t faux_list_len(const faux_list_t *list);
 faux_list_node_t *faux_list_add(faux_list_t *list, void *data);
 faux_list_node_t *faux_list_add_find(faux_list_t *list, void *data);
 void *faux_list_takeaway(faux_list_t *list, faux_list_node_t *node);
-int faux_list_del(faux_list_t *list, faux_list_node_t *node);
-int faux_list_kdel(faux_list_t *list, const void *userkey);
+bool_t faux_list_del(faux_list_t *list, faux_list_node_t *node);
+bool_t faux_list_kdel(faux_list_t *list, const void *userkey);
 void faux_list_empty(faux_list_t *list);
 
 faux_list_node_t *faux_list_match_node(const faux_list_t *list,

+ 9 - 9
faux/list/list.c

@@ -484,25 +484,25 @@ void *faux_list_takeaway(faux_list_t *list, faux_list_node_t *node)
  *
  * @param [in] list List to delete node from.
  * @param [in] node List node to delete.
- * @return 0 on success, < 0 on error.
+ * @return BOOL_TRUE - success, BOOL_FALSE on error.
  */
-int faux_list_del(faux_list_t *list, faux_list_node_t *node)
+bool_t faux_list_del(faux_list_t *list, faux_list_node_t *node)
 {
 	void *data = NULL;
 
 	assert(list);
 	assert(node);
 	if (!list || !node)
-		return -1;
+		return BOOL_FALSE;
 
 	data = faux_list_takeaway(list, node);
 	assert(data);
 	if (!data) // Illegal case
-		return -1;
+		return BOOL_FALSE;
 	if (list->freeFn)
 		list->freeFn(data);
 
-	return 0;
+	return BOOL_TRUE;
 }
 
 
@@ -511,20 +511,20 @@ int faux_list_del(faux_list_t *list, faux_list_node_t *node)
  * @sa faux_list_del()
  * @param [in] list List to delete node from.
  * @param [in] node User key to find node to delete.
- * @return 0 on success, < 0 on error.
+ * @return BOOL_TRUE - success, BOOL_FALSE on error.
  */
-int faux_list_kdel(faux_list_t *list, const void *userkey)
+bool_t faux_list_kdel(faux_list_t *list, const void *userkey)
 {
 	faux_list_node_t *node = NULL;
 
 	assert(list);
 	assert(userkey);
 	if (!list || !userkey)
-		return -1;
+		return BOOL_FALSE;
 
 	node = faux_list_kfind_node(list, userkey);
 	if (!node)
-		return -1; // Not found
+		return BOOL_FALSE; // Not found
 
 	return faux_list_del(list, node);
 }