CVS User Account cvsuser
Thu May 5 17:03:20 PDT 2005
Log Message:
-----------
You can't declare vars on the fly in C in that manner.  So instead we pre-declare them.

Modified Files:
--------------
    slony1-engine/src/slon:
        remote_worker.c (r1.80 -> r1.81)

-------------- next part --------------
Index: remote_worker.c
===================================================================
RCS file: /usr/local/cvsroot/slony1/slony1-engine/src/slon/remote_worker.c,v
retrieving revision 1.80
retrieving revision 1.81
diff -Lsrc/slon/remote_worker.c -Lsrc/slon/remote_worker.c -u -w -r1.80 -r1.81
--- src/slon/remote_worker.c
+++ src/slon/remote_worker.c
@@ -888,14 +888,19 @@
 			}
 			else if (strcmp(event->ev_type, "ACCEPT_SET") == 0)
 			{
+				int	  set_id, old_origin, new_origin;
+				PGresult  *res;
+
 			    slon_log(SLON_DEBUG2, "start processing ACCEPT_SET\n");
-    			    int set_id = (int) strtol(event->ev_data1, NULL, 10);
+    				set_id = (int) strtol(event->ev_data1, NULL, 10);
+
 			    slon_log(SLON_DEBUG2, "ACCEPT: set=%d\n", set_id);
-			    int old_origin = (int) strtol(event->ev_data2, NULL, 10);
+			    	old_origin = (int) strtol(event->ev_data2, NULL, 10);
+
 			    slon_log(SLON_DEBUG2, "ACCEPT: old origin=%d\n", old_origin);
-			    int new_origin = (int) strtol(event->ev_data3, NULL, 10);
+			    	new_origin = (int) strtol(event->ev_data3, NULL, 10);
+
 			    slon_log(SLON_DEBUG2, "ACCEPT: new origin=%d\n", new_origin);
-			    PGresult   *res;
 			    slon_log(SLON_DEBUG2, "got parms ACCEPT_SET\n");
 				
 			    /* If we're a remote node, and haven't yet


More information about the Slony1-commit mailing list