diff options
| author | Junio C Hamano <gitster@pobox.com> | 2020-04-28 15:49:58 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-04-28 15:49:58 -0700 |
| commit | 342bc9e29fa462b127d9e1c02aa58349e58e56f0 (patch) | |
| tree | 6cfcbb9ebfbd25bc1d42410476336c333917a51d /userdiff.c | |
| parent | 2abd648b17899679f9a76bfdeba8f620fa6fff21 (diff) | |
| parent | 348482dede19296e5caa33ed73010278767c2348 (diff) | |
| download | git-342bc9e29fa462b127d9e1c02aa58349e58e56f0.tar.gz | |
Merge branch 'jk/config-use-size-t'
The config API made mixed uses of int and size_t types to represent
length of various pieces of text it parsed, which has been updated
to use the correct type (i.e. size_t) throughout.
* jk/config-use-size-t:
config: reject parsing of files over INT_MAX
config: use size_t to store parsed variable baselen
git_config_parse_key(): return baselen as size_t
config: drop useless length variable in write_pair()
parse_config_key(): return subsection len as size_t
remote: drop auto-strlen behavior of make_branch() and make_rewrite()
Diffstat (limited to 'userdiff.c')
| -rw-r--r-- | userdiff.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/userdiff.c b/userdiff.c index efbe05e5a5..30ab42df8e 100644 --- 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; |