commit d3f8b1f9b4928339a8421ee84b92b407104086d5
from: Mark Jamsek <mark@jamsek.dev>
via: Thomas Adam <thomas@xteddy.org>
date: Wed Aug 31 15:59:06 2022 UTC

tog: remove gcc ternary if extension

ok stsp@

commit - 85debd54dc0b01b5608a23c42ce5a98f4c8b2507
commit + d3f8b1f9b4928339a8421ee84b92b407104086d5
blob - 717962a10618ff3461cff66abb81bccc5c740c9f
blob + 347c7a5386f3266e0392dbb930896feeb8278b52
--- tog/tog.c
+++ tog/tog.c
@@ -4697,14 +4697,14 @@ show_diff_view(struct tog_view *view)
 		err = got_object_id_str(&id_str1, s->id1);
 		if (err)
 			return err;
-		label1 = s->label1 ? : id_str1;
+		label1 = s->label1 ? s->label1 : id_str1;
 	} else
 		label1 = "/dev/null";
 
 	err = got_object_id_str(&id_str2, s->id2);
 	if (err)
 		return err;
-	label2 = s->label2 ? : id_str2;
+	label2 = s->label2 ? s->label2 : id_str2;
 
 	if (asprintf(&header, "diff %s %s", label1, label2) == -1) {
 		err = got_error_from_errno("asprintf");