diff options
Diffstat (limited to 'src/interfaces/ecpg/ecpglib')
| -rw-r--r-- | src/interfaces/ecpg/ecpglib/connect.c | 2 | ||||
| -rw-r--r-- | src/interfaces/ecpg/ecpglib/descriptor.c | 10 | ||||
| -rw-r--r-- | src/interfaces/ecpg/ecpglib/execute.c | 28 | ||||
| -rw-r--r-- | src/interfaces/ecpg/ecpglib/extern.h | 12 | ||||
| -rw-r--r-- | src/interfaces/ecpg/ecpglib/memory.c | 2 | ||||
| -rw-r--r-- | src/interfaces/ecpg/ecpglib/misc.c | 4 | ||||
| -rw-r--r-- | src/interfaces/ecpg/ecpglib/prepare.c | 14 | ||||
| -rw-r--r-- | src/interfaces/ecpg/ecpglib/sqlda.c | 4 |
8 files changed, 38 insertions, 38 deletions
diff --git a/src/interfaces/ecpg/ecpglib/connect.c b/src/interfaces/ecpg/ecpglib/connect.c index c90f13dc6c1..0716abdd7e1 100644 --- a/src/interfaces/ecpg/ecpglib/connect.c +++ b/src/interfaces/ecpg/ecpglib/connect.c @@ -110,7 +110,7 @@ ecpg_get_connection(const char *connection_name) } static void -ecpg_finish(struct connection * act) +ecpg_finish(struct connection *act) { if (act != NULL) { diff --git a/src/interfaces/ecpg/ecpglib/descriptor.c b/src/interfaces/ecpg/ecpglib/descriptor.c index 15fd7a08a53..1baa3ed1757 100644 --- a/src/interfaces/ecpg/ecpglib/descriptor.c +++ b/src/interfaces/ecpg/ecpglib/descriptor.c @@ -16,14 +16,14 @@ #include "sqlda.h" #include "sql3types.h" -static void descriptor_free(struct descriptor * desc); +static void descriptor_free(struct descriptor *desc); /* We manage descriptors separately for each thread. */ #ifdef ENABLE_THREAD_SAFETY static pthread_key_t descriptor_key; static pthread_once_t descriptor_once = PTHREAD_ONCE_INIT; -static void descriptor_deallocate_all(struct descriptor * list); +static void descriptor_deallocate_all(struct descriptor *list); static void descriptor_destructor(void *arg) @@ -45,7 +45,7 @@ get_descriptors(void) } static void -set_descriptors(struct descriptor * value) +set_descriptors(struct descriptor *value) { pthread_setspecific(descriptor_key, value); } @@ -689,7 +689,7 @@ ECPGset_desc(int lineno, const char *desc_name, int index,...) /* Free the descriptor and items in it. */ static void -descriptor_free(struct descriptor * desc) +descriptor_free(struct descriptor *desc) { struct descriptor_item *desc_item; @@ -743,7 +743,7 @@ ECPGdeallocate_desc(int line, const char *name) /* Deallocate all descriptors in the list */ static void -descriptor_deallocate_all(struct descriptor * list) +descriptor_deallocate_all(struct descriptor *list) { while (list) { diff --git a/src/interfaces/ecpg/ecpglib/execute.c b/src/interfaces/ecpg/ecpglib/execute.c index bd9b86be496..3c4cc74c311 100644 --- a/src/interfaces/ecpg/ecpglib/execute.c +++ b/src/interfaces/ecpg/ecpglib/execute.c @@ -82,7 +82,7 @@ quote_postgres(char *arg, bool quote, int lineno) } static void -free_variable(struct variable * var) +free_variable(struct variable *var) { struct variable *var_next; @@ -95,7 +95,7 @@ free_variable(struct variable * var) } static void -free_statement(struct statement * stmt) +free_statement(struct statement *stmt) { if (stmt == NULL) return; @@ -145,7 +145,7 @@ next_insert(char *text, int pos, bool questionmarks) } static bool -ecpg_type_infocache_push(struct ECPGtype_information_cache ** cache, int oid, enum ARRAY_TYPE isarray, int lineno) +ecpg_type_infocache_push(struct ECPGtype_information_cache **cache, int oid, enum ARRAY_TYPE isarray, int lineno) { struct ECPGtype_information_cache *new_entry = (struct ECPGtype_information_cache *) ecpg_alloc(sizeof(struct ECPGtype_information_cache), lineno); @@ -161,7 +161,7 @@ ecpg_type_infocache_push(struct ECPGtype_information_cache ** cache, int oid, en } static enum ARRAY_TYPE -ecpg_is_type_an_array(int type, const struct statement * stmt, const struct variable * var) +ecpg_is_type_an_array(int type, const struct statement *stmt, const struct variable *var) { char *array_query; enum ARRAY_TYPE isarray = ECPG_ARRAY_NOT_SET; @@ -307,7 +307,7 @@ ecpg_is_type_an_array(int type, const struct statement * stmt, const struct vari bool ecpg_store_result(const PGresult *results, int act_field, - const struct statement * stmt, struct variable * var) + const struct statement *stmt, struct variable *var) { enum ARRAY_TYPE isarray; int act_tuple, @@ -491,7 +491,7 @@ sprintf_float_value(char *ptr, float value, const char *delim) } bool -ecpg_store_input(const int lineno, const bool force_indicator, const struct variable * var, +ecpg_store_input(const int lineno, const bool force_indicator, const struct variable *var, char **tobeinserted_p, bool quote) { char *mallocedval = NULL; @@ -1049,7 +1049,7 @@ ecpg_store_input(const int lineno, const bool force_indicator, const struct vari } void -ecpg_free_params(struct statement * stmt, bool print) +ecpg_free_params(struct statement *stmt, bool print) { int n; @@ -1065,7 +1065,7 @@ ecpg_free_params(struct statement * stmt, bool print) } static bool -insert_tobeinserted(int position, int ph_len, struct statement * stmt, char *tobeinserted) +insert_tobeinserted(int position, int ph_len, struct statement *stmt, char *tobeinserted) { char *newcopy; @@ -1104,7 +1104,7 @@ insert_tobeinserted(int position, int ph_len, struct statement * stmt, char *tob * in arrays which can be used by PQexecParams(). */ bool -ecpg_build_params(struct statement * stmt) +ecpg_build_params(struct statement *stmt) { struct variable *var; int desc_counter = 0; @@ -1402,7 +1402,7 @@ ecpg_build_params(struct statement * stmt) * If we are in non-autocommit mode, automatically start a transaction. */ bool -ecpg_autostart_transaction(struct statement * stmt) +ecpg_autostart_transaction(struct statement *stmt) { if (PQtransactionStatus(stmt->connection->connection) == PQTRANS_IDLE && !stmt->connection->autocommit) { @@ -1423,7 +1423,7 @@ ecpg_autostart_transaction(struct statement * stmt) * Execute the SQL statement. */ bool -ecpg_execute(struct statement * stmt) +ecpg_execute(struct statement *stmt) { ecpg_log("ecpg_execute on line %d: query: %s; with %d parameter(s) on connection %s\n", stmt->lineno, stmt->command, stmt->nparams, stmt->connection->name); if (stmt->statement_type == ECPGst_execute) @@ -1471,7 +1471,7 @@ ecpg_execute(struct statement * stmt) *------- */ bool -ecpg_process_output(struct statement * stmt, bool clear_result) +ecpg_process_output(struct statement *stmt, bool clear_result) { struct variable *var; bool status = false; @@ -1747,7 +1747,7 @@ bool ecpg_do_prologue(int lineno, const int compat, const int force_indicator, const char *connection_name, const bool questionmarks, enum ECPG_statement_type statement_type, const char *query, - va_list args, struct statement ** stmt_out) + va_list args, struct statement **stmt_out) { struct statement *stmt; struct connection *con; @@ -1976,7 +1976,7 @@ ecpg_do_prologue(int lineno, const int compat, const int force_indicator, * Restore the application locale and free the statement structure. */ void -ecpg_do_epilogue(struct statement * stmt) +ecpg_do_epilogue(struct statement *stmt) { if (stmt == NULL) return; diff --git a/src/interfaces/ecpg/ecpglib/extern.h b/src/interfaces/ecpg/ecpglib/extern.h index fb9b5aebbe7..2040bc163e9 100644 --- a/src/interfaces/ecpg/ecpglib/extern.h +++ b/src/interfaces/ecpg/ecpglib/extern.h @@ -166,15 +166,15 @@ struct prepared_statement *ecpg_find_prepared_statement(const char *, struct connection *, struct prepared_statement **); bool ecpg_store_result(const PGresult *results, int act_field, - const struct statement * stmt, struct variable * var); + const struct statement *stmt, struct variable *var); bool ecpg_store_input(const int, const bool, const struct variable *, char **, bool); -void ecpg_free_params(struct statement * stmt, bool print); +void ecpg_free_params(struct statement *stmt, bool print); bool ecpg_do_prologue(int, const int, const int, const char *, const bool, enum ECPG_statement_type, const char *, va_list, struct statement **); bool ecpg_build_params(struct statement *); -bool ecpg_autostart_transaction(struct statement * stmt); -bool ecpg_execute(struct statement * stmt); +bool ecpg_autostart_transaction(struct statement *stmt); +bool ecpg_execute(struct statement *stmt); bool ecpg_process_output(struct statement *, bool); void ecpg_do_epilogue(struct statement *); bool ecpg_do(const int, const int, const int, const char *, const bool, @@ -184,10 +184,10 @@ bool ecpg_check_PQresult(PGresult *, int, PGconn *, enum COMPAT_MODE); void ecpg_raise(int line, int code, const char *sqlstate, const char *str); void ecpg_raise_backend(int line, PGresult *result, PGconn *conn, int compat); char *ecpg_prepared(const char *, struct connection *); -bool ecpg_deallocate_all_conn(int lineno, enum COMPAT_MODE c, struct connection * conn); +bool ecpg_deallocate_all_conn(int lineno, enum COMPAT_MODE c, struct connection *conn); void ecpg_log(const char *format,...) pg_attribute_printf(1, 2); bool ecpg_auto_prepare(int, const char *, const int, char **, const char *); -void ecpg_init_sqlca(struct sqlca_t * sqlca); +void ecpg_init_sqlca(struct sqlca_t *sqlca); struct sqlda_compat *ecpg_build_compat_sqlda(int, PGresult *, int, enum COMPAT_MODE); void ecpg_set_compat_sqlda(int, struct sqlda_compat **, const PGresult *, int, enum COMPAT_MODE); diff --git a/src/interfaces/ecpg/ecpglib/memory.c b/src/interfaces/ecpg/ecpglib/memory.c index 9c1d20efc56..a7268bb0f6c 100644 --- a/src/interfaces/ecpg/ecpglib/memory.c +++ b/src/interfaces/ecpg/ecpglib/memory.c @@ -93,7 +93,7 @@ get_auto_allocs(void) } static void -set_auto_allocs(struct auto_mem * am) +set_auto_allocs(struct auto_mem *am) { pthread_setspecific(auto_mem_key, am); } diff --git a/src/interfaces/ecpg/ecpglib/misc.c b/src/interfaces/ecpg/ecpglib/misc.c index 019ebe10f99..f8ad5d733c9 100644 --- a/src/interfaces/ecpg/ecpglib/misc.c +++ b/src/interfaces/ecpg/ecpglib/misc.c @@ -96,13 +96,13 @@ static int simple_debug = 0; static FILE *debugstream = NULL; void -ecpg_init_sqlca(struct sqlca_t * sqlca) +ecpg_init_sqlca(struct sqlca_t *sqlca) { memcpy((char *) sqlca, (char *) &sqlca_init, sizeof(struct sqlca_t)); } bool -ecpg_init(const struct connection * con, const char *connection_name, const int lineno) +ecpg_init(const struct connection *con, const char *connection_name, const int lineno) { struct sqlca_t *sqlca = ECPGget_sqlca(); diff --git a/src/interfaces/ecpg/ecpglib/prepare.c b/src/interfaces/ecpg/ecpglib/prepare.c index 983b242d065..e26ab3532ff 100644 --- a/src/interfaces/ecpg/ecpglib/prepare.c +++ b/src/interfaces/ecpg/ecpglib/prepare.c @@ -27,8 +27,8 @@ static const int stmtCacheNBuckets = 2039; /* # buckets - a prime # */ static const int stmtCacheEntPerBucket = 8; /* # entries/bucket */ static stmtCacheEntry stmtCacheEntries[16384] = {{0, {0}, 0, 0, 0}}; -static bool deallocate_one(int lineno, enum COMPAT_MODE c, struct connection * con, - struct prepared_statement * prev, struct prepared_statement * this); +static bool deallocate_one(int lineno, enum COMPAT_MODE c, struct connection *con, + struct prepared_statement *prev, struct prepared_statement *this); static bool isvarchar(unsigned char c) @@ -100,7 +100,7 @@ replace_variables(char **text, int lineno) } static bool -prepare_common(int lineno, struct connection * con, const char *name, const char *variable) +prepare_common(int lineno, struct connection *con, const char *name, const char *variable) { struct statement *stmt; struct prepared_statement *this; @@ -180,7 +180,7 @@ ECPGprepare(int lineno, const char *connection_name, const bool questionmarks, c struct prepared_statement * ecpg_find_prepared_statement(const char *name, - struct connection * con, struct prepared_statement ** prev_) + struct connection *con, struct prepared_statement **prev_) { struct prepared_statement *this, *prev; @@ -198,7 +198,7 @@ ecpg_find_prepared_statement(const char *name, } static bool -deallocate_one(int lineno, enum COMPAT_MODE c, struct connection * con, struct prepared_statement * prev, struct prepared_statement * this) +deallocate_one(int lineno, enum COMPAT_MODE c, struct connection *con, struct prepared_statement *prev, struct prepared_statement *this) { bool r = false; @@ -273,7 +273,7 @@ ECPGdeallocate(int lineno, int c, const char *connection_name, const char *name) } bool -ecpg_deallocate_all_conn(int lineno, enum COMPAT_MODE c, struct connection * con) +ecpg_deallocate_all_conn(int lineno, enum COMPAT_MODE c, struct connection *con) { /* deallocate all prepared statements */ while (con->prep_stmts) @@ -292,7 +292,7 @@ ECPGdeallocate_all(int lineno, int compat, const char *connection_name) } char * -ecpg_prepared(const char *name, struct connection * con) +ecpg_prepared(const char *name, struct connection *con) { struct prepared_statement *this; diff --git a/src/interfaces/ecpg/ecpglib/sqlda.c b/src/interfaces/ecpg/ecpglib/sqlda.c index bc94f2f8594..c1ba9891663 100644 --- a/src/interfaces/ecpg/ecpglib/sqlda.c +++ b/src/interfaces/ecpg/ecpglib/sqlda.c @@ -249,7 +249,7 @@ static int16 value_is_null = -1; static int16 value_is_not_null = 0; void -ecpg_set_compat_sqlda(int lineno, struct sqlda_compat ** _sqlda, const PGresult *res, int row, enum COMPAT_MODE compat) +ecpg_set_compat_sqlda(int lineno, struct sqlda_compat **_sqlda, const PGresult *res, int row, enum COMPAT_MODE compat) { struct sqlda_compat *sqlda = (*_sqlda); int i; @@ -438,7 +438,7 @@ ecpg_build_native_sqlda(int line, PGresult *res, int row, enum COMPAT_MODE compa } void -ecpg_set_native_sqlda(int lineno, struct sqlda_struct ** _sqlda, const PGresult *res, int row, enum COMPAT_MODE compat) +ecpg_set_native_sqlda(int lineno, struct sqlda_struct **_sqlda, const PGresult *res, int row, enum COMPAT_MODE compat) { struct sqlda_struct *sqlda = (*_sqlda); int i; |