From: Junio C Hamano <gitster@pobox.com>
To: santiago@nyu.edu
Cc: git@vger.kernel.org, peff@peff.net, sunshine@sunshineco.com,
walters@verbum.org, Lukas Puehringer <luk.puehringer@gmail.com>
Subject: Re: [PATCH v6 4/6] builtin/tag: add --format argument for tag -v
Date: Wed, 18 Jan 2017 10:25:59 -0800 [thread overview]
Message-ID: <xmqqh94wb4y0.fsf@gitster.mtv.corp.google.com> (raw)
In-Reply-To: <xmqqmvepb4oj.fsf@gitster.mtv.corp.google.com> (Junio C. Hamano's message of "Tue, 17 Jan 2017 16:19:24 -0800")
Junio C Hamano <gitster@pobox.com> writes:
> santiago@nyu.edu writes:
>
>> @@ -428,9 +443,12 @@ int cmd_tag(int argc, const char **argv, const char *prefix)
>> if (filter.merge_commit)
>> die(_("--merged and --no-merged option are only allowed with -l"));
>> if (cmdmode == 'd')
>> - return for_each_tag_name(argv, delete_tag);
>> - if (cmdmode == 'v')
>> - return for_each_tag_name(argv, verify_tag);
>> + return for_each_tag_name(argv, delete_tag, NULL);
>> + if (cmdmode == 'v') {
>> + if (format)
>> + verify_ref_format(format);
>> + return for_each_tag_name(argv, verify_tag, format);
>> + }
>
> This triggers:
>
> builtin/tag.c: In function 'cmd_tag':
> builtin/tag.c:451:3: error: passing argument 3 of
> 'for_each_tag_name' discards 'const' qualifier from pointer target type [-Werror]
> return for_each_tag_name(argv, verify_tag, format);
>
> Either for-each-tag-name's new parameter needs to be typed
> correctly, or the type of the "format" variable needs to be updated.
Squashing the following into this commit solves this issue with the
former approach. The lines it touches are all from 4/6 and I view
all of it as general improvement, including type correctness and
code formatting.
diff --git a/builtin/tag.c b/builtin/tag.c
index f81273a85a..fbb85ba3dc 100644
--- a/builtin/tag.c
+++ b/builtin/tag.c
@@ -66,10 +66,10 @@ static int list_tags(struct ref_filter *filter, struct ref_sorting *sorting, con
}
typedef int (*each_tag_name_fn)(const char *name, const char *ref,
- const unsigned char *sha1, void *cb_data);
+ const unsigned char *sha1, const void *cb_data);
static int for_each_tag_name(const char **argv, each_tag_name_fn fn,
- void *cb_data)
+ const void *cb_data)
{
const char **p;
char ref[PATH_MAX];
@@ -95,7 +95,7 @@ static int for_each_tag_name(const char **argv, each_tag_name_fn fn,
}
static int delete_tag(const char *name, const char *ref,
- const unsigned char *sha1, void *cb_data)
+ const unsigned char *sha1, const void *cb_data)
{
if (delete_ref(ref, sha1, 0))
return 1;
@@ -104,10 +104,10 @@ static int delete_tag(const char *name, const char *ref,
}
static int verify_tag(const char *name, const char *ref,
- const unsigned char *sha1, void *cb_data)
+ const unsigned char *sha1, const void *cb_data)
{
int flags;
- char *fmt_pretty = cb_data;
+ const char *fmt_pretty = cb_data;
flags = GPG_VERIFY_VERBOSE;
if (fmt_pretty)
next prev parent reply other threads:[~2017-01-18 18:26 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-01-17 23:37 [PATCH v6 0/6] Add --format to tag verification santiago
2017-01-17 23:37 ` [PATCH v6 1/6] gpg-interface,tag: add GPG_VERIFY_OMIT_STATUS flag santiago
2017-01-17 23:37 ` [PATCH v6 2/6] ref-filter: add function to print single ref_array_item santiago
2017-01-17 23:37 ` [PATCH v6 3/6] builtin/verify-tag: add --format to verify-tag santiago
2017-01-17 23:37 ` [PATCH v6 4/6] builtin/tag: add --format argument for tag -v santiago
2017-01-18 0:02 ` Junio C Hamano
2017-01-18 0:05 ` Junio C Hamano
2017-01-18 0:19 ` Junio C Hamano
2017-01-18 18:25 ` Junio C Hamano [this message]
2017-01-18 18:28 ` Santiago Torres
2017-01-18 18:44 ` Junio C Hamano
2017-01-18 18:50 ` Santiago Torres
2017-01-18 20:16 ` Eric Wong
2017-01-19 0:37 ` Eric Wong
2017-01-18 18:52 ` Junio C Hamano
2017-01-18 18:28 ` Jeff King
2017-01-18 18:49 ` Junio C Hamano
2017-01-17 23:37 ` [PATCH v6 5/6] t/t7030-verify-tag: Add --format specifier tests santiago
2017-01-17 23:37 ` [PATCH v6 6/6] t/t7004-tag: " santiago
2017-01-18 0:07 ` [PATCH v6 0/6] Add --format to tag verification Junio C Hamano
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=xmqqh94wb4y0.fsf@gitster.mtv.corp.google.com \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=luk.puehringer@gmail.com \
--cc=peff@peff.net \
--cc=santiago@nyu.edu \
--cc=sunshine@sunshineco.com \
--cc=walters@verbum.org \
/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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).