git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: santiago@nyu.edu
To: git@vger.kernel.org
Cc: Junio C Hamano <gitster@pobox.com>, Jeff King <peff@peff.net>,
	Eric Sunshine <sunshine@sunshineco.com>,
	Santiago Torres <santiago@nyu.edu>
Subject: [PATCH v4 4/6] tag.c: Replace varialbe name for readability
Date: Mon,  4 Apr 2016 18:22:13 -0400	[thread overview]
Message-ID: <1459808535-8895-5-git-send-email-santiago@nyu.edu> (raw)
In-Reply-To: <1459808535-8895-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. We clarify which one
pertains to the length of the tag headers by renaming len to
payload_length.

Signed-off-by: Santiago Torres <santiago@nyu.edu>
---
	Note: this used to be part of the previous patch on v3. I moved the
renaming part to a single patch to simplify the review. 

 tag.c | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/tag.c b/tag.c
index 81e86e6..f6443db 100644
--- a/tag.c
+++ b/tag.c
@@ -9,20 +9,21 @@ const char *tag_type = "tag";
 static int run_gpg_verify(const char *buf, unsigned long size, unsigned flags)
 {
 	struct signature_check sigc;
-	int len;
+	int payload_length;
 	int ret;
 
 	memset(&sigc, 0, sizeof(sigc));
 
-	len = parse_signature(buf, size);
+	payload_length = parse_signature(buf, size);
 
-	if (size == len) {
+	if (size == payload_length) {
 		if (flags & GPG_VERIFY_VERBOSE)
-			write_in_full(1, buf, len);
+			write_in_full(1, buf, payload_length);
 		return error("no signature found");
        }
 
-	ret = check_signature(buf, len, buf + len, size - len, &sigc);
+	ret = check_signature(buf, payload_length, buf + payload_length,
+				size - payload_length, &sigc);
 	print_signature_buffer(&sigc, flags);
 
 	signature_check_clear(&sigc);
-- 
2.8.0

  parent reply	other threads:[~2016-04-04 22:22 UTC|newest]

Thread overview: 16+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-04-04 22:22 [PATCH v4 0/6] tag: move PGP verification code to tag.c santiago
2016-04-04 22:22 ` [PATCH v4 1/6] builtin/verify-tag.c: Ignore SIGPIPE on gpg-interface santiago
2016-04-04 22:22 ` [PATCH v4 2/6] t/t7030-verify-tag.sh: Adds validation for multiple tags santiago
2016-04-05  1:27   ` Eric Sunshine
2016-04-05  1:46     ` Santiago Torres
2016-04-05  3:51       ` Eric Sunshine
2016-04-04 22:22 ` [PATCH v4 3/6] builtin/verify-tag: move verification code to tag.c santiago
2016-04-04 22:22 ` santiago [this message]
2016-04-05  1:30   ` [PATCH v4 4/6] tag.c: Replace varialbe name for readability Eric Sunshine
2016-04-04 22:22 ` [PATCH v4 5/6] tag: use pgp_verify_function in tag -v call santiago
2016-04-05  1:39   ` Eric Sunshine
2016-04-05  1:43     ` Santiago Torres
2016-04-04 22:22 ` [PATCH v4 6/6] tag.c: Change gpg_verify_tag argument to sha1 santiago
2016-04-05  2:00   ` Eric Sunshine
2016-04-05  2:10     ` Santiago Torres
2016-04-05  3:46       ` Eric Sunshine

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1459808535-8895-5-git-send-email-santiago@nyu.edu \
    --to=santiago@nyu.edu \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=peff@peff.net \
    --cc=sunshine@sunshineco.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).