From df974272ec81af7092370deea6d689565fe6f0c3 Mon Sep 17 00:00:00 2001 From: Michael Meskes Date: Fri, 19 Sep 2003 14:06:21 +0000 Subject: [PATCH] Removed superfluous return statement in get_data. --- src/interfaces/ecpg/compatlib/informix.c | 20 ++---- src/interfaces/ecpg/ecpglib/data.c | 75 +++++++++++---------- src/interfaces/ecpg/include/datetime.h | 9 +-- src/interfaces/ecpg/include/decimal.h | 4 +- src/interfaces/ecpg/include/ecpg_informix.h | 7 +- src/interfaces/ecpg/include/pgtypes_date.h | 2 +- src/interfaces/ecpg/preproc/preproc.y | 5 +- 7 files changed, 55 insertions(+), 67 deletions(-) diff --git a/src/interfaces/ecpg/compatlib/informix.c b/src/interfaces/ecpg/compatlib/informix.c index 9c4f41bde3..739b83a895 100644 --- a/src/interfaces/ecpg/compatlib/informix.c +++ b/src/interfaces/ecpg/compatlib/informix.c @@ -161,11 +161,9 @@ deccvasc(char *cp, int len, decimal * np) int ret = 0; numeric *result; + rsetnull(CDECIMALTYPE, (char *) np); if (risnull(CSTRINGTYPE, cp)) - { - rsetnull(CDECIMALTYPE, (char *) np); return 0; - } if (!str) ret = -1201; @@ -206,11 +204,9 @@ deccvdbl(double dbl, decimal * np) numeric *nres = PGTYPESnumeric_new(); int result = 1; + rsetnull(CDECIMALTYPE, (char *) np); if (risnull(CDOUBLETYPE, (char *) &dbl)) - { - rsetnull(CDECIMALTYPE, (char *) np); return 0; - } if (nres == NULL) return -1211; @@ -229,11 +225,9 @@ deccvint(int in, decimal * np) numeric *nres = PGTYPESnumeric_new(); int result = 1; + rsetnull(CDECIMALTYPE, (char *) np); if (risnull(CINTTYPE, (char *) &in)) - { - rsetnull(CDECIMALTYPE, (char *) np); return 0; - } if (nres == NULL) return -1211; @@ -252,11 +246,9 @@ deccvlong(long lng, decimal * np) numeric *nres = PGTYPESnumeric_new(); int result = 1; + rsetnull(CDECIMALTYPE, (char *) np); if (risnull(CLONGTYPE, (char *) &lng)) - { - rsetnull(CDECIMALTYPE, (char *) np); return 0; - } if (nres == NULL) return -1211; @@ -338,11 +330,9 @@ dectoasc(decimal * np, char *cp, int len, int right) if (nres == NULL) return -1211; + rsetnull(CSTRINGTYPE, (char *) cp); if (risnull(CDECIMALTYPE, (char *) np)) - { - rsetnull(CSTRINGTYPE, (char *) cp); return 0; - } if (PGTYPESnumeric_from_decimal(np, nres) != 0) return -1211; diff --git a/src/interfaces/ecpg/ecpglib/data.c b/src/interfaces/ecpg/ecpglib/data.c index dfe6e6e6e5..8be86b0bc2 100644 --- a/src/interfaces/ecpg/ecpglib/data.c +++ b/src/interfaces/ecpg/ecpglib/data.c @@ -1,4 +1,4 @@ -/* $Header: /cvsroot/pgsql/src/interfaces/ecpg/ecpglib/data.c,v 1.18 2003/09/18 13:12:23 meskes Exp $ */ +/* $Header: /cvsroot/pgsql/src/interfaces/ecpg/ecpglib/data.c,v 1.19 2003/09/19 14:06:21 meskes Exp $ */ #define POSTGRES_ECPG_INTERNAL #include "postgres_fe.h" @@ -397,7 +397,6 @@ ECPGget_data(const PGresult *results, int act_tuple, int act_field, int lineno, { /* Informix wants its own NULL value here instead of an error */ ECPGset_informix_null(ECPGt_numeric, &nres); - return (true); } else { @@ -405,14 +404,17 @@ ECPGget_data(const PGresult *results, int act_tuple, int act_field, int lineno, return (false); } } - if (isarray && *scan_length == '"') - scan_length++; - - if ((isarray && *scan_length != ',' && *scan_length != '}') - || (!isarray && *scan_length != '\0' && *scan_length != ' ')) /* Garbage left */ + else { - ECPGraise(lineno, ECPG_NUMERIC_FORMAT, ECPG_SQLSTATE_DATATYPE_MISMATCH, pval); - return (false); + if (isarray && *scan_length == '"') + scan_length++; + + if ((isarray && *scan_length != ',' && *scan_length != '}') + || (!isarray && *scan_length != '\0' && *scan_length != ' ')) /* Garbage left */ + { + ECPGraise(lineno, ECPG_NUMERIC_FORMAT, ECPG_SQLSTATE_DATATYPE_MISMATCH, pval); + return (false); + } } } else @@ -439,7 +441,6 @@ ECPGget_data(const PGresult *results, int act_tuple, int act_field, int lineno, { /* Informix wants its own NULL value here instead of an error */ ECPGset_informix_null(ECPGt_interval, &ires); - return (true); } else { @@ -447,14 +448,17 @@ ECPGget_data(const PGresult *results, int act_tuple, int act_field, int lineno, return (false); } } - if (isarray && *scan_length == '"') - scan_length++; - - if ((isarray && *scan_length != ',' && *scan_length != '}') - || (!isarray && *scan_length != '\0' && *scan_length != ' ')) /* Garbage left */ + else { - ECPGraise(lineno, ECPG_INTERVAL_FORMAT, ECPG_SQLSTATE_DATATYPE_MISMATCH, pval); - return (false); + if (isarray && *scan_length == '"') + scan_length++; + + if ((isarray && *scan_length != ',' && *scan_length != '}') + || (!isarray && *scan_length != '\0' && *scan_length != ' ')) /* Garbage left */ + { + ECPGraise(lineno, ECPG_INTERVAL_FORMAT, ECPG_SQLSTATE_DATATYPE_MISMATCH, pval); + return (false); + } } } else @@ -477,7 +481,6 @@ ECPGget_data(const PGresult *results, int act_tuple, int act_field, int lineno, { /* Informix wants its own NULL value here instead of an error */ ECPGset_informix_null(ECPGt_date, &ddres); - return (true); } else { @@ -485,15 +488,17 @@ ECPGget_data(const PGresult *results, int act_tuple, int act_field, int lineno, return (false); } } - - if (isarray && *scan_length == '"') - scan_length++; - - if ((isarray && *scan_length != ',' && *scan_length != '}') - || (!isarray && *scan_length != '\0' && *scan_length != ' ')) /* Garbage left */ + else { - ECPGraise(lineno, ECPG_DATE_FORMAT, ECPG_SQLSTATE_DATATYPE_MISMATCH, pval); - return (false); + if (isarray && *scan_length == '"') + scan_length++; + + if ((isarray && *scan_length != ',' && *scan_length != '}') + || (!isarray && *scan_length != '\0' && *scan_length != ' ')) /* Garbage left */ + { + ECPGraise(lineno, ECPG_DATE_FORMAT, ECPG_SQLSTATE_DATATYPE_MISMATCH, pval); + return (false); + } } *((date *) (var + offset * act_tuple)) = ddres; @@ -515,7 +520,6 @@ ECPGget_data(const PGresult *results, int act_tuple, int act_field, int lineno, { /* Informix wants its own NULL value here instead of an error */ ECPGset_informix_null(ECPGt_timestamp, &tres); - return (true); } else { @@ -523,14 +527,17 @@ ECPGget_data(const PGresult *results, int act_tuple, int act_field, int lineno, return (false); } } - if (isarray && *scan_length == '"') - scan_length++; - - if ((isarray && *scan_length != ',' && *scan_length != '}') - || (!isarray && *scan_length != '\0' && *scan_length != ' ')) /* Garbage left */ + else { - ECPGraise(lineno, ECPG_TIMESTAMP_FORMAT, ECPG_SQLSTATE_DATATYPE_MISMATCH, pval); - return (false); + if (isarray && *scan_length == '"') + scan_length++; + + if ((isarray && *scan_length != ',' && *scan_length != '}') + || (!isarray && *scan_length != '\0' && *scan_length != ' ')) /* Garbage left */ + { + ECPGraise(lineno, ECPG_TIMESTAMP_FORMAT, ECPG_SQLSTATE_DATATYPE_MISMATCH, pval); + return (false); + } } *((timestamp *) (var + offset * act_tuple)) = tres; diff --git a/src/interfaces/ecpg/include/datetime.h b/src/interfaces/ecpg/include/datetime.h index db765cac23..4e0773efad 100644 --- a/src/interfaces/ecpg/include/datetime.h +++ b/src/interfaces/ecpg/include/datetime.h @@ -1,13 +1,8 @@ #include #include -#ifndef dtime_t -#define dtime_t timestamp -#endif /* dtime_t */ - -#ifndef intrvl_t -#define intrvl_t interval -#endif /* intrvl_t */ +typedef timestamp dtime_t; +typedef interval intrvl_t; extern void dtcurrent(dtime_t *); extern int dtcvasc(char *, dtime_t *); diff --git a/src/interfaces/ecpg/include/decimal.h b/src/interfaces/ecpg/include/decimal.h index 2531be38ef..c1f724fbd2 100644 --- a/src/interfaces/ecpg/include/decimal.h +++ b/src/interfaces/ecpg/include/decimal.h @@ -1,8 +1,6 @@ #include -#ifndef dec_t -#define dec_t decimal -#endif /* dec_t */ +typedef decimal dec_t; int decadd(dec_t *, dec_t *, dec_t *); int deccmp(dec_t *, dec_t *); diff --git a/src/interfaces/ecpg/include/ecpg_informix.h b/src/interfaces/ecpg/include/ecpg_informix.h index 1b71735e79..b7a57fab3b 100644 --- a/src/interfaces/ecpg/include/ecpg_informix.h +++ b/src/interfaces/ecpg/include/ecpg_informix.h @@ -5,15 +5,12 @@ #include #include #include +#include #define SQLNOTFOUND 100 -#ifndef date -#define date long -#endif /* ! date */ - extern int rdatestr(date, char *); -extern void rtoday(date *); +extern void rtoday(date *); extern int rjulmdy(date, short *); extern int rdefmtdate(date *, char *, char *); extern int rfmtdate(date, char *, char *); diff --git a/src/interfaces/ecpg/include/pgtypes_date.h b/src/interfaces/ecpg/include/pgtypes_date.h index 99fa9a8504..863b2593d9 100644 --- a/src/interfaces/ecpg/include/pgtypes_date.h +++ b/src/interfaces/ecpg/include/pgtypes_date.h @@ -3,7 +3,7 @@ #include -#define date long +typedef long date; extern date PGTYPESdate_from_asc(char *, char **); extern char *PGTYPESdate_to_asc(date); diff --git a/src/interfaces/ecpg/preproc/preproc.y b/src/interfaces/ecpg/preproc/preproc.y index 9ceff4e2e4..ef5d6edc4c 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.255 2003/09/18 13:12:23 meskes Exp $ */ +/* $Header: /cvsroot/pgsql/src/interfaces/ecpg/preproc/Attic/preproc.y,v 1.256 2003/09/19 14:06:21 meskes Exp $ */ /* Copyright comment */ %{ @@ -209,7 +209,6 @@ adjust_informix(struct arguments *list) original_var = ptr->variable->name; sprintf(temp, "%d))", ecpg_informix_var); - /* create call to "ECPG_informix_set_var(, . )" */ if (atoi(ptr->variable->type->size) > 1) { ptr->variable = new_variable(cat_str(4, make_str("("), mm_strdup(ECPGtype_name(ptr->variable->type->type)), make_str(" *)(ECPG_informix_get_var("), mm_strdup(temp)), ECPGmake_simple_type(ptr->variable->type->type, ptr->variable->type->size), 0); @@ -220,6 +219,8 @@ adjust_informix(struct arguments *list) ptr->variable = new_variable(cat_str(4, make_str("*("), mm_strdup(ECPGtype_name(ptr->variable->type->type)), make_str(" *)(ECPG_informix_get_var("), mm_strdup(temp)), ECPGmake_simple_type(ptr->variable->type->type, ptr->variable->type->size), 0); sprintf(temp, "%d, &(", ecpg_informix_var++); } + + /* create call to "ECPG_informix_set_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 */ -- 2.40.0