pretty: make the skip_blank_lines() function public
This function will be used also in the find_commit_subject() function. While at it, rename the function to reflect that it skips not only empty lines, but any lines consisting of only whitespace, too. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Johannes Schindelin committed
Jun 22, 2016 at 22:20 UTC
77356122443039b4b65a7795d66b3d1fdeedcce8
2 files changed
+9
-8
commit.h
+1
@@ -176,6 +176,7 @@ extern const char *format_subject(struct strbuf *sb, const char *msg,
176
const char *line_separator);
177
extern void userformat_find_requirements(const char *fmt, struct userformat_want *w);
178
extern int commit_format_is_empty(enum cmit_fmt);
179
+extern const char *skip_blank_lines(const char *msg);
180
extern void format_commit_message(const struct commit *commit,
181
const char *format, struct strbuf *sb,
182
const struct pretty_print_context *context);
pretty.c
+8
-8
@@ -505,7 +505,7 @@ void pp_user_info(struct pretty_print_context *pp,
505
}
506
}
507
508
-static int is_empty_line(const char *line, int *len_p)
508
+static int is_blank_line(const char *line, int *len_p)
509
{
510
int len = *len_p;
511
while (len && isspace(line[len - 1]))
@@ -514,14 +514,14 @@ static int is_empty_line(const char *line, int *len_p)
514
return !len;
515
}
516
517
-static const char *skip_empty_lines(const char *msg)
517
+const char *skip_blank_lines(const char *msg)
518
{
519
for (;;) {
520
int linelen = get_one_line(msg);
521
int ll = linelen;
522
if (!linelen)
523
break;
524
- if (!is_empty_line(msg, &ll))
524
+ if (!is_blank_line(msg, &ll))
525
break;
526
msg += linelen;
527
}
@@ -872,7 +872,7 @@ const char *format_subject(struct strbuf *sb, const char *msg,
872
int linelen = get_one_line(line);
873
874
msg += linelen;
875
- if (!linelen || is_empty_line(line, &linelen))
875
+ if (!linelen || is_blank_line(line, &linelen))
876
break;
877
878
if (!sb)
@@ -891,11 +891,11 @@ static void parse_commit_message(struct format_commit_context *c)
891
const char *msg = c->message + c->message_off;
892
const char *start = c->message;
893
894
- msg = skip_empty_lines(msg);
894
+ msg = skip_blank_lines(msg);
895
c->subject_off = msg - start;
896
897
msg = format_subject(NULL, msg, NULL);
898
- msg = skip_empty_lines(msg);
898
+ msg = skip_blank_lines(msg);
899
c->body_off = msg - start;
900
901
c->commit_message_parsed = 1;
@@ -1642,7 +1642,7 @@ void pp_remainder(struct pretty_print_context *pp,
1642
if (!linelen)
1643
break;
1644
1645
- if (is_empty_line(line, &linelen)) {
1645
+ if (is_blank_line(line, &linelen)) {
1646
if (first)
1647
continue;
1648
if (pp->fmt == CMIT_FMT_SHORT)
@@ -1709,7 +1709,7 @@ void pretty_print_commit(struct pretty_print_context *pp,
1709
}
1710
1711
/* Skip excess blank lines at the beginning of body, if any... */
1712
- msg = skip_empty_lines(msg);
1712
+ msg = skip_blank_lines(msg);
1713
1714
/* These formats treat the title line specially. */
1715
if (pp->fmt == CMIT_FMT_ONELINE || pp->fmt == CMIT_FMT_EMAIL)