From: Alan T. DeKok <aland@freeradius.org>
Date: Wed, 9 Jan 2019 15:08:46 +0000 (-0500)
Subject: format type fixes from cppcheck
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c4ad7cdf6f54fa30e7776ec293a0107a6d01db7d;p=thirdparty%2Ffreeradius-server.git

format type fixes from cppcheck
---

diff --git a/src/lib/io/message.c b/src/lib/io/message.c
index a5f6b1b302d..d6ceb9b7856 100644
--- a/src/lib/io/message.c
+++ b/src/lib/io/message.c
@@ -1325,12 +1325,12 @@ void fr_message_set_debug(fr_message_set_t *ms, FILE *fp)
 	for (i = 0; i <= ms->mr_max; i++) {
 		fr_ring_buffer_t *mr = ms->mr_array[i];
 
-		fprintf(fp, "messages[%d] =\tsize %zd, used %zd\n",
+		fprintf(fp, "messages[%d] =\tsize %zu, used %zu\n",
 			i, fr_ring_buffer_size(mr), fr_ring_buffer_used(mr));
 	}
 
 	for (i = 0; i <= ms->rb_max; i++) {
-		fprintf(fp, "ring buffer[%d] =\tsize %zd, used %zd\n",
+		fprintf(fp, "ring buffer[%d] =\tsize %zu, used %zu\n",
 			i, fr_ring_buffer_size(ms->rb_array[i]), fr_ring_buffer_used(ms->rb_array[i]));
 	}
 }
diff --git a/src/lib/io/network.c b/src/lib/io/network.c
index 3688cae963c..0a5db7fd921 100644
--- a/src/lib/io/network.c
+++ b/src/lib/io/network.c
@@ -699,7 +699,7 @@ static int _network_socket_free(fr_network_socket_t *s)
 	if (!s->dead) {
 		if (fr_event_fd_delete(nr->el, s->listen->fd, s->filter) < 0) {
 			PERROR("Failed deleting socket from event loop in _network_socket_free");
-			rad_assert("Failed removing socket FD from event loop in _network_socket_free" == NULL);
+			return -1;
 		}
 	}
 
@@ -1517,7 +1517,7 @@ static int cmd_stats_self(FILE *fp, UNUSED FILE *fp_err, void *ctx, UNUSED fr_cm
 	fprintf(fp, "count.out\t%" PRIu64 "\n", nr->stats.out);
 	fprintf(fp, "count.dup\t%" PRIu64 "\n", nr->stats.dup);
 	fprintf(fp, "count.dropped\t%" PRIu64 "\n", nr->stats.dropped);
-	fprintf(fp, "count.sockets\t%d\n", rbtree_num_elements(nr->sockets));
+	fprintf(fp, "count.sockets\t%u\n", rbtree_num_elements(nr->sockets));
 
 	return 0;
 }