X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=blobdiff_plain;f=utf8.c;h=9efcdb9c09970127ebe37923879274b95efd526c;hb=2ce1a1f23fd83d2cab22f87aff1165fb0c7ad450;hp=a2965c9c1106b7e772d9b53c8885d86320d18f07;hpb=53a58245863eff3d70aaa3ac75d7d57e843fc91d;p=git.git

diff --git a/utf8.c b/utf8.c
index a2965c9c1..9efcdb9c0 100644
--- 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 @@ invalid:
 		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)