git-svn: Fix a typo and add a comma in an error message in git-svn

diff --git a/utf8.c b/utf8.c
index a2965c9c1106b7e772d9b53c8885d86320d18f07..9efcdb9c09970127ebe37923879274b95efd526c 100644 (file)
--- a/utf8.c
+++ b/utf8.c
@@ -11,7 +11,8 @@ struct interval {
 };
 
 /* auxiliary function for binary search in interval table */
-static int bisearch(ucs_char_t ucs, const struct interval *table, int max) {
+static int bisearch(ucs_char_t ucs, const struct interval *table, int max)
+{
        int min = 0;
        int mid;
 
@@ -62,7 +63,7 @@ static int bisearch(ucs_char_t ucs, const struct interval *table, int max) {
  * in ISO 10646.
  */
 
-static int wcwidth(ucs_char_t ch)
+static int git_wcwidth(ucs_char_t ch)
 {
        /*
         * Sorted list of non-overlapping intervals of non-spacing characters,
@@ -207,7 +208,7 @@ int utf8_width(const char **start)
                return 0;
        }
 
-       return wcwidth(ch);
+       return git_wcwidth(ch);
 }
 
 int is_utf8(const char *text)
@@ -283,7 +284,6 @@ int print_wrapped_text(const char *text, int indent, int indent2, int width)
                        text++;
                }
        }
-       return w;
 }
 
 int is_encoding_utf8(const char *name)