From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sat, 19 Oct 2019 22:13:01 +0000 (+0100)
Subject: stest/udp-preload: Fix some compiler warnings
X-Git-Tag: v0.5.0~74
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=72edc4b09f15b87ca2f86d663d197de8e1a8e879;p=secnet.git

stest/udp-preload: Fix some compiler warnings

These come up with our standard CFLAGS which we are erroneously not
using.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
---

diff --git a/stest/udp-preload.c b/stest/udp-preload.c
index f2e2b79..688df97 100644
--- a/stest/udp-preload.c
+++ b/stest/udp-preload.c
@@ -74,7 +74,6 @@ static anyfn_type *find_any(const char *name) {
 
 #define DEF_OLD(fn,rt,args)				\
   typedef rt fn##_fn_type(fn##_args);			\
-  static rt find_##fn(fn##_args);			\
   static fn##_fn_type find_##fn, *old_##fn=find_##fn;	\
   static rt find_##fn(fn##_args) {			\
     anyfn_type *anyfn;					\
@@ -171,7 +170,7 @@ static char *sun_prep(struct sockaddr_un *sun) {
 
     memset(sun,0,sizeof(*sun));
     sun->sun_family=AF_UNIX;
-    int dl = strlen(dir);
+    size_t dl = strlen(dir);
     if (dl + 1 + ADDRPORTSTRLEN + 1 > sizeof(sun->sun_path)) {
 	errno=ENAMETOOLONG; return 0;
     }
@@ -309,7 +308,7 @@ ssize_t TWRAP(recvfrom) {
 
     ssize_t rr=recvmsg(fd,&m,0);
     if (rr==-1) return rr;
-    if (rr<sizeof(tbuf)) { errno=ENXIO; return -1; }
+    if ((size_t)rr<sizeof(tbuf)) { errno=ENXIO; return -1; }
     if (tbuf[ADDRPORTSTRLEN]) { errno=E2BIG; return -1; }
     if (str2addrport(tbuf,addr,addrlen)) {
 	fprintf(stderr, "recvfrom str2addrport `%s' %s\n",tbuf,