[netperf-dev] netperf4 commit notice r132 - branches/glib_migration/src

[raj at netperf.org]

Author: raj
Date: 2006-04-05 16:07:48 -0700 (Wed, 05 Apr 2006)
New Revision: 132

Modified:
   branches/glib_migration/src/netperf.c
   branches/glib_migration/src/netserver.c
Log:
Add some (void *) casts to make the IBM compiler happy. We still segfault
when update_results_and_confidence is calling/about to call get_confidence
which is a call from a dynamically loaded module back to a routine in the
main program itself - I wonder if that is kosher under AIX?


Modified: branches/glib_migration/src/netperf.c
===================================================================
--- branches/glib_migration/src/netperf.c	2006-04-05 21:17:15 UTC (rev 131)
+++ branches/glib_migration/src/netperf.c	2006-04-05 23:07:48 UTC (rev 132)
@@ -255,12 +255,12 @@
 
 static GOptionEntry netperf_entries[] = 
   {
-    {"output",'o', 0, G_OPTION_ARG_CALLBACK, set_output_destination, "Specify where misc output should go", NULL},
-    {"input",'i',0, G_OPTION_ARG_CALLBACK, set_input_source, "Specify the command file", NULL},
-    {"config", 'c', 0, G_OPTION_ARG_CALLBACK, set_config_source, "Specify the configuration file", NULL},
-    {"debug", 'd', G_OPTION_FLAG_OPTIONAL_ARG, G_OPTION_ARG_CALLBACK, set_debug, "Set the level of debugging output", NULL},
-    {"version", 'V', G_OPTION_FLAG_NO_ARG, G_OPTION_ARG_CALLBACK, show_version, "Display the netserver version and exit", NULL},
-    {"verbose", 'v', G_OPTION_FLAG_OPTIONAL_ARG, G_OPTION_ARG_CALLBACK, set_verbose, "Set verbosity level for output", NULL},
+    {"output",'o', 0, G_OPTION_ARG_CALLBACK, (void *)set_output_destination, "Specify where misc output should go", NULL},
+    {"input",'i',0, G_OPTION_ARG_CALLBACK, (void *)set_input_source, "Specify the command file", NULL},
+    {"config", 'c', 0, G_OPTION_ARG_CALLBACK, (void *)set_config_source, "Specify the configuration file", NULL},
+    {"debug", 'd', G_OPTION_FLAG_OPTIONAL_ARG, G_OPTION_ARG_CALLBACK, (void *)set_debug, "Set the level of debugging output", NULL},
+    {"version", 'V', G_OPTION_FLAG_NO_ARG, G_OPTION_ARG_CALLBACK, (void *)show_version, "Display the netserver version and exit", NULL},
+    {"verbose", 'v', G_OPTION_FLAG_OPTIONAL_ARG, G_OPTION_ARG_CALLBACK, (void *)set_verbose, "Set verbosity level for output", NULL},
     {"brief", 'b', 0, G_OPTION_ARG_NONE, &want_brief, "Request brief output", NULL},
     {"quiet", 'q', 0, G_OPTION_ARG_NONE, &want_quiet, "Display no test banners", NULL},
     { NULL }

Modified: branches/glib_migration/src/netserver.c
===================================================================
--- branches/glib_migration/src/netserver.c	2006-04-05 21:17:15 UTC (rev 131)
+++ branches/glib_migration/src/netserver.c	2006-04-05 23:07:48 UTC (rev 132)
@@ -942,13 +942,13 @@
     {"spawn", 0, 0, G_OPTION_ARG_NONE, &spawn_on_accept, "Spawn a new process for each control connection (default)", NULL},
     {"nospawn", 0, G_OPTION_FLAG_REVERSE, G_OPTION_ARG_NONE, &spawn_on_accept, "Do not spawn a new process for each control connection", NULL},
     {"control", 0, G_OPTION_FLAG_HIDDEN, G_OPTION_ARG_INT, &control_socket, "The FD that should be used for the control channel (internal)", NULL},
-    {"closesocket", 0, G_OPTION_FLAG_HIDDEN, G_OPTION_ARG_CALLBACK, do_closesocket,"Close the specified socket", NULL},
-    {"local", 'L', 0, G_OPTION_ARG_CALLBACK, set_local_address, "Specify the local addressing for the control endpoint", NULL},
-    {"output", 'o', 0, G_OPTION_ARG_CALLBACK, set_output_destination, "Specify where misc. output should go", NULL},
-    {"port", 'p', 0, G_OPTION_ARG_CALLBACK, set_port_number, "Specify the port number for the control connection", NULL},
-    {"debug", 'd', G_OPTION_FLAG_OPTIONAL_ARG, G_OPTION_ARG_CALLBACK, set_debug, "Set the level of debugging",NULL},
-    {"version", 'V', G_OPTION_FLAG_NO_ARG, G_OPTION_ARG_CALLBACK, show_version, "Display the netserver version and exit", NULL},
-    {"verbose", 'v', G_OPTION_FLAG_OPTIONAL_ARG, G_OPTION_ARG_CALLBACK, set_verbose, "Set verbosity level for output", NULL},
+    {"closesocket", 0, G_OPTION_FLAG_HIDDEN, G_OPTION_ARG_CALLBACK, (void *)do_closesocket,"Close the specified socket", NULL},
+    {"local", 'L', 0, G_OPTION_ARG_CALLBACK, (void *)set_local_address, "Specify the local addressing for the control endpoint", NULL},
+    {"output", 'o', 0, G_OPTION_ARG_CALLBACK, (void *)set_output_destination, "Specify where misc. output should go", NULL},
+    {"port", 'p', 0, G_OPTION_ARG_CALLBACK, (void *)set_port_number, "Specify the port number for the control connection", NULL},
+    {"debug", 'd', G_OPTION_FLAG_OPTIONAL_ARG, G_OPTION_ARG_CALLBACK, (void *)set_debug, "Set the level of debugging",NULL},
+    {"version", 'V', G_OPTION_FLAG_NO_ARG, G_OPTION_ARG_CALLBACK, (void *)show_version, "Display the netserver version and exit", NULL},
+    {"verbose", 'v', G_OPTION_FLAG_OPTIONAL_ARG, G_OPTION_ARG_CALLBACK, (void *)set_verbose, "Set verbosity level for output", NULL},
     {"brief", 'b', 0, G_OPTION_ARG_NONE, &want_brief, "Request brief output", NULL},
     {"quiet", 'q', 0, G_OPTION_ARG_NONE, &want_quiet, "Display no test banners", NULL},
     { NULL }