Merge branch 'jc/maint-add-p-overlapping-hunks' into maint

diff --git a/utf8.c b/utf8.c
index 6db9cd9a078266538d8289a98b49d4ec82d39ae7..8acbc660d31a3552a4451749353139e0dcd371bd 100644 (file)
--- a/utf8.c
+++ b/utf8.c
@@ -163,7 +163,7 @@ static int git_wcwidth(ucs_char_t ch)
  * If the string was not a valid UTF-8, *start pointer is set to NULL
  * and the return value is undefined.
  */
-ucs_char_t pick_one_utf8_char(const char **start, size_t *remainder_p)
+static ucs_char_t pick_one_utf8_char(const char **start, size_t *remainder_p)
 {
        unsigned char *s = (unsigned char *)*start;
        ucs_char_t ch;
@@ -405,6 +405,15 @@ int strbuf_add_wrapped_text(struct strbuf *buf,
        }
 }
 
+int 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);
+       free(tmp);
+       return r;
+}
+
 int is_encoding_utf8(const char *name)
 {
        if (!name)