diff options
| author | Tom Lane <tgl@sss.pgh.pa.us> | 2004-12-02 23:20:21 +0000 |
|---|---|---|
| committer | Tom Lane <tgl@sss.pgh.pa.us> | 2004-12-02 23:20:21 +0000 |
| commit | 5d7a555d0f42bce2a3ac05ea4fc32e6781803f1f (patch) | |
| tree | 05a64689c10818d16bac5bd33be19899c64aa329 /src/interfaces/libpq/fe-connect.c | |
| parent | 9b711e766ea3f9e23a5b3a4c4ff828ec9e5f329b (diff) | |
Code review for recent libpq changes. Be more careful about error
handling in SIGPIPE processing; avoid unnecessary pollution of application
link-symbol namespace; spell 'pointer to function' in the conventional
way.
Diffstat (limited to 'src/interfaces/libpq/fe-connect.c')
| -rw-r--r-- | src/interfaces/libpq/fe-connect.c | 31 |
1 files changed, 12 insertions, 19 deletions
diff --git a/src/interfaces/libpq/fe-connect.c b/src/interfaces/libpq/fe-connect.c index 30e56b4b6eb..57d7ee8e6ff 100644 --- a/src/interfaces/libpq/fe-connect.c +++ b/src/interfaces/libpq/fe-connect.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/interfaces/libpq/fe-connect.c,v 1.291 2004/12/02 15:32:54 momjian Exp $ + * $PostgreSQL: pgsql/src/interfaces/libpq/fe-connect.c,v 1.292 2004/12/02 23:20:19 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -202,6 +202,11 @@ static int parseServiceInfo(PQconninfoOption *options, static char *pwdfMatchesString(char *buf, char *token); static char *PasswordFromFile(char *hostname, char *port, char *dbname, char *username); +static void default_threadlock(int acquire); + + +/* global variable because fe-auth.c needs to access it */ +pgthreadlock_t pg_g_threadlock = default_threadlock; /* @@ -3276,16 +3281,6 @@ PasswordFromFile(char *hostname, char *port, char *dbname, char *username) * if they are not required. */ -void -PQinitSSL(int do_init) -{ -#ifdef USE_SSL - pq_initssllib = do_init; -#endif -} - -static pgthreadlock_t default_threadlock; - static void default_threadlock(int acquire) { @@ -3313,17 +3308,15 @@ default_threadlock(int acquire) #endif } -pgthreadlock_t *g_threadlock = default_threadlock; - -pgthreadlock_t * -PQregisterThreadLock(pgthreadlock_t *newhandler) +pgthreadlock_t +PQregisterThreadLock(pgthreadlock_t newhandler) { - pgthreadlock_t *prev; + pgthreadlock_t prev = pg_g_threadlock; - prev = g_threadlock; if (newhandler) - g_threadlock = newhandler; + pg_g_threadlock = newhandler; else - g_threadlock = default_threadlock; + pg_g_threadlock = default_threadlock; + return prev; } |