ref-filter: rename 'new' variables

Rename C++ keyword in order to bring the codebase closer to being able
to be compiled with a C++ compiler.

Signed-off-by: Brandon Williams <bmwill@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/ref-filter.c b/ref-filter.c
index 9dae6cfe3f33950afc6c9e1781c4b1c6f0d58ce7..99a45beb14ea881390051a94f7254732446ace77 100644 (file)
--- a/ref-filter.c
+++ b/ref-filter.c
@@ -529,12 +529,12 @@ static void end_align_handler(struct ref_formatting_stack **stack)
 
 static void align_atom_handler(struct atom_value *atomv, struct ref_formatting_state *state)
 {
 
 static void align_atom_handler(struct atom_value *atomv, struct ref_formatting_state *state)
 {

-       struct ref_formatting_stack *new;
+       struct ref_formatting_stack *new_stack;

 
        push_stack_element(&state->stack);
 
        push_stack_element(&state->stack);

-       new = state->stack;
-       new->at_end = end_align_handler;
-       new->at_end_data = &atomv->atom->u.align;
+       new_stack = state->stack;
+       new_stack->at_end = end_align_handler;
+       new_stack->at_end_data = &atomv->atom->u.align;

 }
 
 static void if_then_else_handler(struct ref_formatting_stack **stack)
 }
 
 static void if_then_else_handler(struct ref_formatting_stack **stack)


@@ -574,16 +574,16 @@ static void if_then_else_handler(struct ref_formatting_stack **stack)
 
 static void if_atom_handler(struct atom_value *atomv, struct ref_formatting_state *state)
 {
 
 static void if_atom_handler(struct atom_value *atomv, struct ref_formatting_state *state)
 {

-       struct ref_formatting_stack *new;
+       struct ref_formatting_stack *new_stack;

        struct if_then_else *if_then_else = xcalloc(sizeof(struct if_then_else), 1);
 
        if_then_else->str = atomv->atom->u.if_then_else.str;
        if_then_else->cmp_status = atomv->atom->u.if_then_else.cmp_status;
 
        push_stack_element(&state->stack);
        struct if_then_else *if_then_else = xcalloc(sizeof(struct if_then_else), 1);
 
        if_then_else->str = atomv->atom->u.if_then_else.str;
        if_then_else->cmp_status = atomv->atom->u.if_then_else.cmp_status;
 
        push_stack_element(&state->stack);

-       new = state->stack;
-       new->at_end = if_then_else_handler;
-       new->at_end_data = if_then_else;
+       new_stack = state->stack;
+       new_stack->at_end = if_then_else_handler;
+       new_stack->at_end_data = if_then_else;

 }
 
 static int is_empty(const char *s)
 }
 
 static int is_empty(const char *s)