Log Message:
-----------
Re-apply Rev 1.81 "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.82 -> r1.83)

-------------- next part --------------
Index: remote_worker.c
===================================================================
RCS file: /usr/local/cvsroot/slony1/slony1-engine/src/slon/remote_worker.c,v
retrieving revision 1.82
retrieving revision 1.83
diff -Lsrc/slon/remote_worker.c -Lsrc/slon/remote_worker.c -u -w -r1.82 -r1.83
--- src/slon/remote_worker.c
+++ src/slon/remote_worker.c
@@ -888,16 +888,20 @@
 			}
 			else if (strcmp(event->ev_type, "ACCEPT_SET") == 0)
 			{
+				int 		set_id, old_origin, 
+						new_origin, event_no;
+				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);
-				int event_no = event->ev_seqno;
+				event_no = event->ev_seqno;
 				slon_log(SLON_DEBUG2, "ACCEPT: move set seq=%d\n", event_no);
-				PGresult   *res;
+
 				slon_log(SLON_DEBUG2, "got parms ACCEPT_SET\n");
 				
 			    /* If we're a remote node, and haven't yet