From 80f13f21932e328dae8e57a693a04bb54fd7165e Mon Sep 17 00:00:00 2001
From: Dmitry Podgorny <pasis.ua@gmail.com>
Date: Sun, 31 Oct 2021 00:52:44 +0300
Subject: [PATCH] Resolve gcc warnings in the utils

---
 src/ipx_interface.c    | 23 ++++++++++++++++-------
 src/ipx_internal_net.c |  3 ++-
 2 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/src/ipx_interface.c b/src/ipx_interface.c
index 26cbeff..73db1e1 100644
--- a/src/ipx_interface.c
+++ b/src/ipx_interface.c
@@ -47,7 +47,7 @@ struct frame_type {
 int
 lookup_frame_type(char *frame)
 {
-	int	j;
+	size_t	j;
 
 	for (j = 0; (j < NFTYPES) && 
 		(strcasecmp(frame_types[j].ft_name, frame)); 
@@ -172,7 +172,7 @@ ipx_add_interface(int argc, char **argv)
 }
 
 int
-ipx_delall_interface(int argc, char **argv)
+ipx_delall_interface(void)
 {
 	struct sockaddr_ipx	*sipx = (struct sockaddr_ipx *)&id.ifr_addr;
 	int	s;
@@ -183,6 +183,7 @@ ipx_delall_interface(int argc, char **argv)
 	char	frame_type[20];
 	int	fti;
 	FILE	*fp;
+	char	*ret;
 
 	s = socket(AF_IPX, SOCK_DGRAM, AF_IPX);
 	if (s < 0) {
@@ -195,13 +196,19 @@ ipx_delall_interface(int argc, char **argv)
 	if (fp == NULL)
 		fp = fopen("/proc/net/ipx_interface", "r");
 	if (fp == NULL) {
-		fprintf(stderr, 
+		fprintf(stderr,
 			"%s: Unable to open \"/proc/net/ipx_interface.\"\n",
 			progname);
 		exit(-1);
 	}
 	
-	fgets(buffer, 80, fp);
+	ret = fgets(buffer, 80, fp);
+	if (ret == NULL) {
+		fprintf(stderr,
+			"%s: Unable to read \"/proc/net/ipx_interface.\"\n",
+			progname);
+		exit(-1);
+	}
 	while (fscanf(fp, "%s %s %s %s %s", buffer, buffer, buffer,
 			device, frame_type) == 5) {
 
@@ -372,9 +379,11 @@ main(int argc, char **argv)
 			argv[i] = argv[i+1];
 		ipx_add_interface(argc-1, argv);
 	} else if (strncasecmp(argv[1], "delall", 6) == 0) {
-		for (i = 1; i < (argc-1); i++) 
-			argv[i] = argv[i+1];
-		ipx_delall_interface(argc-1, argv);
+		if (argc > 2) {
+			usage();
+			exit(-1);
+		}
+		ipx_delall_interface();
 	} else if (strncasecmp(argv[1], "del", 3) == 0) {
 		for (i = 1; i < (argc-1); i++) 
 			argv[i] = argv[i+1];
diff --git a/src/ipx_internal_net.c b/src/ipx_internal_net.c
index 9acef55..39686e1 100644
--- a/src/ipx_internal_net.c
+++ b/src/ipx_internal_net.c
@@ -144,7 +144,8 @@ ipx_del_internal_net(int argc, char **argv)
 	int	s;
 	int	result;
 	char	errmsg[80];
-	
+
+	(void)argv;
 	if (argc != 1) {
 		usage();
 	}