diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-01-10 14:04:22 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-01-10 14:04:23 -0800 |
| commit | 74474a94f217a0499cc23346d8d094893fb46257 (patch) | |
| tree | b3c061af3a9ee948ddd7d2fb28dedafd72765917 /utf8.h | |
| parent | 2601298f43a9375ae996b4b3c9afeeb29ba5d597 (diff) | |
| parent | e0db1765c3bb108b55ebf82b4e5962f9d1f5e5b7 (diff) | |
| download | git-74474a94f217a0499cc23346d8d094893fb46257.tar.gz | |
Merge branch 'sp/shortlog-missing-lf' into maint
* sp/shortlog-missing-lf:
strbuf_add_wrapped*(): Remove unused return value
shortlog: fix wrapping lines of wraplen
Diffstat (limited to 'utf8.h')
| -rw-r--r-- | utf8.h | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -9,9 +9,9 @@ int is_utf8(const char *text); int is_encoding_utf8(const char *name); int same_encoding(const char *, const char *); -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 |