All of lore.kernel.org
 help / color / mirror / Atom feed
From: Ramsay Jones <ramsay@ramsayjones.plus.com>
To: "Torsten Bögershausen" <tboegi@web.de>
Cc: Junio C Hamano <gitster@pobox.com>,
	GIT Mailing-list <git@vger.kernel.org>
Subject: [PATCH] convert.c: fix some sparse warnings
Date: Sun, 24 Apr 2016 18:14:10 +0100	[thread overview]
Message-ID: <571CFEE2.2070708@ramsayjones.plus.com> (raw)


Sparse complains thus:

      SP convert.c
  convert.c:178:24: warning: Using plain integer as NULL pointer
  convert.c:239:28: warning: dubious: !x & y

Signed-off-by: Ramsay Jones <ramsay@ramsayjones.plus.com>
---

Hi Torsten,

When you next re-roll your 'tb/convert-eol-autocrlf' branch, could you
please squash this into your patch corresponding to commit cbcc0471
("convert.c: more safer crlf handling with text attribute", 22-04-2016).

[No, you have seen this before! ;-) ]

Thanks!

ATB,
Ramsay Jones

 convert.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/convert.c b/convert.c
index 8d4c42a..3d36c45 100644
--- a/convert.c
+++ b/convert.c
@@ -175,7 +175,7 @@ const char *get_wt_convert_stats_ascii(const char *path)
 	memset(&stats, 0, sizeof(stats));
 	fd = open(path, O_RDONLY);
 	if (fd < 0)
-		return 0;
+		return NULL;
 	for (;;) {
 		char buf[1024];
 		ssize_t readlen = read(fd, buf, sizeof(buf));
@@ -236,7 +236,7 @@ static int would_convert_lf_at_checkout(unsigned convert_stats,
 		return 0;
 
 	/* No "naked" LF? Nothing to convert, regardless. */
-	if (!convert_stats & CONVERT_STAT_BITS_TXT_LF)
+	if (!(convert_stats & CONVERT_STAT_BITS_TXT_LF))
 		return 0;
 
 	if (crlf_action == CRLF_AUTO ||
-- 
2.8.0

             reply	other threads:[~2016-04-24 17:14 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-04-24 17:14 Ramsay Jones [this message]
2016-04-25  4:15 ` [PATCH] convert.c: fix some sparse warnings Torsten Bögershausen
  -- strict thread matches above, loose matches on Subject: below --
2016-04-03 18:43 Ramsay Jones

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=571CFEE2.2070708@ramsayjones.plus.com \
    --to=ramsay@ramsayjones.plus.com \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=tboegi@web.de \
    /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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.