[Spread-cvs] commit: r352 - trunk/daemon

[jgreen at spread.org]

Author: jgreen
Date: 2006-05-24 11:56:35 -0400 (Wed, 24 May 2006)
New Revision: 352

Modified:
   trunk/daemon/monitor.c
Log:
WSAStartup was not being called early enough.  Reported on the mailing 
list by Danish Ahmed on May 17, 2006.


Modified: trunk/daemon/monitor.c
===================================================================
--- trunk/daemon/monitor.c	2006-05-05 16:36:16 UTC (rev 351)
+++ trunk/daemon/monitor.c	2006-05-24 15:56:35 UTC (rev 352)
@@ -1,4 +1,4 @@
-/*
+ /*
  * The Spread Toolkit.
  *     
  * The contents of this file are subject to the Spread Open-Source
@@ -202,17 +202,17 @@
 		(int)SP_MAJOR_VERSION, (int)SP_MINOR_VERSION, (int)SP_PATCH_VERSION);
 	Alarmp( SPLOG_PRINT, SYSTEM, "\\===========================================================================/\n");
 
-	Usage( argc, argv );
-        
-        Alarm_set_interactive();
-        read_configuration();
-
 #ifdef ARCH_PC_WIN95
         ret = WSAStartup( MAKEWORD(2,0), &WSAData );
         if( ret != 0 )
             Alarm( EXIT, "sptmonitor: main: winsock initialization error %d\n", ret );
 #endif	/* ARCH_PC_WIN95 */
 
+	Usage( argc, argv );
+        
+        Alarm_set_interactive();
+        read_configuration();
+
         initialize_locks();
 
 	for( i=0; i < Conf_num_procs( &Cn ); i++ )