ws: drop unused parameter from ws_blank_line()
We take a ws_rule parameter, but have never looked at it since the function was added in 877f23ccb8 (Teach "diff --check" about new blank lines at end, 2008-06-26). A comment in the function does mention how we _could_ use it, but nobody has felt the need to do so for over a decade. We could keep it around as reminder of what could be done, but the comment serves that purpose. And in the meantime, it triggers -Wunused-parameter. So let's drop it, which in turn allows us to drop similar arguments further up the callstack. I've left the comment intact. It does still say "ws_rule", but that name is used consistently in the whitespace code, so the meaning is clear. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Jeff King committed
Dec 13, 2022 at 06:12 UTC
c5224f0f4cd53e3b205f54b98bc3dc66a9007c71
4 files changed
+9
-10
apply.c
+2
-2
@@ -2913,7 +2913,7 @@ static int apply_one_fragment(struct apply_state *state,
2913
break;
2914
case ' ':
2915
if (plen && (ws_rule & WS_BLANK_AT_EOF) &&
2916
- ws_blank_line(patch + 1, plen, ws_rule))
2916
+ ws_blank_line(patch + 1, plen))
2917
is_blank_context = 1;
2918
/* fallthrough */
2919
case '-':
@@ -2942,7 +2942,7 @@ static int apply_one_fragment(struct apply_state *state,
2942
(first == '+' ? 0 : LINE_COMMON));
2943
if (first == '+' &&
2944
(ws_rule & WS_BLANK_AT_EOF) &&
2945
- ws_blank_line(patch + 1, plen, ws_rule))
2945
+ ws_blank_line(patch + 1, plen))
2946
added_blank_line = 1;
2947
break;
2948
case '@': case '\\':
cache.h
+1
-1
@@ -1865,7 +1865,7 @@ unsigned ws_check(const char *line, int len, unsigned ws_rule);
1865
void ws_check_emit(const char *line, int len, unsigned ws_rule, FILE *stream, const char *set, const char *reset, const char *ws);
1866
char *whitespace_error_string(unsigned ws);
1867
void ws_fix_copy(struct strbuf *, const char *, int, unsigned, int *);
1868
-int ws_blank_line(const char *line, int len, unsigned ws_rule);
1868
+int ws_blank_line(const char *line, int len);
1869
#define ws_tab_width(rule) ((rule) & WS_TAB_WIDTH_MASK)
1870
1871
/* ls-files */
diff.c
+5
-6
@@ -604,7 +604,7 @@ static unsigned long diff_filespec_size(struct repository *r,
604
return one->size;
605
}
606
607
-static int count_trailing_blank(mmfile_t *mf, unsigned ws_rule)
607
+static int count_trailing_blank(mmfile_t *mf)
608
{
609
char *ptr = mf->ptr;
610
long size = mf->size;
@@ -622,7 +622,7 @@ static int count_trailing_blank(mmfile_t *mf, unsigned ws_rule)
622
for (prev_eol = ptr; mf->ptr <= prev_eol; prev_eol--)
623
if (*prev_eol == '\n')
624
break;
625
- if (!ws_blank_line(prev_eol + 1, ptr - prev_eol, ws_rule))
625
+ if (!ws_blank_line(prev_eol + 1, ptr - prev_eol))
626
break;
627
cnt++;
628
ptr = prev_eol - 1;
@@ -634,9 +634,8 @@ static void check_blank_at_eof(mmfile_t *mf1, mmfile_t *mf2,
634
struct emit_callback *ecbdata)
635
{
636
int l1, l2, at;
637
- unsigned ws_rule = ecbdata->ws_rule;
638
- l1 = count_trailing_blank(mf1, ws_rule);
639
- l2 = count_trailing_blank(mf2, ws_rule);
637
+ l1 = count_trailing_blank(mf1);
638
+ l2 = count_trailing_blank(mf2);
639
if (l2 <= l1) {
640
ecbdata->blank_at_eof_in_preimage = 0;
641
ecbdata->blank_at_eof_in_postimage = 0;
@@ -1583,7 +1582,7 @@ static int new_blank_line_at_eof(struct emit_callback *ecbdata, const char *line
1582
ecbdata->blank_at_eof_in_preimage <= ecbdata->lno_in_preimage &&
1583
ecbdata->blank_at_eof_in_postimage <= ecbdata->lno_in_postimage))
1584
return 0;
1586
- return ws_blank_line(line, len, ecbdata->ws_rule);
1585
+ return ws_blank_line(line, len);
1586
}
1587
1588
static void emit_add_line(struct emit_callback *ecbdata,
ws.c
+1
-1
@@ -252,7 +252,7 @@ unsigned ws_check(const char *line, int len, unsigned ws_rule)
252
return ws_check_emit_1(line, len, ws_rule, NULL, NULL, NULL, NULL);
253
}
254
255
-int ws_blank_line(const char *line, int len, unsigned ws_rule)
255
+int ws_blank_line(const char *line, int len)
256
{
257
/*
258
* We _might_ want to treat CR differently from other