diff options
| author | Tom Lane <tgl@sss.pgh.pa.us> | 2006-05-30 15:58:14 +0000 |
|---|---|---|
| committer | Tom Lane <tgl@sss.pgh.pa.us> | 2006-05-30 15:58:14 +0000 |
| commit | 1252a6a0428a42afbf11fd02610ff0fd98bd0410 (patch) | |
| tree | d2dfce8e624846a258f3b16d118deafff1f62fdd | |
| parent | f966dccb2f702607d18c6ea991e3772f0d0415bd (diff) | |
| download | postgresql-1252a6a0428a42afbf11fd02610ff0fd98bd0410.tar.gz | |
Remove pqsignalinquire(), which is unused and has portability issues.
| -rw-r--r-- | src/interfaces/libpq/pqsignal.c | 28 | ||||
| -rw-r--r-- | src/interfaces/libpq/pqsignal.h | 4 |
2 files changed, 2 insertions, 30 deletions
diff --git a/src/interfaces/libpq/pqsignal.c b/src/interfaces/libpq/pqsignal.c index 8398133984..262f175107 100644 --- a/src/interfaces/libpq/pqsignal.c +++ b/src/interfaces/libpq/pqsignal.c @@ -9,7 +9,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/interfaces/libpq/pqsignal.c,v 1.24 2004/12/31 22:03:50 pgsql Exp $ + * $PostgreSQL: pgsql/src/interfaces/libpq/pqsignal.c,v 1.24.4.1 2006/05/30 15:58:14 tgl Exp $ * * NOTES * This shouldn't be in libpq, but the monitor and some other @@ -44,29 +44,3 @@ pqsignal(int signo, pqsigfunc func) return oact.sa_handler; #endif /* !HAVE_POSIX_SIGNALS */ } - -pqsigfunc -pqsignalinquire(int signo) -{ -#ifndef WIN32 -#if !defined(HAVE_POSIX_SIGNALS) - pqsigfunc old_sigfunc; - int old_sigmask; - - /* Prevent signal handler calls during test */ - old_sigmask = sigblock(sigmask(signo)); - old_sigfunc = signal(signo, SIG_DFL); - signal(signo, old_sigfunc); - sigblock(old_sigmask); - return old_sigfunc; -#else - struct sigaction oact; - - if (sigaction(signo, NULL, &oact) < 0) - return SIG_ERR; - return oact.sa_handler; -#endif /* !HAVE_POSIX_SIGNALS */ -#else - return SIG_DFL; -#endif -} diff --git a/src/interfaces/libpq/pqsignal.h b/src/interfaces/libpq/pqsignal.h index 90fd3e545a..bb864e5827 100644 --- a/src/interfaces/libpq/pqsignal.h +++ b/src/interfaces/libpq/pqsignal.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2005, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/interfaces/libpq/pqsignal.h,v 1.19 2004/12/31 22:03:50 pgsql Exp $ + * $PostgreSQL: pgsql/src/interfaces/libpq/pqsignal.h,v 1.19.4.1 2006/05/30 15:58:14 tgl Exp $ * * NOTES * This shouldn't be in libpq, but the monitor and some other @@ -24,6 +24,4 @@ typedef void (*pqsigfunc) (int); extern pqsigfunc pqsignal(int signo, pqsigfunc func); -extern pqsigfunc pqsignalinquire(int signo); - #endif /* PQSIGNAL_H */ |