X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=userdiff.c;h=7244aac746f9f0dfbdf9784924fefd944d3dc6c2;hb=fc2d99f1e95252dcd3eb645a370a658bea7fd5bd;hp=01d3a8b81e628b0a088e3e9fc0ca59acf7d9c58d;hpb=a574c04fbfa06d9b40c4c32db27135c503da7c15;p=git.git

diff --git a/userdiff.c b/userdiff.c
index 01d3a8b81..7244aac74 100644
--- a/userdiff.c
+++ b/userdiff.c
@@ -115,7 +115,7 @@ PATTERNS("cpp",
 	 /* Jump targets or access declarations */
 	 "!^[ \t]*[A-Za-z_][A-Za-z_0-9]*:.*$\n"
 	 /* C/++ functions/methods at top level */
-	 "^([A-Za-z_][A-Za-z_0-9]*([ \t]+[A-Za-z_][A-Za-z_0-9]*([ \t]*::[ \t]*[^[:space:]]+)?){1,}[ \t]*\\([^;]*)$\n"
+	 "^([A-Za-z_][A-Za-z_0-9]*([ \t*]+[A-Za-z_][A-Za-z_0-9]*([ \t]*::[ \t]*[^[:space:]]+)?){1,}[ \t]*\\([^;]*)$\n"
 	 /* compound type at top level */
 	 "^((struct|class|enum)[^;]*)$",
 	 /* -- */
@@ -270,7 +270,7 @@ struct userdiff_driver *userdiff_find_by_path(const char *path)
 
 	if (!path)
 		return NULL;
-	if (git_checkattr(path, 1, &check))
+	if (git_check_attr(path, 1, &check))
 		return NULL;
 
 	if (ATTR_TRUE(check.value))