瀏覽代碼

COMP: Fix compile warnings on certain hp systems

Bill Hoffman 21 年之前
父節點
當前提交
c47af14ee1
共有 1 個文件被更改,包括 15 次插入3 次删除
  1. 15 3
      Source/CTest/Curl/ftp.c

+ 15 - 3
Source/CTest/Curl/ftp.c

@@ -196,11 +196,15 @@ static CURLcode AllowServerConnect(struct connectdata *conn)
     /* we have received data here */
     /* we have received data here */
     {
     {
       curl_socket_t s;
       curl_socket_t s;
-      size_t size = sizeof(struct sockaddr_in);
+#ifdef __hpux
+      int size = sizeof(struct sockaddr_in);
+#else
+      socklen_t size = sizeof(struct sockaddr_in);
+#endif
       struct sockaddr_in add;
       struct sockaddr_in add;
 
 
-      getsockname(sock, (struct sockaddr *) &add, (socklen_t *)&size);
-      s=accept(sock, (struct sockaddr *) &add, (socklen_t *)&size);
+      getsockname(sock, (struct sockaddr *) &add, &size);
+      s=accept(sock, (struct sockaddr *) &add, &size);
 
 
       sclose(sock); /* close the first socket */
       sclose(sock); /* close the first socket */
 
 
@@ -1315,7 +1319,11 @@ CURLcode ftp_use_port(struct connectdata *conn)
   if(!addr) {
   if(!addr) {
     /* pick a suitable default here */
     /* pick a suitable default here */
 
 
+#ifdef __hpux
+    int sslen;
+#else
     socklen_t sslen;
     socklen_t sslen;
+#endif
 
 
     sslen = sizeof(sa);
     sslen = sizeof(sa);
     if (getsockname(conn->sock[FIRSTSOCKET],
     if (getsockname(conn->sock[FIRSTSOCKET],
@@ -1348,7 +1356,11 @@ CURLcode ftp_use_port(struct connectdata *conn)
       if(bind(portsock, (struct sockaddr *)&sa, size) >= 0) {
       if(bind(portsock, (struct sockaddr *)&sa, size) >= 0) {
         /* we succeeded to bind */
         /* we succeeded to bind */
         struct sockaddr_in add;
         struct sockaddr_in add;
+#ifdef __hpux
+        int socksize = sizeof(add);
+#else
         socklen_t socksize = sizeof(add);
         socklen_t socksize = sizeof(add);
+#endif
 
 
         if(getsockname(portsock, (struct sockaddr *) &add,
         if(getsockname(portsock, (struct sockaddr *) &add,
                        &socksize)<0) {
                        &socksize)<0) {