summaryrefslogtreecommitdiff
path: root/src/data
diff options
context:
space:
mode:
authorPaul Buetow <paul@buetow.org>2008-10-20 18:46:11 +0000
committerPaul Buetow <paul@buetow.org>2008-10-20 18:46:11 +0000
commitf2bd5d24361d703359494daed291e277bce6eb03 (patch)
tree2012bb281b45adaf86425a52443854c4d4c35eb3 /src/data
parent1956010ec79fbab604efc2b60d0af325e91f67b8 (diff)
no lines longer than 80chars.
Diffstat (limited to 'src/data')
-rw-r--r--src/data/hash.c3
-rw-r--r--src/data/hash.h4
-rw-r--r--src/data/list.c7
-rw-r--r--src/data/list.h16
-rw-r--r--src/data/map.c12
-rw-r--r--src/data/map.h12
-rw-r--r--src/data/tree.c4
7 files changed, 43 insertions, 15 deletions
diff --git a/src/data/hash.c b/src/data/hash.c
index 5555eb1..5a80402 100644
--- a/src/data/hash.c
+++ b/src/data/hash.c
@@ -204,7 +204,8 @@ hash_nextaddr(Hash *p_hash, int i_max_tries, char *c_key, int i_addr,
void
hash_print(Hash *p_hash) {
- printf("hash_print [size:%d,cur:%d] syntax (flag[,key][=TYPE[<val>]]):\n -> ",
+ printf("hash_print [size:%d,cur:%d] syntax "
+ " (flag[,key][=TYPE[<val>]]):\n -> ",
p_hash->i_size,p_hash->i_cur_size);
for (int i = 0; i < p_hash->i_size; ++i) {
diff --git a/src/data/hash.h b/src/data/hash.h
index 196c4a8..4397d7c 100644
--- a/src/data/hash.h
+++ b/src/data/hash.h
@@ -71,7 +71,9 @@ RETCODE hash_size(Hash *p_hash, int i_size);
int hash_getaddr(Hash *p_hash, char *c_key, HASH_OP OP);
RETCODE hash_addrisfree(Hash *p_hash, int i_addr);
RETCODE hash_addrisocc(Hash *p_hash, int i_addr, char *c_key);
-int hash_nextaddr(Hash *p_hash, int i_max_tries, char *c_key, int i_addr, HASH_OP OP);
+int hash_nextaddr(Hash *p_hash, int i_max_tries,
+ char *c_key, int i_addr,
+ HASH_OP OP);
void hash_iterate(Hash *p_hash, void (*func)(void *));
#define hash_get_cur_size(hash) hash->i_cur_size
diff --git a/src/data/list.c b/src/data/list.c
index 83860c3..398dd37 100644
--- a/src/data/list.c
+++ b/src/data/list.c
@@ -271,7 +271,9 @@ list_iterate2_ptr(List *p_list, void (*func)(void *, void *), void *p_void) {
}
void
-list_iterate3(List *p_list, void (*func)(void *, void *, void *), void *p_void1, void *p_void2) {
+list_iterate3(List *p_list,
+ void (*func)(void *, void *, void *),
+ void *p_void1, void *p_void2) {
ListElem *p_elem = p_list->p_first;
while (p_elem) {
@@ -281,7 +283,8 @@ list_iterate3(List *p_list, void (*func)(void *, void *, void *), void *p_void1,
}
void
-list_iterate3_ptr(List *p_list, void (*func)(void *, void *, void *),
+list_iterate3_ptr(List *p_list,
+ void (*func)(void *, void *, void *),
void *p_void1, void *p_void2) {
ListElem *p_elem = p_list->p_first;
diff --git a/src/data/list.h b/src/data/list.h
index 323f496..1ed6635 100644
--- a/src/data/list.h
+++ b/src/data/list.h
@@ -84,10 +84,18 @@ void list_delete_cb(void *p_list);
void list_delete_and_free_vals(List *p_list);
unsigned list_size(List *p_list);
void list_iterate(List *p_list, void (*func)(void *));
-void list_iterate2_ptr(List *p_list, void (*func)(void *, void *), void *p_void);
-void list_iterate2(List *p_list, void (*func)(void *, void *), void *p_void);
-void list_iterate3(List *p_list, void (*func)(void *, void *, void *), void *p_void1, void *p_void2);
-void list_iterate3_ptr(List *p_list, void (*func)(void *, void *, void *), void *p_void1, void *p_void2);
+void list_iterate2_ptr(List *p_list,
+ void (*func)(void *, void *),
+ void *p_void);
+void list_iterate2(List *p_list,
+ void (*func)(void *, void *),
+ void *p_void);
+void list_iterate3(List *p_list,
+ void (*func)(void *, void *, void *),
+ void *p_void1, void *p_void2);
+void list_iterate3_ptr(List *p_list,
+ void (*func)(void *, void *, void *),
+ void *p_void1, void *p_void2);
ListIterator *listiterator_new(List *p_list);
ListIterator *listiterator_new_reverse(List *p_list);
void listiterator_delete(ListIterator *p_iter);
diff --git a/src/data/map.c b/src/data/map.c
index b5c016e..bc74f31 100644
--- a/src/data/map.c
+++ b/src/data/map.c
@@ -261,21 +261,27 @@ map_iterate2(Map *p_map, void (*func) (void *, void *), void *p_void) {
}
void
-map_iterate2_keys(Map *p_map, void (*func) (void *, void *, char *), void *p_void) {
+map_iterate2_keys(Map *p_map,
+ void (*func) (void *, void *, char *),
+ void *p_void) {
for (int i = 0; i < p_map->i_max_size; ++i)
if (p_map->pc_keys[i] != NULL)
(*func) (p_map->pp_vals[i], p_void, p_map->pc_keys[i]);
}
void
-map_iterate3(Map *p_map, void (*func) (void *, void *, void *), void *p_void1, void *p_void2) {
+map_iterate3(Map *p_map,
+ void (*func) (void *, void *, void *),
+ void *p_void1, void *p_void2) {
for (int i = 0; i < p_map->i_max_size; ++i)
if (p_map->pc_keys[i] != NULL)
(*func) (p_map->pp_vals[i], p_void1, p_void2);
}
void
-map_iterate3_keys(Map *p_map, void (*func) (void *, void *, void *, char *), void *p_void1, void *p_void2) {
+map_iterate3_keys(Map *p_map,
+ void (*func) (void *, void *, void *, char *),
+ void *p_void1, void *p_void2) {
for (int i = 0; i < p_map->i_max_size; ++i)
if (p_map->pc_keys[i] != NULL)
(*func) (p_map->pp_vals[i], p_void1, p_void2, p_map->pc_keys[i]);
diff --git a/src/data/map.h b/src/data/map.h
index fe7397f..144ffbd 100644
--- a/src/data/map.h
+++ b/src/data/map.h
@@ -72,9 +72,15 @@ void map_print(Map *p_map);
void map_iterate(Map *p_map, void (*func) (void *));
void map_iterate_keys(Map *p_map, void (*func) (void *, char *));
void map_iterate2(Map *p_map, void (*func) (void *, void *), void *p_void);
-void map_iterate2_keys(Map *p_map, void (*func) (void *, void *, char *), void *p_void);
-void map_iterate3(Map *p_map, void (*func) (void *, void *, void *), void *p_void1, void *p_void2);
-void map_iterate3_keys(Map *p_map, void (*func) (void *, void *, void *, char *), void *p_void1, void *p_void2);
+void map_iterate2_keys(Map *p_map,
+ void (*func) (void *, void *, char *),
+ void *p_void);
+void map_iterate3(Map *p_map,
+ void (*func) (void *, void *, void *),
+ void *p_void1, void *p_void2);
+void map_iterate3_keys(Map *p_map,
+ void (*func) (void *, void *, void *, char *),
+ void *p_void1, void *p_void2);
#define map_get_size(map) map->i_size
#define map_get_max_size(map) map->i_max_size
diff --git a/src/data/tree.c b/src/data/tree.c
index 0160eb9..7b4d303 100644
--- a/src/data/tree.c
+++ b/src/data/tree.c
@@ -126,7 +126,9 @@ _tree_print(TreeNode *p_treenode, int i_indent) {
#endif
printf("\nTree ");
- array_iterate2(p_treenode->p_array_childs, _tree_print_cb2, (void*) (i_indent + TREE_PRINT_INDENT));
+ array_iterate2(p_treenode->p_array_childs,
+ _tree_print_cb2,
+ (void*) (i_indent + TREE_PRINT_INDENT));
}
void