Changeset 15282 for trunk/FACT++/dim/src/tcpip.c

Timestamp:

04/08/13 15:07:07 (11 years ago)

Author:

tbretz

Message:

Updated to v20r7.

File:

• trunk/FACT++/dim/src/tcpip.c (modified) (13 diffs)

trunk/FACT++/dim/src/tcpip.c

@@ -290 +290 @@
                 if(DIM_IO_path[0] == -1)
                 {
-                        if( (DIM_IO_path[0] = socket(AF_INET, SOCK_STREAM, 0)) == -1 ) 
+                        if( (DIM_IO_path[0] = (int)socket(AF_INET, SOCK_STREAM, 0)) == -1 ) 
                         {
                                 perror("socket");
@@ -369 +369 @@
                 closesock(DIM_IO_path[0]);
                 DIM_IO_path[0] = -1;
-                if( (DIM_IO_path[0] = socket(AF_INET, SOCK_STREAM, 0)) == -1 ) 
+                if( (DIM_IO_path[0] = (int)socket(AF_INET, SOCK_STREAM, 0)) == -1 ) 
                 {
                         perror("socket");
@@ -568 +568 @@
 static int get_bytes_to_read(int conn_id)
 {
-        int i, ret, count;
+        int i, ret, count = 0;
         
         for(i = 0; i < 3; i++)
@@ -616 +616 @@
                 would this be better? not sure afterwards...
                 nbytes = (size < count) ? size : count;
-                if( (len = readsock(Net_conns[conn_id].channel, p, nbytes, 0)) <= 0 ) 
-*/
-                if( (len = readsock(Net_conns[conn_id].channel, p, size, 0)) <= 0 ) 
+                if( (len = readsock(Net_conns[conn_id].channel, p, (size_t)nbytes, 0)) <= 0 ) 
+*/
+                if( (len = (int)readsock(Net_conns[conn_id].channel, p, (size_t)size, 0)) <= 0 ) 
                 {       /* Connection closed by other side. */
                         Net_conns[conn_id].read_rout( conn_id, -1, 0 );
@@ -654 +654 @@
 
         othersize = sizeof(other);
-        memset( (char *) &other, 0, othersize );
-        Net_conns[conn_id].mbx_channel = accept( Net_conns[conn_id].channel,
+        memset( (char *) &other, 0, (size_t)othersize );
+        Net_conns[conn_id].mbx_channel = (int)accept( Net_conns[conn_id].channel,
                                                  (struct sockaddr*)&other, (unsigned int *)&othersize );
         if( Net_conns[conn_id].mbx_channel < 0 ) 
@@ -842 +842 @@
 int ret;
 
-        ptr = (unsigned char *)node+strlen(node)+1;
+        ptr = (unsigned char *)node+(int)strlen(node)+1;
     ipaddr[0] = *ptr++;
     ipaddr[1] = *ptr++;
@@ -900 +900 @@
         {
                 sscanf(node,"%d.%d.%d.%d",&a, &b, &c, &d);
-            ipaddr[0] = a;
-            ipaddr[1] = b;
-            ipaddr[2] = c;
-            ipaddr[3] = d;
+            ipaddr[0] = (unsigned char)a;
+            ipaddr[1] = (unsigned char)b;
+            ipaddr[2] = (unsigned char)c;
+            ipaddr[3] = (unsigned char)d;
             host_number = 1;
 #ifndef VxWorks
@@ -928 +928 @@
                 host_number = 1;
 /*
-          ptr = (unsigned char *)node+strlen(node)+1;
+          ptr = (unsigned char *)node+(int)strlen(node)+1;
           ipaddr[0] = *ptr++;
           ipaddr[1] = *ptr++;
@@ -961 +961 @@
 #endif
 
-        if( (path = socket(AF_INET, SOCK_STREAM, 0)) == -1 ) 
+        if( (path = (int)socket(AF_INET, SOCK_STREAM, 0)) == -1 ) 
         {
                 perror("socket");
@@ -1053 +1053 @@
 
     dim_tcpip_init(0);
-        if( (path = socket(AF_INET, SOCK_STREAM, 0)) == -1 ) 
+        if( (path = (int)socket(AF_INET, SOCK_STREAM, 0)) == -1 ) 
         {
                 return(0);
@@ -1257 +1257 @@
         int     wrote;
 
-        wrote = writesock( Net_conns[conn_id].channel, buffer, size, 0 );
+        wrote = (int)writesock( Net_conns[conn_id].channel, buffer, (size_t)size, 0 );
         if( wrote == -1 ) {
 /*
@@ -1306 +1306 @@
         
         set_non_blocking(Net_conns[conn_id].channel);
-        wrote = writesock( Net_conns[conn_id].channel, buffer, size, 0 );
+        wrote = (int)writesock( Net_conns[conn_id].channel, buffer, (size_t)size, 0 );
 #ifndef WIN32
         ret = errno;
@@ -1332 +1332 @@
                         if(selret > 0)
                         {
-                                wrote = writesock( Net_conns[conn_id].channel, buffer, size, 0 );
+                                wrote = (int)writesock( Net_conns[conn_id].channel, buffer, (size_t)size, 0 );
                                 if( wrote == -1 ) 
                                 {