summaryrefslogtreecommitdiff
path: root/builtin
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 /builtin
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 'builtin')
-rw-r--r--builtin/help.c2
-rw-r--r--builtin/reflog.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/builtin/help.c b/builtin/help.c
index e5590d7787..c024110531 100644
--- a/builtin/help.c
+++ b/builtin/help.c
@@ -242,7 +242,7 @@ static int add_man_viewer_cmd(const char *name,
static int add_man_viewer_info(const char *var, const char *value)
{
const char *name, *subkey;
- int namelen;
+ size_t namelen;
if (parse_config_key(var, "man", &name, &namelen, &subkey) < 0 || !name)
return 0;
diff --git a/builtin/reflog.c b/builtin/reflog.c
index 81dfd563c0..52ecf6d43c 100644
--- a/builtin/reflog.c
+++ b/builtin/reflog.c
@@ -459,7 +459,7 @@ static struct reflog_expire_cfg *find_cfg_ent(const char *pattern, size_t len)
static int reflog_expire_config(const char *var, const char *value, void *cb)
{
const char *pattern, *key;
- int pattern_len;
+ size_t pattern_len;
timestamp_t expire;
int slot;
struct reflog_expire_cfg *ent;