fanasina/y_project
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

list_t add more general search, change previose search name

Browse Source
This commit is contained in:
fanasina
2025-04-11 10:31:38 +02:00
parent b9fb5297ca
commit f0f0b2b003
2 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
list_t/src/list_t/list_t.h
+8 -4
View File
@@ -30,7 +30,8 @@
void remove_all_list_in_##type(struct main_list_##type *var_list);\ void remove_all_list_in_##type(struct main_list_##type *var_list);\
void increment_list_##type(struct main_list_##type * var_list);\ void increment_list_##type(struct main_list_##type * var_list);\
void decrement_list_##type(struct main_list_##type * var_list);\ void decrement_list_##type(struct main_list_##type * var_list);\
struct list_##type * search_from_begin_in_list_##type(struct main_list_##type *var_list, type value, int funcCmp(type, type)); struct list_##type * search_first_occ_with_mov_from_curr_in_list_##type(struct main_list_##type *var_list, type value, int (*funcCmp)(type, type), void (*incr_or_decr_mov)(struct main_list_##type *));\
struct list_##type * search_first_occ_from_begin_in_list_##type(struct main_list_##type *var_list, type value, int (*funcCmp)(type, type));\
GENERATE_LIST_ALL(TYPE_CHAR) GENERATE_LIST_ALL(TYPE_CHAR)
@@ -203,14 +204,17 @@ GENERATE_LIST_ALL(TYPE_PTR)
var_list->current_list = (var_list->current_list)->preview;\ var_list->current_list = (var_list->current_list)->preview;\
--(var_list->current_index);\ --(var_list->current_index);\
}\ }\
struct list_##type * search_from_begin_in_list_##type(struct main_list_##type *var_list, type value, int (*funcCmp)(type, type)){\ struct list_##type * search_first_occ_with_mov_from_curr_in_list_##type(struct main_list_##type *var_list, type value, int (*funcCmp)(type, type), void (*incr_or_decr_mov)(struct main_list_##type *)){\
for(move_current_to_begin_list_##type(var_list); var_list->current_list; increment_list_##type(var_list)){\ for(; var_list->current_list; incr_or_decr_mov(var_list)){\
if(0 == funcCmp(value, var_list->current_list->value))\ if(0 == funcCmp(value, var_list->current_list->value))\
return var_list->current_list;\ return var_list->current_list;\
}\ }\
return NULL;\ return NULL;\
}\ }\
struct list_##type * search_first_occ_from_begin_in_list_##type(struct main_list_##type *var_list, type value, int (*funcCmp)(type, type)){\
move_current_to_begin_list_##type(var_list);\
return search_first_occ_with_mov_from_curr_in_list_##type(var_list, value, funcCmp, increment_list_##type);\
}\
y_socket_t/src/y_socket_t/y_node_t.c
+3 -1
View File
@@ -35,12 +35,14 @@ int y_NODE_T_cmp(y_NODE_T nodeA, y_NODE_T nodeB){
return ret; return ret;
} }
struct list_y_NODE_T * search_node_in_list_y_NODE_T(struct main_list_y_NODE_T *listNodes, y_NODE_T node){ struct list_y_NODE_T * search_node_in_list_y_NODE_T(struct main_list_y_NODE_T *listNodes, y_NODE_T node){
FOR_LIST_FORM_BEGIN(y_NODE_T, listNodes){ /* FOR_LIST_FORM_BEGIN(y_NODE_T, listNodes){
if(y_NODE_T_cmp(node, listNodes->current_list->value) == 0){ if(y_NODE_T_cmp(node, listNodes->current_list->value) == 0){
return listNodes->current_list; return listNodes->current_list;
} }
} }
return NULL; return NULL;
*/
return search_first_occ_from_begin_in_list_y_NODE_T(listNodes, node, y_NODE_T_cmp);
} }
int set_addr_y_NODE_T(y_NODE_T *node, char * addrStr){ int set_addr_y_NODE_T(y_NODE_T *node, char * addrStr){