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 /archive-tar.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 'archive-tar.c')
| -rw-r--r-- | archive-tar.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/archive-tar.c b/archive-tar.c index 5a77701a15..5ceec3684b 100644 --- a/archive-tar.c +++ b/archive-tar.c @@ -364,7 +364,7 @@ static struct archiver **tar_filters; static int nr_tar_filters; static int alloc_tar_filters; -static struct archiver *find_tar_filter(const char *name, int len) +static struct archiver *find_tar_filter(const char *name, size_t len) { int i; for (i = 0; i < nr_tar_filters; i++) { @@ -380,7 +380,7 @@ static int tar_filter_config(const char *var, const char *value, void *data) struct archiver *ar; const char *name; const char *type; - int namelen; + size_t namelen; if (parse_config_key(var, "tar", &name, &namelen, &type) < 0 || !name) return 0; |