diff options
| author | Paul Buetow <paul@buetow.org> | 2008-10-14 22:05:16 +0000 |
|---|---|---|
| committer | Paul Buetow <paul@buetow.org> | 2008-10-14 22:05:16 +0000 |
| commit | a35ace22b374005c65bda8302761d24f75280170 (patch) | |
| tree | 87cdb9344b9c28fb6dd46cf7ea9d18325e18ec32 /src/data | |
| parent | c25ba0d8ee9e4e6a0432fba2e8606c7e0a35d1cd (diff) | |
run astyle
still lots of debugging to do.
Diffstat (limited to 'src/data')
| -rw-r--r-- | src/data/hash.c | 4 | ||||
| -rw-r--r-- | src/data/stack.c | 9 | ||||
| -rw-r--r-- | src/data/stack.h | 2 |
3 files changed, 7 insertions, 8 deletions
diff --git a/src/data/hash.c b/src/data/hash.c index 5555eb1..d3f7634 100644 --- a/src/data/hash.c +++ b/src/data/hash.c @@ -44,13 +44,13 @@ hash_new(unsigned i_size) { p_hash->i_size = i_size; p_hash->i_cur_size = 0; - p_hash->p_elems = (HashElem *) calloc(i_size, sizeof(HashElem)); + p_hash->p_elems = (HashElem *) calloc((int)i_size, sizeof(HashElem)); /*Set all positions as "free" */ for (int i = 0; i < i_size; ++i) p_hash->p_elems[i].flag = 'f'; - return p_hash; + return (p_hash); } void diff --git a/src/data/stack.c b/src/data/stack.c index 778e41e..0f5f58e 100644 --- a/src/data/stack.c +++ b/src/data/stack.c @@ -63,7 +63,7 @@ stack_empty(Stack *p_stack) { void stack_debug(Stack *p_stack, void *p_val) { - printf("bPUSH %d %d\n", stack_size(p_stack), (int)p_stack); + printf("bPUSH %d %d\n", stack_size(p_stack), (int)p_stack); StackElem *p_elem = stackelem_new(); p_elem->p_val = p_val; @@ -74,13 +74,12 @@ stack_debug(Stack *p_stack, void *p_val) { p_stack->p_last = p_stack->p_first; ++p_stack->i_size; - printf("aPUSH %d %d\n", stack_size(p_stack), (int)p_stack); + printf("aPUSH %d %d\n", stack_size(p_stack), (int)p_stack); } -void +unsigned stack_push(Stack *p_stack, void *p_val) { StackElem *p_elem = stackelem_new(); - p_elem->p_val = p_val; p_elem->p_next = p_stack->p_first; p_stack->p_first = p_elem; @@ -88,7 +87,7 @@ stack_push(Stack *p_stack, void *p_val) { if (p_stack->p_last == NULL) p_stack->p_last = p_stack->p_first; - ++p_stack->i_size; + return (++p_stack->i_size); } void* diff --git a/src/data/stack.h b/src/data/stack.h index 721ed31..e9fafea 100644 --- a/src/data/stack.h +++ b/src/data/stack.h @@ -59,7 +59,7 @@ Stack *stack_new(); StackElem *stackelem_new(); _Bool stack_empty(Stack *p_stack); void stack_iterate(Stack *p_stack, void (*func)(void *p_void)); -void stack_push(Stack *p_stack, void *p_val); +unsigned stack_push(Stack *p_stack, void *p_val); void stack_debug(Stack *p_stack, void *p_val); void *stack_pop(Stack *p_stack); void stack_clear(Stack *p_stack); |
