Merge branch 'dl/merge-autostash-rebase-quit-fix'

[thirdparty/git.git] / userdiff.c

diff --git a/userdiff.c b/userdiff.c
index efbe05e5a5b6f1aa9a6b92365a4f987f6078dc04..30ab42df8ef2b0a93b007b5afb484ccd4102c3b0 100644 (file)
--- a/userdiff.c
+++ b/userdiff.c
@@ -222,7 +222,7 @@ static struct userdiff_driver driver_false = {
        { NULL, 0 }
 };
 
-static struct userdiff_driver *userdiff_find_by_namelen(const char *k, int len)
+static struct userdiff_driver *userdiff_find_by_namelen(const char *k, size_t len)
 {
        int i;
        for (i = 0; i < ndrivers; i++) {
@@ -266,7 +266,7 @@ int userdiff_config(const char *k, const char *v)
 {
        struct userdiff_driver *drv;
        const char *name, *type;
-       int namelen;
+       size_t namelen;
 
        if (parse_config_key(k, "diff", &name, &namelen, &type) || !name)
                return 0;