[Firebird-checkins] CVS: firebird2/src/qli exe.cpp,1.39,1.40 expand.cpp,1.23,1.24

[Nickolay S. <sk...@us...>]

Build Version :  T2.0.0.6516 Firebird 2.0 UNSTABLE

(writeBuildNum.sh,v 1.6518 2004/02/21 09:24:16 skidder Exp  )

Update of /cvsroot/firebird/firebird2/src/qli
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6419

Modified Files:
	exe.cpp expand.cpp 
Log Message:
Fix build after Claudio cleanup

Index: exe.cpp
===================================================================
RCS file: /cvsroot/firebird/firebird2/src/qli/exe.cpp,v
retrieving revision 1.39
retrieving revision 1.40
diff -b -U3 -r1.39 -r1.40
--- exe.cpp	20 Feb 2004 06:43:16 -0000	1.39
+++ exe.cpp	21 Feb 2004 09:24:14 -0000	1.40
@@ -309,16 +309,16 @@
 #else
 	TEXT* argv[20];
 	TEXT** arg = argv;
-	p = filename;
-	while (*p) {
-		*arg++ = p;
-		while (*p && *p != ' ')
-			p++;
-		if (!*p)
+	TEXT* pp = filename;
+	while (*pp) {
+		*arg++ = pp;
+		while (*pp && *pp != ' ')
+			pp++;
+		if (!*pp)
 			break;
-		*p++ = 0;
-		while (*p == ' ')
-			p++;
+		*pp++ = 0;
+		while (*pp == ' ')
+			pp++;
 	}
 	*arg = NULL;
 

Index: expand.cpp
===================================================================
RCS file: /cvsroot/firebird/firebird2/src/qli/expand.cpp,v
retrieving revision 1.23
retrieving revision 1.24
diff -b -U3 -r1.23 -r1.24
--- expand.cpp	20 Feb 2004 06:43:16 -0000	1.23
+++ expand.cpp	21 Feb 2004 09:24:14 -0000	1.24
@@ -2939,7 +2939,8 @@
 	if (field_node->syn_count == 1)
 		resolved = MET_declare(0, variable, fld_name);
 	else if (field_node->syn_count == 2) {
-		for (qli_symbol* symbol = rel_name->nam_symbol; symbol;
+		qli_symbol *symbol;
+		for (symbol = rel_name->nam_symbol; symbol;
 			 symbol = symbol->sym_homonym)
 		{
 			if (symbol->sym_type == SYM_database) {