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>
This commit is contained in:
Johannes Schindelin 2016-06-22 22:20:16 +02:00 committed by Junio C Hamano
parent 765428699a
commit 7735612244
2 changed files with 9 additions and 8 deletions

View File

@ -176,6 +176,7 @@ extern const char *format_subject(struct strbuf *sb, const char *msg,
const char *line_separator); const char *line_separator);
extern void userformat_find_requirements(const char *fmt, struct userformat_want *w); extern void userformat_find_requirements(const char *fmt, struct userformat_want *w);
extern int commit_format_is_empty(enum cmit_fmt); extern int commit_format_is_empty(enum cmit_fmt);
extern const char *skip_blank_lines(const char *msg);
extern void format_commit_message(const struct commit *commit, extern void format_commit_message(const struct commit *commit,
const char *format, struct strbuf *sb, const char *format, struct strbuf *sb,
const struct pretty_print_context *context); const struct pretty_print_context *context);

View File

@ -505,7 +505,7 @@ void pp_user_info(struct pretty_print_context *pp,
} }
} }
static int is_empty_line(const char *line, int *len_p) static int is_blank_line(const char *line, int *len_p)
{ {
int len = *len_p; int len = *len_p;
while (len && isspace(line[len - 1])) while (len && isspace(line[len - 1]))
@ -514,14 +514,14 @@ static int is_empty_line(const char *line, int *len_p)
return !len; return !len;
} }
static const char *skip_empty_lines(const char *msg) const char *skip_blank_lines(const char *msg)
{ {
for (;;) { for (;;) {
int linelen = get_one_line(msg); int linelen = get_one_line(msg);
int ll = linelen; int ll = linelen;
if (!linelen) if (!linelen)
break; break;
if (!is_empty_line(msg, &ll)) if (!is_blank_line(msg, &ll))
break; break;
msg += linelen; msg += linelen;
} }
@ -872,7 +872,7 @@ const char *format_subject(struct strbuf *sb, const char *msg,
int linelen = get_one_line(line); int linelen = get_one_line(line);
msg += linelen; msg += linelen;
if (!linelen || is_empty_line(line, &linelen)) if (!linelen || is_blank_line(line, &linelen))
break; break;
if (!sb) if (!sb)
@ -891,11 +891,11 @@ static void parse_commit_message(struct format_commit_context *c)
const char *msg = c->message + c->message_off; const char *msg = c->message + c->message_off;
const char *start = c->message; const char *start = c->message;
msg = skip_empty_lines(msg); msg = skip_blank_lines(msg);
c->subject_off = msg - start; c->subject_off = msg - start;
msg = format_subject(NULL, msg, NULL); msg = format_subject(NULL, msg, NULL);
msg = skip_empty_lines(msg); msg = skip_blank_lines(msg);
c->body_off = msg - start; c->body_off = msg - start;
c->commit_message_parsed = 1; c->commit_message_parsed = 1;
@ -1642,7 +1642,7 @@ void pp_remainder(struct pretty_print_context *pp,
if (!linelen) if (!linelen)
break; break;
if (is_empty_line(line, &linelen)) { if (is_blank_line(line, &linelen)) {
if (first) if (first)
continue; continue;
if (pp->fmt == CMIT_FMT_SHORT) if (pp->fmt == CMIT_FMT_SHORT)
@ -1709,7 +1709,7 @@ void pretty_print_commit(struct pretty_print_context *pp,
} }
/* Skip excess blank lines at the beginning of body, if any... */ /* Skip excess blank lines at the beginning of body, if any... */
msg = skip_empty_lines(msg); msg = skip_blank_lines(msg);
/* These formats treat the title line specially. */ /* These formats treat the title line specially. */
if (pp->fmt == CMIT_FMT_ONELINE || pp->fmt == CMIT_FMT_EMAIL) if (pp->fmt == CMIT_FMT_ONELINE || pp->fmt == CMIT_FMT_EMAIL)