From 76924b5d94dce15cd3169a57f43b2468897f4329 Mon Sep 17 00:00:00 2001
From: Michael Meskes <meskes@postgresql.org>
Date: Mon, 16 Jun 2003 16:58:11 +0000
Subject: [PATCH] Fixed two small bugs.

---
 src/interfaces/ecpg/preproc/pgc.l     |  4 ++--
 src/interfaces/ecpg/preproc/preproc.y | 14 +++++++-------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/interfaces/ecpg/preproc/pgc.l b/src/interfaces/ecpg/preproc/pgc.l
index ce390f7461..fc3c944032 100644
--- a/src/interfaces/ecpg/preproc/pgc.l
+++ b/src/interfaces/ecpg/preproc/pgc.l
@@ -12,7 +12,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/interfaces/ecpg/preproc/pgc.l,v 1.114 2003/05/30 08:39:01 meskes Exp $
+ *	  $Header: /cvsroot/pgsql/src/interfaces/ecpg/preproc/pgc.l,v 1.115 2003/06/16 16:58:10 meskes Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -618,7 +618,7 @@ cppline			{space}*#(.*\\{space})+.*
 						char* endptr;
 
 						errno = 0;
-						yylval.ival = strtol((char *)yytext,&endptr,16);
+						yylval.ival = strtoul((char *)yytext,&endptr,16);
 						if (*endptr != '\0' || errno == ERANGE)
 						{
 							errno = 0;
diff --git a/src/interfaces/ecpg/preproc/preproc.y b/src/interfaces/ecpg/preproc/preproc.y
index fa622f314b..0bb4145903 100644
--- a/src/interfaces/ecpg/preproc/preproc.y
+++ b/src/interfaces/ecpg/preproc/preproc.y
@@ -1,4 +1,4 @@
-/* $Header: /cvsroot/pgsql/src/interfaces/ecpg/preproc/Attic/preproc.y,v 1.231 2003/06/13 10:50:57 meskes Exp $ */
+/* $Header: /cvsroot/pgsql/src/interfaces/ecpg/preproc/Attic/preproc.y,v 1.232 2003/06/16 16:58:11 meskes Exp $ */
 
 /* Copyright comment */
 %{
@@ -630,15 +630,15 @@ stmt:  AlterDatabaseSetStmt		{ output_statement($1, 0, connection); }
 		| ECPGDeallocate
 		{
 			if (connection)
-				mmerror(PARSE_ERROR, ET_ERROR, "no at option for connect statement.\n");
-
-			fputc('{', yyout);
-			fputs($1, yyout);
+				mmerror(PARSE_ERROR, ET_ERROR, "no at option for deallocate statement.\n");
+			fprintf(yyout, "{ ECPGdeallocate(__LINE__, \"%s\");", $1);
 			whenever_action(2);
 			free($1);
 		}
 		| ECPGDeallocateDescr
 		{
+			if (connection)
+				mmerror(PARSE_ERROR, ET_ERROR, "no at option for deallocate statement.\n");
 			fprintf(yyout,"ECPGdeallocate_desc(__LINE__, %s);",$1);
 			whenever_action(0);
 			free($1);
@@ -4294,9 +4294,9 @@ ECPGCursorStmt:  DECLARE name cursor_options CURSOR opt_hold FOR ident
  * prepared statement
  */
 ECPGDeallocate: DEALLOCATE PREPARE ident
-			{ $$ = cat_str(3, make_str("ECPGdeallocate(__LINE__, \""), $3, make_str("\");")); }
+			{ $$ = $3; }
 		| DEALLOCATE ident
-			{ $$ = cat_str(2, make_str("ECPGdeallocate(__LINE__, \""), $2, make_str("\");")); }
+			{ $$ = $2; }
 		;
 
 /*