summaryrefslogtreecommitdiff
path: root/convert.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2020-04-28 15:49:58 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2020-04-28 15:49:58 -0700
commit342bc9e29fa462b127d9e1c02aa58349e58e56f0 (patch)
tree6cfcbb9ebfbd25bc1d42410476336c333917a51d /convert.c
parentMerge branch 'bc/constant-memequal' (diff)
parentconfig: reject parsing of files over INT_MAX (diff)
downloadtgif-342bc9e29fa462b127d9e1c02aa58349e58e56f0.tar.xz
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 'convert.c')
-rw-r--r--convert.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/convert.c b/convert.c
index 5aa87d45e3..572449825c 100644
--- a/convert.c
+++ b/convert.c
@@ -1018,7 +1018,7 @@ static int apply_filter(const char *path, const char *src, size_t len,
static int read_convert_config(const char *var, const char *value, void *cb)
{
const char *key, *name;
- int namelen;
+ size_t namelen;
struct convert_driver *drv;
/*