[PATCH v8 3/6] verify-tag: update variable name and type
- From
santiago@nyu.edu <santiago@nyu.edu>
- Date
- Apr 22, 2016, 14:52 UTC
- Message-ID
- <1461336725-29915-4-git-send-email-santiago@nyu.edu>
- In-Reply-To
- <1461336725-29915-1-git-send-email-santiago@nyu.edu>
From: Santiago Torres <santiago@nyu.edu>
The run_gpg_verify() function has two variables, size and len.
This may come off as confusing when reading the code. Clarify which one pertains to the length of the tag headers by renaming len to payload_size. Additionally, change the type of payload_size to size_t to match the return type of parse_signature.
Signed-off-by: Santiago Torres <santiago@nyu.edu> Reviewed-by: Eric Sunshine <sunshine@sunshineco.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> --- builtin/verify-tag.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/builtin/verify-tag.c b/builtin/verify-tag.c index 77f070a..fa26e40 100644 --- a/builtin/verify-tag.c +++ b/builtin/verify-tag.c @@ -21,20 +21,21 @@ static const char * const verify_tag_usage[] = { static int run_gpg_verify(const char *buf, unsigned long size, unsigned flags) { struct signature_check sigc; - int len; + size_t payload_size; int ret; memset(&sigc, 0, sizeof(sigc)); - len = parse_signature(buf, size); + payload_size = parse_signature(buf, size); - if (size == len) { + if (size == payload_size) { if (flags & GPG_VERIFY_VERBOSE) - write_in_full(1, buf, len); + write_in_full(1, buf, payload_size); return error("no signature found"); } - ret = check_signature(buf, len, buf + len, size - len, &sigc); + ret = check_signature(buf, payload_size, buf + payload_size, + size - payload_size, &sigc); print_signature_buffer(&sigc, flags); signature_check_clear(&sigc);
-- 2.8.0