Module Name:    src
Committed By:   rillig
Date:           Fri Aug 26 19:44:20 UTC 2022

Modified Files:
        src/usr.bin/xlint/lint1: decl.c

Log Message:
lint: clean up to_int_constant

No functional change.


To generate a diff of this commit:
cvs rdiff -u -r1.294 -r1.295 src/usr.bin/xlint/lint1/decl.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/usr.bin/xlint/lint1/decl.c
diff -u src/usr.bin/xlint/lint1/decl.c:1.294 src/usr.bin/xlint/lint1/decl.c:1.295
--- src/usr.bin/xlint/lint1/decl.c:1.294	Sun Jul  3 14:35:54 2022
+++ src/usr.bin/xlint/lint1/decl.c	Fri Aug 26 19:44:19 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: decl.c,v 1.294 2022/07/03 14:35:54 rillig Exp $ */
+/* $NetBSD: decl.c,v 1.295 2022/08/26 19:44:19 rillig Exp $ */
 
 /*
  * Copyright (c) 1996 Christopher G. Demetriou.  All Rights Reserved.
@@ -38,7 +38,7 @@
 
 #include <sys/cdefs.h>
 #if defined(__RCSID)
-__RCSID("$NetBSD: decl.c,v 1.294 2022/07/03 14:35:54 rillig Exp $");
+__RCSID("$NetBSD: decl.c,v 1.295 2022/08/26 19:44:19 rillig Exp $");
 #endif
 
 #include <sys/param.h>
@@ -3374,12 +3374,10 @@ to_int_constant(tnode_t *tn, bool requir
 	tspec_t	t;
 	val_t	*v;
 
-	v = constant(tn, required);
+	if (tn == NULL)
+		return 1;
 
-	if (tn == NULL) {
-		i = 1;
-		goto done;
-	}
+	v = constant(tn, required);
 
 	/*
 	 * Abstract declarations are used inside expression. To free
@@ -3410,7 +3408,6 @@ to_int_constant(tnode_t *tn, bool requir
 		}
 	}
 
-done:
 	free(v);
 	return i;
 }

Reply via email to