From b816c1023b2bc2e854409a52e0cf03ffe60677ab Mon Sep 17 00:00:00 2001
From: Job Snijders <job@sobornost.net>
Date: Tue, 17 Aug 2021 20:19:17 +0000
Subject: [PATCH] Fix more warnings

---
 bgpq4.c         |  6 +++---
 bgpq4_printer.c | 12 ++++++------
 sx_prefix.c     |  4 ++--
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/bgpq4.c b/bgpq4.c
index e306854..91c2b2d 100644
--- a/bgpq4.c
+++ b/bgpq4.c
@@ -112,7 +112,7 @@ usage(int ecode)
 }
 
 static void
-version()
+version(void)
 {
 	printf(PACKAGE_NAME " - a versatile utility to generate BGP filters\n"
 	    "version: " PACKAGE_VERSION "\n"
@@ -122,7 +122,7 @@ version()
 }
 
 static void
-exclusive()
+exclusive(void)
 {
 	fprintf(stderr,"-E, -f <asnum>, -G <asnum>, and -t are mutually "
 	    "exclusive\n");
@@ -130,7 +130,7 @@ exclusive()
 }
 
 static void
-vendor_exclusive()
+vendor_exclusive(void)
 {
 	fprintf(stderr, "-b (BIRD), -B (OpenBGPD), -F (formatted), -J (Junos),"
 	    " -j (JSON), -N (Nokia SR OS Classic), -n (Nokia SR OS MD-CLI),"
diff --git a/bgpq4_printer.c b/bgpq4_printer.c
index ebc4f3f..35f561f 100644
--- a/bgpq4_printer.c
+++ b/bgpq4_printer.c
@@ -1308,7 +1308,7 @@ bgpq4_print_ceacl(struct sx_radix_node *n, void *ff)
 {
 	char 	 prefix[128];
 	FILE	*f = (FILE*)ff;
-	char* c;
+	char	*c;
 	uint32_t netmask = 0xfffffffful;
 
 	if (!f)
@@ -1365,7 +1365,7 @@ bgpq4_print_ceacl(struct sx_radix_node *n, void *ff)
 			fprintf(f, " permit ip %s ",
 			    inet_ntoa(n->prefix->addr.addr));
 			fprintf(f, "%s ",
-			    inet_ntoa(*(struct in_addr*) & wildaddr));
+			    inet_ntoa(*(struct in_addr*)&wildaddr));
 		} else {
 			fprintf(f, " permit ip host %s ",
 			    inet_ntoa(n->prefix->addr.addr));
@@ -1373,16 +1373,16 @@ bgpq4_print_ceacl(struct sx_radix_node *n, void *ff)
 
 		if (wildmask) {
 			fprintf(f, "%s ",
-			    inet_ntoa(*(struct in_addr*) & mask));
+			    inet_ntoa(*(struct in_addr*)&mask));
 			fprintf(f, "%s\n",
-			    inet_ntoa(*(struct in_addr*) & wildmask));
+			    inet_ntoa(*(struct in_addr*)&wildmask));
 		} else {
 			fprintf(f, "host %s\n",
-			    inet_ntoa(*(struct in_addr*) & mask));
+			    inet_ntoa(*(struct in_addr*)&mask));
 		}
 	} else {
 		fprintf(f, " permit ip host %s host %s\n", prefix,
-		    inet_ntoa(*(struct in_addr*) & netmask));
+		    inet_ntoa(*(struct in_addr*)&netmask));
 	}
 
 checkSon:
diff --git a/sx_prefix.c b/sx_prefix.c
index de80140..d365f54 100644
--- a/sx_prefix.c
+++ b/sx_prefix.c
@@ -290,7 +290,7 @@ sx_prefix_range_parse(struct sx_radix_tree *tree, int af, unsigned int maxlen,
 {
 	char			*d = strchr(text, '^');
 	struct sx_prefix	*p;
-	unsigned long		 min, max;
+	unsigned long		 min, max = 0;
 
 	p = sx_prefix_alloc(NULL);
 
@@ -367,7 +367,7 @@ sx_prefix_range_parse(struct sx_radix_tree *tree, int af, unsigned int maxlen,
 	return 1;
 }
 
-struct sx_prefix*
+struct sx_prefix *
 sx_prefix_new(int af, char *text)
 {
 	struct sx_prefix *p = NULL;