diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/interfaces/ecpg/ChangeLog | 7 | ||||
| -rw-r--r-- | src/interfaces/ecpg/lib/data.c | 6 | ||||
| -rw-r--r-- | src/interfaces/ecpg/preproc/Makefile.in | 2 | ||||
| -rw-r--r-- | src/interfaces/ecpg/preproc/type.c | 6 |
4 files changed, 17 insertions, 4 deletions
diff --git a/src/interfaces/ecpg/ChangeLog b/src/interfaces/ecpg/ChangeLog index e757adc2268..29a59fa3207 100644 --- a/src/interfaces/ecpg/ChangeLog +++ b/src/interfaces/ecpg/ChangeLog @@ -913,3 +913,10 @@ Sat Apr 8 13:10:12 CEST 2000 - Synced keyword.c. - Set library version to 3.1.0. - Set ecpg version to 2.7.0. + +Mon May 15 10:51:31 CEST 2000 + + - Added patch by SAKAIDA Masaaki <sakaida@psn.co.jp> to fix segfault. + - Set ecpg version to 2.7.1. + + diff --git a/src/interfaces/ecpg/lib/data.c b/src/interfaces/ecpg/lib/data.c index 1b97478e20d..29675a89728 100644 --- a/src/interfaces/ecpg/lib/data.c +++ b/src/interfaces/ecpg/lib/data.c @@ -16,13 +16,13 @@ get_data(PGresult *results, int act_tuple, int act_field, int lineno, ECPGlog("get_data line %d: RESULT: %s\n", lineno, pval ? pval : ""); - /* Now the pval is a pointer to the value. */ - /* let's check is it really is an array if it should be */ + /* pval is a pointer to the value */ + /* let's check is it really is an array if it should be one */ if (isarray) { if (*pval != '{') { - ECPGlog("get_data data entry does not look like an array in line %d\n", lineno); + ECPGlog("get_data: data entry does not look like an array in line %d\n", lineno); ECPGraise(lineno, ECPG_DATA_NOT_ARRAY, NULL); return (false); } diff --git a/src/interfaces/ecpg/preproc/Makefile.in b/src/interfaces/ecpg/preproc/Makefile.in index 7317d0cb553..cfa3dae4157 100644 --- a/src/interfaces/ecpg/preproc/Makefile.in +++ b/src/interfaces/ecpg/preproc/Makefile.in @@ -3,7 +3,7 @@ include $(SRCDIR)/Makefile.global MAJOR_VERSION=2 MINOR_VERSION=7 -PATCHLEVEL=0 +PATCHLEVEL=1 CFLAGS+=-I../include -DMAJOR_VERSION=$(MAJOR_VERSION) \ -DMINOR_VERSION=$(MINOR_VERSION) -DPATCHLEVEL=$(PATCHLEVEL) \ diff --git a/src/interfaces/ecpg/preproc/type.c b/src/interfaces/ecpg/preproc/type.c index 8d292e11098..77e4b840266 100644 --- a/src/interfaces/ecpg/preproc/type.c +++ b/src/interfaces/ecpg/preproc/type.c @@ -198,6 +198,12 @@ static void ECPGdump_a_struct(FILE *o, const char *name, const char *ind_name, l void ECPGdump_a_type(FILE *o, const char *name, struct ECPGtype * typ, const char *ind_name, struct ECPGtype * ind_typ, const char *prefix, const char *ind_prefix) { + if (ind_typ == NULL) + { + ind_typ = &ecpg_no_indicator; + ind_name = "no_indicator"; + } + switch (typ->typ) { case ECPGt_array: |