[Spread-cvs] cvs commit: spread/daemon Changelog monitor.c

jonathan at spread.org jonathan at spread.org
Tue Jul 12 09:50:34 EDT 2011


jonathan    04/10/29 13:35:57

  Modified:    daemon   Tag: branch_3_17 Changelog monitor.c
  Log:
  Move WSAStartup() call earlier in monitor.c main() so it is before Conf_init().
  Reported by David Avraamides.
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.4.2.2   +5 -0      spread/daemon/Changelog
  
  Index: Changelog
  ===================================================================
  RCS file: /storage/cvsroot/spread/daemon/Changelog,v
  retrieving revision 1.4.2.1
  retrieving revision 1.4.2.2
  diff -u -r1.4.2.1 -r1.4.2.2
  --- Changelog	29 Oct 2004 14:56:28 -0000	1.4.2.1
  +++ Changelog	29 Oct 2004 17:35:56 -0000	1.4.2.2
  @@ -1,3 +1,8 @@
  +Fri Oct 29 13:24:53 2004  Jonathan Stanton  <jonathan at cnds.jhu.edu>
  +
  +	* monitor.c (main): Move WSAStartup before Conf_init. Reported
  +	by David Avraamides.
  +
   Fri Oct 29 10:53:03 2004  Jonathan Stanton  <jonathan at cnds.jhu.edu>
   
   	* groups.c: Move assignment of this_group out of assert() call.
  
  
  
  1.17.2.1  +7 -6      spread/daemon/monitor.c
  
  Index: monitor.c
  ===================================================================
  RCS file: /storage/cvsroot/spread/daemon/monitor.c,v
  retrieving revision 1.17
  retrieving revision 1.17.2.1
  diff -u -r1.17 -r1.17.2.1
  --- monitor.c	14 Oct 2004 17:35:23 -0000	1.17
  +++ monitor.c	29 Oct 2004 17:35:56 -0000	1.17.2.1
  @@ -198,18 +198,19 @@
   	Usage( argc, argv );
           
           Alarm_set_interactive();
  -	Conf_init( Config_file, My_name );
  -	Cn = Conf();
  -        My = Conf_my();
  -
  -        Alarm_clear_types(ALL);
  -        Alarm_set_types(PRINT | EXIT );
   
   #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 */
  +
  +	Conf_init( Config_file, My_name );
  +	Cn = Conf();
  +        My = Conf_my();
  +
  +        Alarm_clear_types(ALL);
  +        Alarm_set_types(PRINT | EXIT );
   
           initialize_locks();
   
  
  
  




More information about the Spread-cvs mailing list