diff options
| author | Michael Meskes <meskes@postgresql.org> | 2010-04-01 10:30:53 +0000 |
|---|---|---|
| committer | Michael Meskes <meskes@postgresql.org> | 2010-04-01 10:30:53 +0000 |
| commit | 1fbb06d2042d999d5cb188b814fb2e3bd82da96b (patch) | |
| tree | ce5917f010f70488ed318bc5ae395020ba016ba5 /src/interfaces/ecpg/preproc/variable.c | |
| parent | b2bddc2ff22f0c3d54671e43c67a2563deed7908 (diff) | |
| download | postgresql-1fbb06d2042d999d5cb188b814fb2e3bd82da96b.tar.gz postgresql-1fbb06d2042d999d5cb188b814fb2e3bd82da96b.zip | |
Zoltan beautified his hidden-variable-patch for ecpg. This also makes sure we get an error message instead of a warning if the variable have different types.
Diffstat (limited to 'src/interfaces/ecpg/preproc/variable.c')
| -rw-r--r-- | src/interfaces/ecpg/preproc/variable.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/src/interfaces/ecpg/preproc/variable.c b/src/interfaces/ecpg/preproc/variable.c index d77c239806c..dbde1141ab9 100644 --- a/src/interfaces/ecpg/preproc/variable.c +++ b/src/interfaces/ecpg/preproc/variable.c @@ -1,4 +1,4 @@ -/* $PostgreSQL: pgsql/src/interfaces/ecpg/preproc/variable.c,v 1.55 2010/04/01 08:41:01 meskes Exp $ */ +/* $PostgreSQL: pgsql/src/interfaces/ecpg/preproc/variable.c,v 1.56 2010/04/01 10:30:53 meskes Exp $ */ #include "postgres_fe.h" @@ -22,7 +22,7 @@ new_variable(const char *name, struct ECPGtype * type, int brace_level) } static struct variable * -find_struct_member(const char *name, char *str, struct ECPGstruct_member * members, int brace_level) +find_struct_member(char *name, char *str, struct ECPGstruct_member * members, int brace_level) { char *next = strpbrk(++str, ".-["), *end, @@ -444,10 +444,9 @@ dump_variables(struct arguments * list, int mode) dump_variables(list->next, mode); /* Then the current element and its indicator */ - ECPGdump_a_type(yyout, list->variable->name, list->variable->type, - list->indicator->name, list->indicator->type, - NULL, NULL, make_str("0"), NULL, NULL, - list->variable->brace_level, list->indicator->brace_level); + ECPGdump_a_type(yyout, list->variable->name, list->variable->type, list->variable->brace_level, + list->indicator->name, list->indicator->type, list->indicator->brace_level, + NULL, NULL, make_str("0"), NULL, NULL); /* Then release the list element. */ if (mode != 0) |