Skip to contentSkip to conversation

convert.c: fix some sparse warnings

PATCH In review Ramsay Jones 2 participants 2 messages Jun 16, 2016

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 convert.c: fix some sparse warnings

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

---

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(-)
convert.c +2 -2
index 8d4c42a..3d36c45 100644
@@ -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 ||
Signature · 1 line
2.8.0
#1 lore raw
Quoted 11 lines · Ramsay Jones

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

---

Hi Torsten,

Quoted 7 lines

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!

Thanks,
your update has been applied and was lost later. Sorry for that. I will send out a v7, after waiting for more comments on v6b.