commit: r403 - trunk/daemon

Author: jonathan
Date: 2008-10-24 02:41:20 -0400 (Fri, 24 Oct 2008)
New Revision: 403

Modified:
   trunk/daemon/Changelog
   trunk/daemon/prot_body.h
   trunk/daemon/protocol.c
Log:
Fix prototype of Prot_initiate_conf_reload function to avoid compiler warning.


Modified: trunk/daemon/Changelog
===================================================================
--- trunk/daemon/Changelog	2008-10-13 21:00:53 UTC (rev 402)
+++ trunk/daemon/Changelog	2008-10-24 06:41:20 UTC (rev 403)
@@ -1,3 +1,8 @@
+Fri Oct 24 02:40:03 2008  Jonathan Stanton  <[email protected]>
+
+	* protocol.c (Prot_initiate_conf_reload): Fix prototype of function
+	to avoid compiler warning. Patch by Alexey Zakhlestin. 
+
 Mon Oct 13 16:22:28 2008  Jonathan Stanton  <[email protected]>
 
 	* protocol.c (Prot_initiate_conf_reload, Prot_need_conf_reload): 

Modified: trunk/daemon/prot_body.h
===================================================================
--- trunk/daemon/prot_body.h	2008-10-13 21:00:53 UTC (rev 402)
+++ trunk/daemon/prot_body.h	2008-10-24 06:41:20 UTC (rev 403)
@@ -99,7 +99,7 @@
 
 void	Prot_token_hurry();
 void	Discard_packets();
-void    Prot_initiate_conf_reload( void );
+void    Prot_initiate_conf_reload( int code, void *data );
 bool    Prot_need_conf_reload( void );
 void    Prot_clear_need_conf_reload( void );
 

Modified: trunk/daemon/protocol.c
===================================================================
--- trunk/daemon/protocol.c	2008-10-13 21:00:53 UTC (rev 402)
+++ trunk/daemon/protocol.c	2008-10-24 06:41:20 UTC (rev 403)
@@ -721,7 +721,7 @@
 static  void    Prot_handle_conf_reload(sys_scatter *scat)
 {
     if ( Memb_state() == OP ) {
-        Prot_initiate_conf_reload();
+        Prot_initiate_conf_reload(0, NULL);
     } else {
         Prot_Need_Conf_Reload = TRUE;
     }
@@ -733,7 +733,7 @@
  * 3) else, then set Conf_reload_state, create singleton partition, and schedule token_loss.
  * 4) When membership completes in Discard_packets() cleanup partition and probe for new members.
  */
-void    Prot_initiate_conf_reload( void )
+void    Prot_initiate_conf_reload( int code, void *data )
 {
         bool    need_memb_partition;
         int16   singleton_partition[MAX_PROCS_RING];