From: Michael Meskes <meskes@postgresql.org>
Date: Wed, 26 Nov 2008 13:19:34 +0000 (+0000)
Subject: When creating a varchar struct name braces must be discarded.
X-Git-Url: http://git.postgresql.org/gitweb/static/gitweb.js?a=commitdiff_plain;h=9123aa57aa9dca4e73a6c976107239ceef7f112e;p=users%2Fbernd%2Fpostgres.git

When creating a varchar struct name braces must be discarded.
---

diff --git a/src/interfaces/ecpg/preproc/type.c b/src/interfaces/ecpg/preproc/type.c
index ffa39f0975..cd43d16ac1 100644
--- a/src/interfaces/ecpg/preproc/type.c
+++ b/src/interfaces/ecpg/preproc/type.c
@@ -327,8 +327,9 @@ ECPGdump_a_simple(FILE *o, const char *name, enum ECPGttype type,
 		fprintf(o, "\n\tECPGt_descriptor, %s, 0L, 0L, 0L, ", name);
 	else
 	{
-		char	   *variable = (char *) mm_alloc(strlen(name) + ((prefix == NULL) ? 0 : strlen(prefix)) + 4);
-		char	   *offset = (char *) mm_alloc(strlen(name) + strlen("sizeof(struct varchar_)") + 1 + strlen(varcharsize) + sizeof(int) * CHAR_BIT * 10 / 3);
+		char *variable = (char *) mm_alloc(strlen(name) + ((prefix == NULL) ? 0 : strlen(prefix)) + 4);
+		char *offset = (char *) mm_alloc(strlen(name) + strlen("sizeof(struct varchar_)") + 1 + strlen(varcharsize) + sizeof(int) * CHAR_BIT * 10 / 3);
+		char *var_name; 
 
 		switch (type)
 		{
@@ -350,10 +351,14 @@ ECPGdump_a_simple(FILE *o, const char *name, enum ECPGttype type,
 				else
 					sprintf(variable, "&(%s%s)", prefix ? prefix : "", name);
 
+				/* remove trailing [] is name is array element */
+				var_name = strdup(name);
+				*(strchrnul(var_name, '[')) = '\0';
 				if (lineno)
-					sprintf(offset, "sizeof(struct varchar_%s_%d)", name, lineno);
+					sprintf(offset, "sizeof(struct varchar_%s_%d)", var_name, lineno);
 				else
-					sprintf(offset, "sizeof(struct varchar_%s)", name);
+					sprintf(offset, "sizeof(struct varchar_%s)", var_name);
+				free(var_name);
 				break;
 			case ECPGt_char:
 			case ECPGt_unsigned_char: