lighttpd
/
lighttpd2
2
0
Fork 0
Code Issues Wiki

foo

This commit is contained in:
Thomas Porzelt 2008-06-29 16:29:15 +02:00
parent 2ec86e14db 75c751ce6e
commit 04fe39157a
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/actions.c
View File

@ -1,8 +1,3 @@
<<<<<<< TREE
# test
# test 2
=======
void action_stack_init(action_stack* as)
{
// preallocate a stack of 15 elements
@ -12,7 +7,12 @@ void action_stack_init(action_stack* as)
void action_stack_push(action_stack* as, action_stack_elem ase)
{
g_array_append_val(as, ase);
// stack needs to grow
if (as->index == (as->stack->len -1)) // we are at the end of the stack
g_array_append_val(as, ase);
else
g_array_insert_val(as, as->index, ase);
as->index++;
}
@ -20,7 +20,7 @@ void action_stack_push(action_stack* as, action_stack_elem ase)
action_stack_elem action_stack_pop(action_stack* as)
{
as->index--;
return g_array_index(as, action_stack_elem, as->stack->len);
return g_array_index(as, action_stack_elem, as->index);
}
action_result action_list_exec(action_list* al, action_stack* as, guint index)
@ -156,4 +156,3 @@ gboolean condition_check_bool(condition* cond)
return FALSE;
}
}
>>>>>>> MERGE-SOURCE