threads / patch / 27466

patchremove tests of always-false condition

Subject: [PATCH] remove tests of always-false condition

## tl;dr

2 messages between May 26, 2011 and May 26, 2011. Diffs are folded; open one to read it.

replies: 1people: 2as markdown or json

Jim Meyering· May 26, 2011, 13:58 UTC · lore
* fsck.c (fsck_error_function): Don't test obj->sha1 == 0.
It can never be true, since that sha1 member is an array.
* transport.c (set_upstreams): Likewise for ref->new_sha1.
Signed-off-by: Jim Meyering <meyering@redhat.com>
---
Fix some coverity-spotted nits.
Relative to "next".
 fsck.c      |    2 +-
 transport.c |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
Show changes to 2 files +2 −3

fsck.c, transport.c

diff --git a/fsck.c b/fsck.c
index 6f266c1..60bd4bb 100644
--- a/fsck.c
+++ b/fsck.c
@@ -349,7 +349,7 @@ int fsck_error_function(struct object *obj, int type, const char *fmt, ...)
 	va_list ap;
 	struct strbuf sb = STRBUF_INIT;

-	strbuf_addf(&sb, "object %s:", obj->sha1?sha1_to_hex(obj->sha1):"(null)");
+	strbuf_addf(&sb, "object %s:", sha1_to_hex(obj->sha1));

 	va_start(ap, fmt);
 	strbuf_vaddf(&sb, fmt, ap);
diff --git a/transport.c b/transport.c
index 1a3998e..c9c8056 100644
--- a/transport.c
+++ b/transport.c
@@ -156,7 +156,7 @@ static void set_upstreams(struct transport *transport, struct ref *refs,
 			continue;
 		if (!ref->peer_ref)
 			continue;
-		if (!ref->new_sha1 || is_null_sha1(ref->new_sha1))
+		if (is_null_sha1(ref->new_sha1))
 			continue;

 		/* Follow symbolic refs (mainly for HEAD). */
--
1.7.5.2.660.g9f46c
Junio C Hamano· May 26, 2011, 18:23 UTC · re: Jim Meyering · lore

Re: [PATCH] remove tests of always-false condition

Jim Meyering <jim@meyering.net> writes:
> Relative to "next".

I don't appreciate this comment especially for a patch that applies cleanly to "maint".

But other than that, fine.  Thanks.

← back to recent threads