Ecpg cleanups for prototypes.

bmomjian · bmomjian · commit a64927f995cb · 2003-06-15T04:56:45.000Z
diff --git 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
@@ -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);

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-/* $Header: /cvsroot/pgsql/src/interfaces/ecpg/ecpglib/misc.c,v 1.3 2003/06/15 04:07:58 momjian Exp $ */`
	`1`	`+/* $Header: /cvsroot/pgsql/src/interfaces/ecpg/ecpglib/misc.c,v 1.4 2003/06/15 04:56:45 momjian Exp $ */`
`2`	`2`
`3`	`3`	`#define POSTGRES_ECPG_INTERNAL`
`4`	`4`	`#include "postgres_fe.h"`
`@@ -78,7 +78,8 @@ static pthread_mutex_t debug_mutex = PTHREAD_MUTEX_INITIALIZER;`
`78`	`78`	`static int simple_debug = 0;`
`79`	`79`	`static FILE *debugstream = NULL;`
`80`	`80`
`81`		`-void ECPGinit_sqlca(struct sqlca_t *sqlca)`
	`81`	`+void`
	`82`	`+ECPGinit_sqlca(struct sqlca_t *sqlca)`
`82`	`83`	`{`
`83`	`84`	`memcpy((char )sqlca, (char )&sqlca_init, sizeof(struct sqlca_t));`
`84`	`85`	`}`
`@@ -98,25 +99,27 @@ ECPGinit(const struct connection * con, const char *connection_name, const int l`
`98`	`99`	`}`
`99`	`100`
`100`	`101`	`#ifdef USE_THREADS`
`101`		`-static void ecpg_sqlca_key_init(void)`
	`102`	`+static void`
	`103`	`+ecpg_sqlca_key_init(void)`
`102`	`104`	`{`
`103`	`105`	`pthread_key_create(&sqlca_key, NULL);`
`104`	`106`	`}`
`105`	`107`	`#endif`
`106`	`108`
`107`		`-struct sqlca_t *ECPGget_sqlca(void)`
	`109`	`+struct sqlca_t *`
	`110`	`+ECPGget_sqlca(void)`
`108`	`111`	`{`
`109`	`112`	`#ifdef USE_THREADS`
`110`	`113`	`struct sqlca_t *sqlca;`
`111`	`114`
`112`	`115`	`pthread_once(&sqlca_key_once, ecpg_sqlca_key_init);`
`113`	`116`
`114`		`- sqlca = pthread_getspecific(&sqlca_key);`
	`117`	`+ sqlca = pthread_getspecific(sqlca_key);`
`115`	`118`	`if( sqlca == NULL )`
`116`	`119`	`{`
`117`	`120`	`sqlca = malloc(sizeof(struct sqlca_t));`
`118`	`121`	`ECPGinit_sqlca(sqlca);`
`119`		`- pthread_setspecific(&sqlca_key, sqlca);`
	`122`	`+ pthread_setspecific(sqlca_key, sqlca);`
`120`	`123`	`}`
`121`	`124`	`return( sqlca );`
`122`	`125`	`#else`