git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Ramsay Jones <ramsay@ramsay1.demon.co.uk>
To: pyokagan@gmail.com
Cc: Junio C Hamano <gitster@pobox.com>,
	GIT Mailing-list <git@vger.kernel.org>
Subject: [PATCH] pull.c: fix some sparse warnings
Date: Wed, 17 Jun 2015 00:18:57 +0100	[thread overview]
Message-ID: <5580AEE1.6090300@ramsay1.demon.co.uk> (raw)


Commit 191241e5 ("pull: pass git-fetch's options to git-fetch",
14-06-2015) uses the OPT_PASSTHRU macro to add some command line
'struct option' initialisations to the pull_options array. This
causes sparse to complain, thus:

      SP builtin/pull.c
  builtin/pull.c:160:9: warning: Using plain integer as NULL pointer
  builtin/pull.c:163:9: warning: Using plain integer as NULL pointer
  builtin/pull.c:170:9: warning: Using plain integer as NULL pointer
  builtin/pull.c:173:9: warning: Using plain integer as NULL pointer
  builtin/pull.c:182:9: warning: Using plain integer as NULL pointer
  builtin/pull.c:188:9: warning: Using plain integer as NULL pointer
  builtin/pull.c:191:9: warning: Using plain integer as NULL pointer

This is caused by using '0' in the macro which is used to initialise
a pointer field of the 'struct option'. In order to suppress the
warnings, we simply pass 'NULL', rather than '0', to the OPT_PASSTHRU
macro.

Signed-off-by: Ramsay Jones <ramsay@ramsay1.demon.co.uk>
---

Hi Paul,

If you need to re-roll your patches on the 'pt/pull-builtin' branch,
could you please squash this into the patch which corresponds to
commit 191241e5.

Thanks!

ATB,
Ramsay Jones

 builtin/pull.c | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/builtin/pull.c b/builtin/pull.c
index d690aee..8bbe838 100644
--- a/builtin/pull.c
+++ b/builtin/pull.c
@@ -157,20 +157,20 @@ static struct option pull_options[] = {
 
 	/* Options passed to git-fetch */
 	OPT_GROUP(N_("Options related to fetching")),
-	OPT_PASSTHRU(0, "all", &opt_all, 0,
+	OPT_PASSTHRU(0, "all", &opt_all, NULL,
 		N_("fetch from all remotes"),
 		PARSE_OPT_NOARG),
-	OPT_PASSTHRU('a', "append", &opt_append, 0,
+	OPT_PASSTHRU('a', "append", &opt_append, NULL,
 		N_("append to .git/FETCH_HEAD instead of overwriting"),
 		PARSE_OPT_NOARG),
 	OPT_PASSTHRU(0, "upload-pack", &opt_upload_pack, N_("path"),
 		N_("path to upload pack on remote end"),
 		0),
 	OPT__FORCE(&opt_force, N_("force overwrite of local branch")),
-	OPT_PASSTHRU('t', "tags", &opt_tags, 0,
+	OPT_PASSTHRU('t', "tags", &opt_tags, NULL,
 		N_("fetch all tags and associated objects"),
 		PARSE_OPT_NOARG),
-	OPT_PASSTHRU('p', "prune", &opt_prune, 0,
+	OPT_PASSTHRU('p', "prune", &opt_prune, NULL,
 		N_("prune remote-tracking branches no longer on remote"),
 		PARSE_OPT_NOARG),
 	OPT_PASSTHRU(0, "recurse-submodules", &opt_recurse_submodules,
@@ -179,16 +179,16 @@ static struct option pull_options[] = {
 		PARSE_OPT_OPTARG),
 	OPT_BOOL(0, "dry-run", &opt_dry_run,
 		N_("dry run")),
-	OPT_PASSTHRU('k', "keep", &opt_keep, 0,
+	OPT_PASSTHRU('k', "keep", &opt_keep, NULL,
 		N_("keep downloaded pack"),
 		PARSE_OPT_NOARG),
 	OPT_PASSTHRU(0, "depth", &opt_depth, N_("depth"),
 		N_("deepen history of shallow clone"),
 		0),
-	OPT_PASSTHRU(0, "unshallow", &opt_unshallow, 0,
+	OPT_PASSTHRU(0, "unshallow", &opt_unshallow, NULL,
 		N_("convert to a complete repository"),
 		PARSE_OPT_NONEG | PARSE_OPT_NOARG),
-	OPT_PASSTHRU(0, "update-shallow", &opt_update_shallow, 0,
+	OPT_PASSTHRU(0, "update-shallow", &opt_update_shallow, NULL,
 		N_("accept refs that update .git/shallow"),
 		PARSE_OPT_NOARG),
 	OPT_PASSTHRU(0, "refmap", &opt_refmap, N_("refmap"),
-- 
2.4.0

             reply	other threads:[~2015-06-16 23:19 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-06-16 23:18 Ramsay Jones [this message]
2015-06-17 10:32 ` [PATCH] pull.c: fix some sparse warnings Paul Tan

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=5580AEE1.6090300@ramsay1.demon.co.uk \
    --to=ramsay@ramsay1.demon.co.uk \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=pyokagan@gmail.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).