Log Message:
-----------
Move variable declications to the top of the block as per C spec

Modified Files:
--------------
    slony1-engine/src/parsestatements:
        scanner.c (r1.1 -> r1.2)
        test-scanner.c (r1.2 -> r1.3)
    slony1-engine/src/slon:
        remote_worker.c (r1.115 -> r1.116)
    slony1-engine/src/slonik:
        slonik.c (r1.64 -> r1.65)

-------------- next part --------------
Index: scanner.c
===================================================================
RCS file: /usr/local/cvsroot/slony1/slony1-engine/src/parsestatements/scanner.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -Lsrc/parsestatements/scanner.c -Lsrc/parsestatements/scanner.c -u -w -r1.1 -r1.2
--- src/parsestatements/scanner.c
+++ src/parsestatements/scanner.c
@@ -75,7 +75,7 @@
 	  state = Q_DOLLAR_QUOTING;   /* Return to dollar quoting mode */
 	  break;
 	}
-	int d1stemp = d1start;
+	d1stemp = d1start;
 	while (d1stemp < d1end) {
 	  if (extended_statement[d1stemp] != extended_statement[d2start]) {
 	    /* mismatch - these aren't the droids... */
Index: test-scanner.c
===================================================================
RCS file: /usr/local/cvsroot/slony1/slony1-engine/src/parsestatements/test-scanner.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -Lsrc/parsestatements/test-scanner.c -Lsrc/parsestatements/test-scanner.c -u -w -r1.2 -r1.3
--- src/parsestatements/test-scanner.c
+++ src/parsestatements/test-scanner.c
@@ -7,13 +7,15 @@
 extern int statements;
 
 int main (int argc, char *const argv[]) {
+
+  int i, j, START;
   int nstatements = 0;
+
   fread(foo, sizeof(char), 65536, stdin);
   printf("Input: %s\n", foo);
   
   nstatements = scan_for_statements (foo);
   
-  int i, j, START;
   START = 0;
   for (i = 0; i < nstatements; i++) {
     printf("\nstatement %d\n-------------------------------------------\n", i);
Index: remote_worker.c
===================================================================
RCS file: /usr/local/cvsroot/slony1/slony1-engine/src/slon/remote_worker.c,v
retrieving revision 1.115
retrieving revision 1.116
diff -Lsrc/slon/remote_worker.c -Lsrc/slon/remote_worker.c -u -w -r1.115 -r1.116
--- src/slon/remote_worker.c
+++ src/slon/remote_worker.c
@@ -1461,6 +1461,8 @@
 				int			ddl_setid = (int)strtol(event->ev_data1, NULL, 10);
 				char	   *ddl_script = event->ev_data2;
 				int			ddl_only_on_node = (int)strtol(event->ev_data3, NULL, 10);
+				int num_statements = -1, stmtno, startpos;
+
 				PGresult *res;
 				ExecStatusType rstat;
 
@@ -1476,7 +1478,6 @@
 						slon_retry();
 				}
 
-				int num_statements = -1, stmtno, startpos;
 				num_statements = scan_for_statements (ddl_script);
 				slon_log(SLON_CONFIG, "remoteWorkerThread_%d: DDL request with %d statements\n",
 					 node->no_id, num_statements);
Index: slonik.c
===================================================================
RCS file: /usr/local/cvsroot/slony1/slony1-engine/src/slonik/slonik.c,v
retrieving revision 1.64
retrieving revision 1.65
diff -Lsrc/slonik/slonik.c -Lsrc/slonik/slonik.c -u -w -r1.64 -r1.65
--- src/slonik/slonik.c
+++ src/slonik/slonik.c
@@ -3813,6 +3813,7 @@
 	SlonDString query;
 	SlonDString script;
 	int			rc;
+	int num_statements = -1, stmtno, startpos;
 	char		buf[4096];
 	char		rex1[256];
 	char		rex2[256];
@@ -3821,6 +3822,12 @@
 	PGresult *res;
 	ExecStatusType rstat;
 
+#define PARMCOUNT 1  
+
+        const char *params[PARMCOUNT];
+        int paramlens[PARMCOUNT];
+        int paramfmts[PARMCOUNT];
+
 	adminfo1 = get_active_adminfo((SlonikStmt *) stmt, stmt->ev_origin);
 	if (adminfo1 == NULL)
 		return -1;
@@ -3859,7 +3866,6 @@
 
 	/* Split the script into a series of SQL statements - each needs to
 	   be submitted separately */
-	int num_statements = -1, stmtno, startpos;
 	num_statements = scan_for_statements (dstring_data(&script));
 	printf("DDL script consisting of %d SQL statements\n", num_statements);
 
@@ -3909,12 +3915,6 @@
 		     stmt->ddl_setid,  
 		     stmt->only_on_node);
 
-#define PARMCOUNT 1
-
-	const char *params[PARMCOUNT];
-	int paramlens[PARMCOUNT];
-	int paramfmts[PARMCOUNT];
-
 	paramlens[PARMCOUNT-1] = 0;
 	paramfmts[PARMCOUNT-1] = 0;
 	params[PARMCOUNT-1] = dstring_data(&script);