The function get_one_line() really returns the line length, not the whole line, but it is really useful, so do not hide it in commit.c, under the wrong name. Signed-off-by: Johannes Schindelin <johannes.schindelin@xxxxxx> --- commit.c | 10 +++++----- commit.h | 1 + 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/commit.c b/commit.c index 4c5dfa9..0c350bc 100644 --- a/commit.c +++ b/commit.c @@ -458,7 +458,7 @@ void clear_commit_marks(struct commit *commit, unsigned int mark) /* * Generic support for pretty-printing the header */ -static int get_one_line(const char *msg, unsigned long len) +int get_line_length(const char *msg, unsigned long len) { int ret = 0; @@ -950,7 +950,7 @@ static void pp_header(enum cmit_fmt fmt, for (;;) { const char *line = *msg_p; char *dst; - int linelen = get_one_line(*msg_p, *len_p); + int linelen = get_line_length(*msg_p, *len_p); unsigned long len; if (!linelen) @@ -1041,7 +1041,7 @@ static void pp_title_line(enum cmit_fmt fmt, title = xmalloc(title_alloc); for (;;) { const char *line = *msg_p; - int linelen = get_one_line(line, *len_p); + int linelen = get_line_length(line, *len_p); *msg_p += linelen; *len_p -= linelen; @@ -1118,7 +1118,7 @@ static void pp_remainder(enum cmit_fmt fmt, int first = 1; for (;;) { const char *line = *msg_p; - int linelen = get_one_line(line, *len_p); + int linelen = get_line_length(line, *len_p); *msg_p += linelen; *len_p -= linelen; @@ -1214,7 +1214,7 @@ unsigned long pretty_print_commit(enum cmit_fmt fmt, /* Skip excess blank lines at the beginning of body, if any... */ for (;;) { - int linelen = get_one_line(msg, len); + int linelen = get_line_length(msg, len); int ll = linelen; if (!linelen) break; diff --git a/commit.h b/commit.h index 467872e..fc6df23 100644 --- a/commit.h +++ b/commit.h @@ -60,6 +60,7 @@ enum cmit_fmt { CMIT_FMT_UNSPECIFIED, }; +extern int get_line_length(const char *msg, unsigned long len); extern enum cmit_fmt get_commit_format(const char *arg); extern unsigned long pretty_print_commit(enum cmit_fmt fmt, const struct commit *, unsigned long len, char **buf_p, unsigned long *space_p, int abbrev, const char *subject, const char *after_subject, enum date_mode dmode); -- 1.5.3.rc1.2718.gd2dc9-dirty - To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html