fix compiler warning

5 files changed, 27 insertions, 10 deletions

diff --git a/tests/server/Makefile.inc b/tests/server/Makefile.inc
index 4e8fc3658..b9bac8279 100644
--- a/tests/server/Makefile.inc
+++ b/tests/server/Makefile.inc
@@ -6,20 +6,33 @@ useful = getpart.c getpart.h $(top_srcdir)/lib/strequal.c	\
 
 resolve_SOURCES= resolve.c util.c util.h $(useful)
 resolve_LDADD = @TEST_SERVER_LIBS@
+resolve_CFLAGS = $(AM_CFLAGS)
 
-sws_SOURCES= sws.c util.c util.h $(useful)
+sws_SOURCES= sws.c util.c util.h $(useful) \
+ $(top_srcdir)/lib/warnless.c \
+ $(top_srcdir)/lib/warnless.h
 sws_LDADD = @TEST_SERVER_LIBS@
+sws_CFLAGS = $(AM_CFLAGS)
 
 sockfilt_SOURCES = sockfilt.c util.c util.h $(useful)	\
- $(top_srcdir)/lib/inet_pton.c
+ $(top_srcdir)/lib/inet_pton.c \
+ $(top_srcdir)/lib/warnless.c \
+ $(top_srcdir)/lib/warnless.h
 sockfilt_LDADD = @TEST_SERVER_LIBS@
+sockfilt_CFLAGS = $(AM_CFLAGS)
 
 getpart_SOURCES= testpart.c $(useful)
-# This is needed because of (unused) network debugging functions in memdebug.c
 getpart_LDADD = @TEST_SERVER_LIBS@
+getpart_CFLAGS = $(AM_CFLAGS)
 
-tftpd_SOURCES = tftpd.c util.c util.h $(useful) tftp.h
+tftpd_SOURCES = tftpd.c util.c util.h $(useful) tftp.h \
+ $(top_srcdir)/lib/warnless.c \
+ $(top_srcdir)/lib/warnless.h
 tftpd_LDADD = @TEST_SERVER_LIBS@
+tftpd_CFLAGS = $(AM_CFLAGS)
 
-rtspd_SOURCES = rtspd.c util.c util.h $(useful)
+rtspd_SOURCES = rtspd.c util.c util.h $(useful) \
+ $(top_srcdir)/lib/warnless.c \
+ $(top_srcdir)/lib/warnless.h
 rtspd_LDADD = @TEST_SERVER_LIBS@
+rtspd_CFLAGS = $(AM_CFLAGS)
diff --git a/tests/server/rtspd.c b/tests/server/rtspd.c
index 9fd5d3418..4c5e6a107 100644
--- a/tests/server/rtspd.c
+++ b/tests/server/rtspd.c
@@ -59,6 +59,7 @@
 #include "curlx.h" /* from the private lib dir */
 #include "getpart.h"
 #include "util.h"
+#include "warnless.h"
 
 /* include memdebug.h last */
 #include "memdebug.h"
@@ -1234,7 +1235,7 @@ int main(int argc, char *argv[])
                   argv[arg]);
           return 0;
         }
-        port = (unsigned short)(ulnum & 0xFFFFUL);
+        port = Curl_ultous(ulnum);
         arg++;
       }
     }
diff --git a/tests/server/sockfilt.c b/tests/server/sockfilt.c
index 1bd19924e..50e91f41d 100644
--- a/tests/server/sockfilt.c
+++ b/tests/server/sockfilt.c
@@ -110,6 +110,7 @@
 #include "getpart.h"
 #include "inet_pton.h"
 #include "util.h"
+#include "warnless.h"
 
 /* include memdebug.h last */
 #include "memdebug.h"
@@ -898,7 +899,7 @@ int main(int argc, char *argv[])
                   argv[arg]);
           return 0;
         }
-        port = (unsigned short)(ulnum & 0xFFFFUL);
+        port = Curl_ultous(ulnum);
         arg++;
       }
     }
@@ -915,7 +916,7 @@ int main(int argc, char *argv[])
                   argv[arg]);
           return 0;
         }
-        connectport = (unsigned short)(ulnum & 0xFFFFUL);
+        connectport = Curl_ultous(ulnum);
         arg++;
       }
     }
diff --git a/tests/server/sws.c b/tests/server/sws.c
index 5e1b0dc70..14058e548 100644
--- a/tests/server/sws.c
+++ b/tests/server/sws.c
@@ -60,6 +60,7 @@
 #include "curlx.h" /* from the private lib dir */
 #include "getpart.h"
 #include "util.h"
+#include "warnless.h"
 
 /* include memdebug.h last */
 #include "memdebug.h"
@@ -1138,7 +1139,7 @@ int main(int argc, char *argv[])
                   argv[arg]);
           return 0;
         }
-        port = (unsigned short)(ulnum & 0xFFFFUL);
+        port = Curl_ultous(ulnum);
         arg++;
       }
     }
diff --git a/tests/server/tftpd.c b/tests/server/tftpd.c
index 8822f4bb6..97669896c 100644
--- a/tests/server/tftpd.c
+++ b/tests/server/tftpd.c
@@ -97,6 +97,7 @@
 #include "curlx.h" /* from the private lib dir */
 #include "getpart.h"
 #include "util.h"
+#include "warnless.h"
 
 /* include memdebug.h last */
 #include "memdebug.h"
@@ -716,7 +717,7 @@ int main(int argc, char **argv)
                   argv[arg]);
           return 0;
         }
-        port = (unsigned short)(ulnum & 0xFFFFUL);
+        port = Curl_ultous(ulnum);
         arg++;
       }
     }