tests: change from curlx_ultous to util_ultous

Since the former function is getting removed from the lib.

Closes #16319

diff --git a/tests/server/mqttd.c b/tests/server/mqttd.c
index 4927d1105e89328109b6d1ffcfbb7715c4490b32..759a66c5b6eab0aeb08e7f4bd53a17400862b4e6 100644 (file)
--- a/tests/server/mqttd.c
+++ b/tests/server/mqttd.c
@@ -993,7 +993,7 @@ int main(int argc, char *argv[])
                   argv[arg]);
           return 0;
         }
-        port = curlx_ultous(ulnum);
+        port = util_ultous(ulnum);
         arg++;
       }
     }

diff --git a/tests/server/rtspd.c b/tests/server/rtspd.c
index 0df94ae56c46da8b598c2f0ed7544655b8dd10cd..691063304ec007dd23ba6bbe8030889eccbfacfd 100644 (file)
--- a/tests/server/rtspd.c
+++ b/tests/server/rtspd.c
@@ -1113,7 +1113,7 @@ int main(int argc, char *argv[])
       if(argc > arg) {
         char *endptr;
         unsigned long ulnum = strtoul(argv[arg], &endptr, 10);
-        port = curlx_ultous(ulnum);
+        port = util_ultous(ulnum);
         arg++;
       }
     }

diff --git a/tests/server/sockfilt.c b/tests/server/sockfilt.c
index 37931b64efdcf85f51fc746ac43228e70604c674..1cb2c61f40ef2637843abe8bccf32ee386f44e9d 100644 (file)
--- a/tests/server/sockfilt.c
+++ b/tests/server/sockfilt.c
@@ -1450,7 +1450,7 @@ int main(int argc, char *argv[])
       if(argc > arg) {
         char *endptr;
         unsigned long ulnum = strtoul(argv[arg], &endptr, 10);
-        port = curlx_ultous(ulnum);
+        port = util_ultous(ulnum);
         arg++;
       }
     }
@@ -1467,7 +1467,7 @@ int main(int argc, char *argv[])
                   argv[arg]);
           return 0;
         }
-        connectport = curlx_ultous(ulnum);
+        connectport = util_ultous(ulnum);
         arg++;
       }
     }

diff --git a/tests/server/socksd.c b/tests/server/socksd.c
index 6788a1a540fe816939c22e24a1c2ebdc7e116b9b..f74d0b7ac2639a0051fe3621a85e22a3907db469 100644 (file)
--- a/tests/server/socksd.c
+++ b/tests/server/socksd.c
@@ -1060,7 +1060,7 @@ int main(int argc, char *argv[])
       if(argc > arg) {
         char *endptr;
         unsigned long ulnum = strtoul(argv[arg], &endptr, 10);
-        port = curlx_ultous(ulnum);
+        port = util_ultous(ulnum);
         arg++;
       }
     }

diff --git a/tests/server/sws.c b/tests/server/sws.c
index 3763410ee075ab74932eb8aff105d65910589101..ee7f74627295a01facca079a8a92acf7039aafe5 100644 (file)
--- a/tests/server/sws.c
+++ b/tests/server/sws.c
@@ -517,7 +517,7 @@ static int ProcessRequest(struct httprequest *req)
             if(!ulnum || (ulnum > 65535UL))
               logmsg("Invalid CONNECT port received");
             else
-              req->connect_port = curlx_ultous(ulnum);
+              req->connect_port = util_ultous(ulnum);
 
           }
           logmsg("Port number: %d, test case number: %ld",
@@ -2144,7 +2144,7 @@ int main(int argc, char *argv[])
                   argv[arg]);
           return 0;
         }
-        port = curlx_ultous(ulnum);
+        port = util_ultous(ulnum);
         arg++;
       }
     }
@@ -2166,7 +2166,7 @@ int main(int argc, char *argv[])
                   "be number of seconds\n", argv[arg]);
           return 0;
         }
-        keepalive_secs = curlx_ultous(ulnum);
+        keepalive_secs = util_ultous(ulnum);
         arg++;
       }
     }

diff --git a/tests/server/tftpd.c b/tests/server/tftpd.c
index b513ecc5cb1b129fad0c6bdd62aaa3db510c89ab..2313d6d1f1a234f4d5103a13e51bcf89a4ea2a82 100644 (file)
--- a/tests/server/tftpd.c
+++ b/tests/server/tftpd.c
@@ -612,7 +612,7 @@ int main(int argc, char **argv)
       if(argc > arg) {
         char *endptr;
         unsigned long ulnum = strtoul(argv[arg], &endptr, 10);
-        port = curlx_ultous(ulnum);
+        port = util_ultous(ulnum);
         arg++;
       }
     }

diff --git a/tests/server/util.c b/tests/server/util.c
index c7fe4bbc976fd070a716af8bf4a7af59efe26aad..388dab1479bff6a6d1a8e00f6d6beff092d45180 100644 (file)
--- a/tests/server/util.c
+++ b/tests/server/util.c
@@ -899,3 +899,24 @@ int bind_unix_socket(curl_socket_t sock, const char *unix_socket,
   return rc;
 }
 #endif
+
+/*
+** unsigned long to unsigned short
+*/
+#define CURL_MASK_USHORT  ((unsigned short)~0)
+#define CURL_MASK_SSHORT  (CURL_MASK_USHORT >> 1)
+
+unsigned short util_ultous(unsigned long ulnum)
+{
+#ifdef __INTEL_COMPILER
+#  pragma warning(push)
+#  pragma warning(disable:810) /* conversion may lose significant bits */
+#endif
+
+  DEBUGASSERT(ulnum <= (unsigned long) CURL_MASK_USHORT);
+  return (unsigned short)(ulnum & (unsigned long) CURL_MASK_USHORT);
+
+#ifdef __INTEL_COMPILER
+#  pragma warning(pop)
+#endif
+}

diff --git a/tests/server/util.h b/tests/server/util.h
index a91ecf47787a89274d72599bfe1f041e54616451..b225478ff94e7de922c69f58f901ef8537e5aac6 100644 (file)
--- a/tests/server/util.h
+++ b/tests/server/util.h
@@ -95,4 +95,6 @@ int bind_unix_socket(curl_socket_t sock, const char *unix_socket,
         struct sockaddr_un *sau);
 #endif  /* USE_UNIX_SOCKETS */
 
+unsigned short util_ultous(unsigned long ulnum);
+
 #endif  /* HEADER_CURL_SERVER_UTIL_H */