diff options
| -rw-r--r-- | src/interfaces/ecpg/ecpglib/misc.c | 15 | ||||
| -rw-r--r-- | src/interfaces/ecpg/include/ecpglib.h | 7 |
2 files changed, 14 insertions, 8 deletions
diff --git a/src/interfaces/ecpg/ecpglib/misc.c b/src/interfaces/ecpg/ecpglib/misc.c index 5c5128dcef4..ae2e090fe98 100644 --- a/src/interfaces/ecpg/ecpglib/misc.c +++ b/src/interfaces/ecpg/ecpglib/misc.c @@ -1,4 +1,4 @@ -/* $Header: /cvsroot/pgsql/src/interfaces/ecpg/ecpglib/misc.c,v 1.3 2003/06/15 04:07:58 momjian Exp $ */ +/* $Header: /cvsroot/pgsql/src/interfaces/ecpg/ecpglib/misc.c,v 1.4 2003/06/15 04:56:45 momjian Exp $ */ #define POSTGRES_ECPG_INTERNAL #include "postgres_fe.h" @@ -78,7 +78,8 @@ static pthread_mutex_t debug_mutex = PTHREAD_MUTEX_INITIALIZER; static int simple_debug = 0; static FILE *debugstream = NULL; -void ECPGinit_sqlca(struct sqlca_t *sqlca) +void +ECPGinit_sqlca(struct sqlca_t *sqlca) { memcpy((char *)sqlca, (char *)&sqlca_init, sizeof(struct sqlca_t)); } @@ -98,25 +99,27 @@ ECPGinit(const struct connection * con, const char *connection_name, const int l } #ifdef USE_THREADS -static void ecpg_sqlca_key_init(void) +static void +ecpg_sqlca_key_init(void) { pthread_key_create(&sqlca_key, NULL); } #endif -struct sqlca_t *ECPGget_sqlca(void) +struct sqlca_t * +ECPGget_sqlca(void) { #ifdef USE_THREADS struct sqlca_t *sqlca; pthread_once(&sqlca_key_once, ecpg_sqlca_key_init); - sqlca = pthread_getspecific(&sqlca_key); + sqlca = pthread_getspecific(sqlca_key); if( sqlca == NULL ) { sqlca = malloc(sizeof(struct sqlca_t)); ECPGinit_sqlca(sqlca); - pthread_setspecific(&sqlca_key, sqlca); + pthread_setspecific(sqlca_key, sqlca); } return( sqlca ); #else diff --git a/src/interfaces/ecpg/include/ecpglib.h b/src/interfaces/ecpg/include/ecpglib.h index 21e2db33f04..da91927854c 100644 --- a/src/interfaces/ecpg/include/ecpglib.h +++ b/src/interfaces/ecpg/include/ecpglib.h @@ -38,6 +38,9 @@ extern "C" { #endif +struct sqlca_t; + +void ECPGinit_sqlca(struct sqlca_t *sqlca); void ECPGdebug(int, FILE *); bool ECPGstatus(int, const char *); bool ECPGsetcommit(int, const char *, const char *); @@ -49,10 +52,10 @@ bool ECPGdisconnect(int, const char *); bool ECPGprepare(int, char *, char *); bool ECPGdeallocate(int, char *); bool ECPGdeallocate_all(int); -char *ECPGprepared_statement(char *); +char *ECPGprepared_statement(char *); void ECPGlog(const char *format,...); -char *ECPGerrmsg(void); +char *ECPGerrmsg(void); /* print an error message */ void sqlprint(void); |