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>
Brandon Williams committed
Feb 14, 2018 at 10:59 UTC
1472b5bf68221f27fb8115d00773ec2a28e6ca6b
1 file changed
+8
-8
ref-filter.c
+8
-8
@@ -529,12 +529,12 @@ static void end_align_handler(struct ref_formatting_stack **stack)
529
530
static void align_atom_handler(struct atom_value *atomv, struct ref_formatting_state *state)
531
{
532
- struct ref_formatting_stack *new;
532
+ struct ref_formatting_stack *new_stack;
533
534
push_stack_element(&state->stack);
535
- new = state->stack;
536
- new->at_end = end_align_handler;
537
- new->at_end_data = &atomv->atom->u.align;
535
+ new_stack = state->stack;
536
+ new_stack->at_end = end_align_handler;
537
+ new_stack->at_end_data = &atomv->atom->u.align;
538
}
539
540
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)
574
575
static void if_atom_handler(struct atom_value *atomv, struct ref_formatting_state *state)
576
{
577
- struct ref_formatting_stack *new;
577
+ struct ref_formatting_stack *new_stack;
578
struct if_then_else *if_then_else = xcalloc(sizeof(struct if_then_else), 1);
579
580
if_then_else->str = atomv->atom->u.if_then_else.str;
581
if_then_else->cmp_status = atomv->atom->u.if_then_else.cmp_status;
582
583
push_stack_element(&state->stack);
584
- new = state->stack;
585
- new->at_end = if_then_else_handler;
586
- new->at_end_data = if_then_else;
584
+ new_stack = state->stack;
585
+ new_stack->at_end = if_then_else_handler;
586
+ new_stack->at_end_data = if_then_else;
587
}
588
589
static int is_empty(const char *s)