From 597c0119dd0ee7fe77de625f380ec65ee0947d83 Mon Sep 17 00:00:00 2001
From: Duncaen <mail@duncano.de>
Date: Thu, 13 Jun 2019 13:28:48 +0200
Subject: [PATCH] xbps-checkvers: simplify print logic

---
 bin/xbps-checkvers/main.c | 30 ++++++++++++------------------
 1 file changed, 12 insertions(+), 18 deletions(-)

diff --git a/bin/xbps-checkvers/main.c b/bin/xbps-checkvers/main.c
index a22a93db..1f10645c 100644
--- a/bin/xbps-checkvers/main.c
+++ b/bin/xbps-checkvers/main.c
@@ -615,26 +615,20 @@ rcv_check_version(rcv_t *rcv)
 
 	xbps_dictionary_get_cstring_nocopy(rcv->pkgd, "pkgver", &repover);
 
-	if (!repover && rcv->manual) {
-		printf("%.*s ? %s\n",
-			(int)pkgname.v.len, pkgname.v.s, srcver+pkgname.v.len+1);
-	} else if (repover && !rcv->show_all) {
-		if (xbps_cmpver(repover+pkgname.v.len+1,
+	if (!repover && rcv->manual)
+		;
+	else if (rcv->show_all)
+		;
+	else if (repover && (xbps_cmpver(repover+pkgname.v.len+1,
 		    srcver+pkgname.v.len+1) < 0 ||
-		    check_reverts(repover+pkgname.v.len+1, reverts)) {
-			printf("%.*s %s %s\n",
-				(int)pkgname.v.len, pkgname.v.s,
-				repover+pkgname.v.len+1,
-				srcver+pkgname.v.len+1);
-		}
-	} else if (rcv->show_all) {
-		const char *p = NULL;
-		if (repover == NULL)
-			p = "?";
+		    check_reverts(repover+pkgname.v.len+1, reverts)))
+		;
+	else
+		return 0;
 
-		printf("%.*s %s %s\n", (int)pkgname.v.len, pkgname.v.s,
-		    p ? p : repover+pkgname.v.len+1, srcver+pkgname.v.len+1);
-	}
+	repover = repover ? repover+pkgname.v.len+1 : "?";
+	printf("%.*s %s %s\n", (int)pkgname.v.len, pkgname.v.s, repover,
+		srcver+pkgname.v.len+1);
 
 	return 0;
 }