diff: 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
63a01c3f79ccfb03fc6bf5118e3c0492760dac56
1 file changed
+22
-22
diff.c
+22
-22
@@ -1504,7 +1504,7 @@ struct diff_words_style_elem {
1504
1505
struct diff_words_style {
1506
enum diff_words_type type;
1507
- struct diff_words_style_elem new, old, ctx;
1507
+ struct diff_words_style_elem new_word, old_word, ctx;
1508
const char *newline;
1509
};
1510
@@ -1655,12 +1655,12 @@ static void fn_out_diff_words_aux(void *priv, char *line, unsigned long len)
1655
}
1656
if (minus_begin != minus_end) {
1657
fn_out_diff_words_write_helper(diff_words->opt,
1658
- &style->old, style->newline,
1658
+ &style->old_word, style->newline,
1659
minus_end - minus_begin, minus_begin);
1660
}
1661
if (plus_begin != plus_end) {
1662
fn_out_diff_words_write_helper(diff_words->opt,
1663
- &style->new, style->newline,
1663
+ &style->new_word, style->newline,
1664
plus_end - plus_begin, plus_begin);
1665
}
1666
@@ -1758,7 +1758,7 @@ static void diff_words_show(struct diff_words_data *diff_words)
1758
emit_diff_symbol(diff_words->opt, DIFF_SYMBOL_WORD_DIFF,
1759
line_prefix, strlen(line_prefix), 0);
1760
fn_out_diff_words_write_helper(diff_words->opt,
1761
- &style->old, style->newline,
1761
+ &style->old_word, style->newline,
1762
diff_words->minus.text.size,
1763
diff_words->minus.text.ptr);
1764
diff_words->minus.text.size = 0;
@@ -1883,8 +1883,8 @@ static void init_diff_words_data(struct emit_callback *ecbdata,
1883
}
1884
if (want_color(o->use_color)) {
1885
struct diff_words_style *st = ecbdata->diff_words->style;
1886
- st->old.color = diff_get_color_opt(o, DIFF_FILE_OLD);
1887
- st->new.color = diff_get_color_opt(o, DIFF_FILE_NEW);
1886
+ st->old_word.color = diff_get_color_opt(o, DIFF_FILE_OLD);
1887
+ st->new_word.color = diff_get_color_opt(o, DIFF_FILE_NEW);
1888
st->ctx.color = diff_get_color_opt(o, DIFF_CONTEXT);
1889
}
1890
}
@@ -2047,8 +2047,8 @@ static void fn_out_consume(void *priv, char *line, unsigned long len)
2047
2048
static char *pprint_rename(const char *a, const char *b)
2049
{
2050
- const char *old = a;
2051
- const char *new = b;
2050
+ const char *old_name = a;
2051
+ const char *new_name = b;
2052
struct strbuf name = STRBUF_INIT;
2053
int pfx_length, sfx_length;
2054
int pfx_adjust_for_slash;
@@ -2067,16 +2067,16 @@ static char *pprint_rename(const char *a, const char *b)
2067
2068
/* Find common prefix */
2069
pfx_length = 0;
2070
- while (*old && *new && *old == *new) {
2071
- if (*old == '/')
2072
- pfx_length = old - a + 1;
2073
- old++;
2074
- new++;
2070
+ while (*old_name && *new_name && *old_name == *new_name) {
2071
+ if (*old_name == '/')
2072
+ pfx_length = old_name - a + 1;
2073
+ old_name++;
2074
+ new_name++;
2075
}
2076
2077
/* Find common suffix */
2078
- old = a + len_a;
2079
- new = b + len_b;
2078
+ old_name = a + len_a;
2079
+ new_name = b + len_b;
2080
sfx_length = 0;
2081
/*
2082
* If there is a common prefix, it must end in a slash. In
@@ -2087,13 +2087,13 @@ static char *pprint_rename(const char *a, const char *b)
2087
* underrun the input strings.
2088
*/
2089
pfx_adjust_for_slash = (pfx_length ? 1 : 0);
2090
- while (a + pfx_length - pfx_adjust_for_slash <= old &&
2091
- b + pfx_length - pfx_adjust_for_slash <= new &&
2092
- *old == *new) {
2093
- if (*old == '/')
2094
- sfx_length = len_a - (old - a);
2095
- old--;
2096
- new--;
2090
+ while (a + pfx_length - pfx_adjust_for_slash <= old_name &&
2091
+ b + pfx_length - pfx_adjust_for_slash <= new_name &&
2092
+ *old_name == *new_name) {
2093
+ if (*old_name == '/')
2094
+ sfx_length = len_a - (old_name - a);
2095
+ old_name--;
2096
+ new_name--;
2097
}
2098
2099
/*