From 53409f1b37a363fe27142bf124ae6812b5565620 Mon Sep 17 00:00:00 2001 From: Tom Lane Date: Tue, 30 May 2006 15:58:07 +0000 Subject: [PATCH] Remove pqsignalinquire(), which is unused and has portability issues. --- src/interfaces/libpq/pqsignal.c | 28 +--------------------------- 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 83981339842..fa865bd7b81 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.6.1 2006/05/30 15:58:07 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 90fd3e545a3..fcf3b2b0f38 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.6.1 2006/05/30 15:58:07 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 */