Remove pqsignalinquire(), which is unused and has portability issues.

tglsfdc · tglsfdc · commit 03f963640fd0 · 2006-05-30T15:57:56.000Z
diff --git 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.25 2006/03/05 15:59:10 momjian Exp $
+ *	  $PostgreSQL: pgsql/src/interfaces/libpq/pqsignal.c,v 1.26 2006/05/30 15:57:56 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
@@ -7,7 +7,7 @@
  * Portions Copyright (c) 1996-2006, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/interfaces/libpq/pqsignal.h,v 1.20 2006/03/05 15:59:10 momjian Exp $
+ * $PostgreSQL: pgsql/src/interfaces/libpq/pqsignal.h,v 1.21 2006/05/30 15:57:56 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 */

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`* Portions Copyright (c) 1996-2006, PostgreSQL Global Development Group`
`8`	`8`	`* Portions Copyright (c) 1994, Regents of the University of California`
`9`	`9`	`*`
`10`		`- * $PostgreSQL: pgsql/src/interfaces/libpq/pqsignal.h,v 1.20 2006/03/05 15:59:10 momjian Exp $`
	`10`	`+ * $PostgreSQL: pgsql/src/interfaces/libpq/pqsignal.h,v 1.21 2006/05/30 15:57:56 tgl Exp $`
`11`	`11`	`*`
`12`	`12`	`* NOTES`
`13`	`13`	`* This shouldn't be in libpq, but the monitor and some other`
`@@ -24,6 +24,4 @@ typedef void (*pqsigfunc) (int);`
`24`	`24`
`25`	`25`	`extern pqsigfunc pqsignal(int signo, pqsigfunc func);`
`26`	`26`
`27`		`-extern pqsigfunc pqsignalinquire(int signo);`
`28`		`-`
`29`	`27`	`#endif /* PQSIGNAL_H */`