[netperf-dev] netperf2 commit notice r537 - in trunk: . src

[raj at netperf.org]

Author: raj
Date: 2012-03-19 13:21:54 -0700 (Mon, 19 Mar 2012)
New Revision: 537

Modified:
   trunk/AUTHORS
   trunk/src/net_uuid.c
   trunk/src/netcpu_procstat.c
   trunk/src/netdrv_ethtool.c
   trunk/src/netlib.c
   trunk/src/nettest_unix.c
Log:
warning fixes from Chema Gonzalez and something found along the way

Modified: trunk/AUTHORS
===================================================================
--- trunk/AUTHORS	2012-03-13 18:43:12 UTC (rev 536)
+++ trunk/AUTHORS	2012-03-19 20:21:54 UTC (rev 537)
@@ -277,4 +277,6 @@
 IPv6 addresses in the control message.
 
 Shachar Raindel - a patch to bring the "get linux to emit ENOBUFS"
-functionality from classic netperf tests to the omni tests.
\ No newline at end of file
+functionality from classic netperf tests to the omni tests.
+
+Chema Gonzalez - fixes for some assorted warnings.
\ No newline at end of file

Modified: trunk/src/net_uuid.c
===================================================================
--- trunk/src/net_uuid.c	2012-03-13 18:43:12 UTC (rev 536)
+++ trunk/src/net_uuid.c	2012-03-19 20:21:54 UTC (rev 537)
@@ -154,7 +154,7 @@
   fp = fopen("/dev/urandom","rb");
 
   if (NULL != fp) {
-    fread(seed,sizeof(seed),1,fp);
+    fread(seed,sizeof(char),16,fp);
     fclose(fp);
     return;
   }

Modified: trunk/src/netcpu_procstat.c
===================================================================
--- trunk/src/netcpu_procstat.c	2012-03-13 18:43:12 UTC (rev 536)
+++ trunk/src/netcpu_procstat.c	2012-03-19 20:21:54 UTC (rev 537)
@@ -175,7 +175,7 @@
   if (n > 1) p = strchr (p, '\n');
 
   for (i = 0; i < n; i++) {
-    memset(&res[i], 0, sizeof (&res[i]));
+    memset(&res[i], 0, sizeof (res[i]));
     p = strchr (p, ' ');
     sscanf(p, "%llu %llu %llu %llu %llu %llu %llu %llu %llu",
 	   (unsigned long long *)&res[i].user,

Modified: trunk/src/netdrv_ethtool.c
===================================================================
--- trunk/src/netdrv_ethtool.c	2012-03-13 18:43:12 UTC (rev 536)
+++ trunk/src/netdrv_ethtool.c	2012-03-19 20:21:54 UTC (rev 537)
@@ -2,6 +2,7 @@
 #include <config.h>
 #endif
 
+#include <unistd.h>
 #include <sys/types.h>
 #include <string.h>
 #include <sys/ioctl.h>

Modified: trunk/src/netlib.c
===================================================================
--- trunk/src/netlib.c	2012-03-13 18:43:12 UTC (rev 536)
+++ trunk/src/netlib.c	2012-03-19 20:21:54 UTC (rev 537)
@@ -3019,7 +3019,7 @@
 
 void
 dump_addrinfo(FILE *dumploc, struct addrinfo *info,
-              char *host, char *port, int family)
+              const char *host, char *port, int family)
 {
   struct sockaddr *ai_addr;
   struct addrinfo *temp;
@@ -4017,6 +4017,7 @@
 HIST
 HIST_new_n(int max_outstanding) {
   HIST h;
+
   if((h = (HIST) malloc(sizeof(struct histogram_struct))) == NULL) {
     perror("HIST_new_n - histogram_struct malloc failed");
     exit(1);
@@ -4081,6 +4082,7 @@
 
 void
 HIST_purge(HIST h) {
+  printf("%s\n",__FUNCTION__);
   h->count = 0;
   h->producer = 0;
   h->consumer = 0;

Modified: trunk/src/nettest_unix.c
===================================================================
--- trunk/src/nettest_unix.c	2012-03-13 18:43:12 UTC (rev 536)
+++ trunk/src/nettest_unix.c	2012-03-19 20:21:54 UTC (rev 537)
@@ -1280,8 +1280,7 @@
 		 req_size,
 		 0)) != req_size) {
       if (errno == EINTR) {
-	/* we hit the end of a
-	/* timed test. */
+	/* we hit the end of a timed test. */
 	timed_out = 1;
 	break;
       }