[netperf-dev] netperf4 commit notice r49 - trunk/src

[raj at netperf.org]

Author: raj
Date: 2006-01-25 16:23:52 -0800 (Wed, 25 Jan 2006)
New Revision: 49

Modified:
   trunk/src/netlib.c
   trunk/src/netlib.h
   trunk/src/netlib_linux.c
   trunk/src/netmsg.c
   trunk/src/nettest_bsd.c
   trunk/src/nettest_dns.c
   trunk/src/nettest_vst.c
Log:
Further warning cleanups and wrapping of #includes


Modified: trunk/src/netlib.c
===================================================================
--- trunk/src/netlib.c	2006-01-25 20:09:23 UTC (rev 48)
+++ trunk/src/netlib.c	2006-01-26 00:23:52 UTC (rev 49)
@@ -960,7 +960,7 @@
 */
 
 int
-establish_listen(char *hostname, char *service, int af, socklen_t *addrlenp)
+establish_listen(char *hostname, char *service, int af, netperf_socklen_t *addrlenp)
 {
   int sockfd;
   int error;

Modified: trunk/src/netlib.h
===================================================================
--- trunk/src/netlib.h	2006-01-25 20:09:23 UTC (rev 48)
+++ trunk/src/netlib.h	2006-01-26 00:23:52 UTC (rev 49)
@@ -99,7 +99,8 @@
 extern int set_thread_locality(test_t *test, char *loc_type, char *loc_value);
 extern void break_args_explicit(char *s, char *arg1, char *arg2);
 extern int parse_address_family(char family_string[]);
-extern int establish_listen(char *hostname, char *service, int af, socklen_t *addrlenp);
+extern int establish_listen(char *hostname, char *service, 
+			    int af, netperf_socklen_t *addrlenp);
 #ifndef HAVE_GET_EXPIRATION_TIME
 /* we need a proto since we are providing the fuction ourselves */
 extern int get_expiration_time(struct timespec *delta,

Modified: trunk/src/netlib_linux.c
===================================================================
--- trunk/src/netlib_linux.c	2006-01-25 20:09:23 UTC (rev 48)
+++ trunk/src/netlib_linux.c	2006-01-26 00:23:52 UTC (rev 49)
@@ -48,7 +48,9 @@
 #include <string.h>
 #endif
 
+#ifdef HAVE_ERRNO_H
 #include <errno.h>
+#endif
 
 #include "netperf.h"
 #include "netlib.h"

Modified: trunk/src/netmsg.c
===================================================================
--- trunk/src/netmsg.c	2006-01-25 20:09:23 UTC (rev 48)
+++ trunk/src/netmsg.c	2006-01-26 00:23:52 UTC (rev 49)
@@ -939,7 +939,7 @@
       loc_type  = xmlGetProp(test_node,(const xmlChar *)"locality_type");
       loc_value = xmlGetProp(test_node,(const xmlChar *)"locality_value");
       if ((loc_type != NULL) && (loc_value != NULL)) {
-        rc = set_thread_locality(new_test, loc_type, loc_value);
+        rc = set_thread_locality(new_test, (char *)loc_type, (char *)loc_value);
       }
     }
     /* wait for test to initialize */

Modified: trunk/src/nettest_bsd.c
===================================================================
--- trunk/src/nettest_bsd.c	2006-01-25 20:09:23 UTC (rev 48)
+++ trunk/src/nettest_bsd.c	2006-01-26 00:23:52 UTC (rev 49)
@@ -75,7 +75,7 @@
 #include <stdio.h>
 #endif
 
-/* between the next three we aught to find MAXDOUBLE or DBL_MAX */
+/* between the next three we aught to find DBL_MAX */
 #ifdef HAVE_VALUES_H
 #include <values.h>
 #endif
@@ -127,14 +127,6 @@
 
 #include "nettest_bsd.h"
 
-/* after all that do we have MAXDOUBLE and MINDOUBLE? */
-#ifndef MAXDOUBLE
-#define MAXDOUBLE DBL_MAX
-#endif
-#ifndef MINDOUBLE
-#define MINDOUBLE DBL_MIN
-#endif
-
 #ifdef WIN32
 #define CHECK_FOR_INVALID_SOCKET (temp_socket == INVALID_SOCKET)
 #define CHECK_FOR_RECV_ERROR(len) (len == SOCKET_ERROR)
@@ -2437,8 +2429,8 @@
     rd->utilization    = &(rd->trans_results[max_count]);
     rd->servdemand     = &(rd->utilization[max_count]);
     rd->run_time       = &(rd->servdemand[max_count]);
-    rd->result_minimum = MAXDOUBLE;
-    rd->result_maximum = MINDOUBLE;
+    rd->result_minimum = DBL_MAX;
+    rd->result_maximum = DBL_MIN;
     rd->outfd          = outfd;
     rd->sd_denominator = 0.0;
     if (!strcmp(report_flags,"PRINT_RUN")) {

Modified: trunk/src/nettest_dns.c
===================================================================
--- trunk/src/nettest_dns.c	2006-01-25 20:09:23 UTC (rev 48)
+++ trunk/src/nettest_dns.c	2006-01-26 00:23:52 UTC (rev 49)
@@ -65,21 +65,10 @@
 #include <values.h>
 #endif
 
-/* perhaps this needs ifdef coverage, we use it on darwin to get
-   DLB_MAX et al */
-
 #ifdef HAVE_FLOAT_H
 #include <float.h>
 #endif
 
-#ifndef MAXDOUBLE
-#define MAXDOUBLE DBL_MAX
-#endif
-#ifndef MINDOUBLE
-#define MINDOUBLE DBL_MIN
-#endif
-
-
 #ifdef HAVE_SYS_TIME_H
 #include <sys/time.h>
 #ifdef TIME_WITH_SYS_TIME
@@ -1869,8 +1858,8 @@
     rd->utilization    = &(rd->trans_results[max_count]);
     rd->servdemand     = &(rd->utilization[max_count]);
     rd->run_time       = &(rd->servdemand[max_count]);
-    rd->result_minimum = MAXDOUBLE;
-    rd->result_maximum = MINDOUBLE;
+    rd->result_minimum = DBL_MAX;
+    rd->result_maximum = DBL_MIN;
     rd->outfd          = outfd;
     rd->sd_denominator = 0.0;
     if (!strcmp(report_flags,"PRINT_RUN")) {

Modified: trunk/src/nettest_vst.c
===================================================================
--- trunk/src/nettest_vst.c	2006-01-25 20:09:23 UTC (rev 48)
+++ trunk/src/nettest_vst.c	2006-01-26 00:23:52 UTC (rev 49)
@@ -61,13 +61,6 @@
 #include <float.h>
 #endif
 
-#ifndef MAXDOUBLE
-#define MAXDOUBLE DBL_MAX
-#endif
-#ifndef MINDOUBLE
-#define MINDOUBLE DBL_MIN
-#endif
-
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
 #endif
@@ -2373,8 +2366,8 @@
     rd->utilization    = &(rd->trans_results[max_count]);
     rd->servdemand     = &(rd->utilization[max_count]);
     rd->run_time       = &(rd->servdemand[max_count]);
-    rd->result_minimum = MAXDOUBLE;
-    rd->result_maximum = MINDOUBLE;
+    rd->result_minimum = DBL_MAX;
+    rd->result_maximum = DBL_MIN;
     rd->outfd          = outfd;
     rd->sd_denominator = 0.0;
     if (!strcmp(report_flags,"PRINT_RUN")) {