diff options
| author | Michael Meskes <meskes@postgresql.org> | 2003-07-09 14:53:18 +0000 |
|---|---|---|
| committer | Michael Meskes <meskes@postgresql.org> | 2003-07-09 14:53:18 +0000 |
| commit | 18936ef3725c1517aa062dad3b54f993efd60348 (patch) | |
| tree | 1ed042986a32196f1bf15f48a20c6ddb61f5b793 /src | |
| parent | abfa8ae54f41acc173faf6cd0ac1ade88bca2df0 (diff) | |
| download | postgresql-18936ef3725c1517aa062dad3b54f993efd60348.tar.gz postgresql-18936ef3725c1517aa062dad3b54f993efd60348.zip | |
Argh! Missed one file.
Diffstat (limited to 'src')
| -rw-r--r-- | src/interfaces/ecpg/preproc/preproc.y | 27 |
1 files changed, 24 insertions, 3 deletions
diff --git a/src/interfaces/ecpg/preproc/preproc.y b/src/interfaces/ecpg/preproc/preproc.y index ad9bfba17c9..1e700d81504 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.245 2003/07/08 12:11:32 meskes Exp $ */ +/* $Header: /cvsroot/pgsql/src/interfaces/ecpg/preproc/Attic/preproc.y,v 1.246 2003/07/09 14:53:18 meskes Exp $ */ /* Copyright comment */ %{ @@ -202,7 +202,7 @@ adjust_informix(struct arguments *list) for (ptr = list; ptr != NULL; ptr = ptr->next) { - char temp[sizeof(int)+sizeof(", &()")]; + char temp[20]; /* this should be sufficient unless you have 8 byte integers */ char *original_var; /* change variable name to "ECPG_informix_get_var(<counter>)" */ @@ -221,6 +221,27 @@ adjust_informix(struct arguments *list) sprintf(temp, "%d, &(", ecpg_informix_var++); } result = cat_str(5, result, make_str("ECPG_informix_set_var("), mm_strdup(temp), mm_strdup(original_var), make_str("), __LINE__);\n")); + + /* now the indicator if there is one */ + if (ptr->indicator->type->type != ECPGt_NO_INDICATOR) + { + /* change variable name to "ECPG_informix_get_var(<counter>)" */ + original_var = ptr->indicator->name; + sprintf(temp, "%d))", ecpg_informix_var); + + /* create call to "ECPG_informix_set_var(<counter>, <pointer>. <linen number>)" */ + if (atoi(ptr->indicator->type->size) > 1) + { + ptr->indicator = new_variable(cat_str(4, make_str("("), mm_strdup(ECPGtype_name(ptr->indicator->type->type)), make_str(" *)(ECPG_informix_get_var("), mm_strdup(temp)), ECPGmake_simple_type(ptr->indicator->type->type, ptr->indicator->type->size), 0); + sprintf(temp, "%d, (", ecpg_informix_var++); + } + else + { + ptr->indicator = new_variable(cat_str(4, make_str("*("), mm_strdup(ECPGtype_name(ptr->indicator->type->type)), make_str(" *)(ECPG_informix_get_var("), mm_strdup(temp)), ECPGmake_simple_type(ptr->indicator->type->type, ptr->indicator->type->size), 0); + sprintf(temp, "%d, &(", ecpg_informix_var++); + } + result = cat_str(5, result, make_str("ECPG_informix_set_var("), mm_strdup(temp), mm_strdup(original_var), make_str("), __LINE__);\n")); + } } return result; @@ -6097,7 +6118,7 @@ c_args: /*EMPTY*/ { $$ = EMPTY; } coutputvariable: CVARIABLE indicator { add_variable(&argsresult, find_variable($1), find_variable($2)); } | CVARIABLE - { add_variable(&argsresult, find_variable($1), &no_indicator); } + { add_variable(&argsresult, find_variable($1), &no_indicator); } ; |