Commit e0db1765 authored by Steffen Prohaska's avatar Steffen Prohaska Committed by Junio C Hamano

strbuf_add_wrapped*(): Remove unused return value

Since shortlog isn't using the return value anymore (see previous
commit), the functions can be changed to void.
Signed-off-by: default avatarSteffen Prohaska <prohaska@zib.de>
Signed-off-by: default avatarJunio C Hamano <gitster@pobox.com>
parent 5b597082
......@@ -323,7 +323,7 @@ static size_t display_mode_esc_sequence_len(const char *s)
* If indent is negative, assume that already -indent columns have been
* consumed (and no extra indent is necessary for the first line).
*/
int strbuf_add_wrapped_text(struct strbuf *buf,
void strbuf_add_wrapped_text(struct strbuf *buf,
const char *text, int indent1, int indent2, int width)
{
int indent, w, assume_utf8 = 1;
......@@ -332,7 +332,7 @@ int strbuf_add_wrapped_text(struct strbuf *buf,
if (width <= 0) {
strbuf_add_indented_text(buf, text, indent1, indent2);
return 1;
return;
}
retry:
......@@ -356,14 +356,14 @@ int strbuf_add_wrapped_text(struct strbuf *buf,
if (w <= width || !space) {
const char *start = bol;
if (!c && text == start)
return w;
return;
if (space)
start = space;
else
strbuf_addchars(buf, ' ', indent);
strbuf_add(buf, start, text - start);
if (!c)
return w;
return;
space = text;
if (c == '\t')
w |= 0x07;
......@@ -405,13 +405,12 @@ int strbuf_add_wrapped_text(struct strbuf *buf,
}
}
int strbuf_add_wrapped_bytes(struct strbuf *buf, const char *data, int len,
void strbuf_add_wrapped_bytes(struct strbuf *buf, const char *data, int len,
int indent, int indent2, int width)
{
char *tmp = xstrndup(data, len);
int r = strbuf_add_wrapped_text(buf, tmp, indent, indent2, width);
strbuf_add_wrapped_text(buf, tmp, indent, indent2, width);
free(tmp);
return r;
}
int is_encoding_utf8(const char *name)
......
......@@ -8,9 +8,9 @@ int utf8_strwidth(const char *string);
int is_utf8(const char *text);
int is_encoding_utf8(const char *name);
int strbuf_add_wrapped_text(struct strbuf *buf,
void strbuf_add_wrapped_text(struct strbuf *buf,
const char *text, int indent, int indent2, int width);
int strbuf_add_wrapped_bytes(struct strbuf *buf, const char *data, int len,
void strbuf_add_wrapped_bytes(struct strbuf *buf, const char *data, int len,
int indent, int indent2, int width);
#ifndef NO_ICONV
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment