NotificationsYou must be signed in to change notification settings
Fork6
Star31

Commitcc92cca

committed

Drop support for getting signal descriptions from sys_siglist[].

It appears that all platforms that have sys_siglist[] also havestrsignal(), making that fallback case in pg_strsignal() dead code.Getting rid of it allows dropping a configure test, which seems worthmore than providing textual signal descriptions on whatever platformsmight still hypothetically have use for the fallback case.Discussion:https://postgr.es/m/25758.1544983503@sss.pgh.pa.us

1 parentca41030 commitcc92ccaCopy full SHA for cc92cca

File tree

4 files changed

-42

lines changed

configure
configure.in
src
- include
  - pg_config.h.in
- port
  - pgstrsignal.c

4 files changed

-42

lines changed

`‎configure`

Lines changed: 0 additions & 18 deletions

Original file line number	Diff line number	Diff line change
`@@ -16064,24 +16064,6 @@ esac`
`16064`	`16064`
`16065`	`16065`	`fi`
`16066`	`16066`
`16067`		`-ac_fn_c_check_decl "$LINENO" "sys_siglist" "ac_cv_have_decl_sys_siglist" "#include <signal.h>`
`16068`		`-/* NetBSD declares sys_siglist in unistd.h. */`
`16069`		`-#ifdef HAVE_UNISTD_H`
`16070`		`-# include <unistd.h>`
`16071`		`-#endif`
`16072`		`-`
`16073`		`-"`
`16074`		`-if test "x$ac_cv_have_decl_sys_siglist" = xyes; then :`
`16075`		`- ac_have_decl=1`
`16076`		`-else`
`16077`		`- ac_have_decl=0`
`16078`		`-fi`
`16079`		`-`
`16080`		`-cat >>confdefs.h <<_ACEOF`
`16081`		`-#define HAVE_DECL_SYS_SIGLIST $ac_have_decl`
`16082`		`-_ACEOF`
`16083`		`-`
`16084`		`-`
`16085`	`16067`	`ac_fn_c_check_func "$LINENO" "syslog" "ac_cv_func_syslog"`
`16086`	`16068`	`if test "x$ac_cv_func_syslog" = xyes; then :`
`16087`	`16069`	`ac_fn_c_check_header_mongrel "$LINENO" "syslog.h" "ac_cv_header_syslog_h" "$ac_includes_default"`

`‎configure.in`

Lines changed: 0 additions & 8 deletions

Original file line number	Diff line number	Diff line change
`@@ -1787,14 +1787,6 @@ if test "$PORTNAME" = "cygwin"; then`
`1787`	`1787`	`AC_LIBOBJ(dirmod)`
`1788`	`1788`	`fi`
`1789`	`1789`
`1790`		`-AC_CHECK_DECLS([sys_siglist], [], [],`
`1791`		`-[#include <signal.h>`
`1792`		`-/* NetBSD declares sys_siglist in unistd.h. */`
`1793`		`-#ifdef HAVE_UNISTD_H`
`1794`		`-# include <unistd.h>`
`1795`		`-#endif`
`1796`		`-])`
`1797`		`-`
`1798`	`1790`	`AC_CHECK_FUNC(syslog,`
`1799`	`1791`	`[AC_CHECK_HEADER(syslog.h,`
`1800`	`1792`	`[AC_DEFINE(HAVE_SYSLOG, 1, [Define to 1 if you have the syslog interface.])])])`

`‎src/include/pg_config.h.in`

Lines changed: 0 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -192,10 +192,6 @@`
`192`	`192`	`don't. */`
`193`	`193`	`#undef HAVE_DECL_STRTOULL`
`194`	`194`
`195`		-/* Define to 1 if you have the declaration of `sys_siglist', and to 0 if you
`196`		`- don't. */`
`197`		`-#undef HAVE_DECL_SYS_SIGLIST`
`198`		`-`
`199`	`195`	/* Define to 1 if you have the `dlopen' function. */
`200`	`196`	`#undef HAVE_DLOPEN`
`201`	`197`

`‎src/port/pgstrsignal.c`

Lines changed: 9 additions & 12 deletions

Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@`
`31`	`31`	`* the string will remain valid across later calls to strsignal().`
`32`	`32`	`*`
`33`	`33`	`* This version guarantees to return a non-NULL pointer, although`
`34`		`- * some platforms' versions of strsignal() do not.`
	`34`	`+ * some platforms' versions of strsignal()reputedlydo not.`
`35`	`35`	`*/`
`36`	`36`	`constchar*`
`37`	`37`	`pg_strsignal(intsignum)`
`@@ -40,21 +40,18 @@ pg_strsignal(int signum)`
`40`	`40`
`41`	`41`	`/*`
`42`	`42`	`* If we have strsignal(3), use that --- but check its result for NULL.`
`43`		`- * Otherwise, if we have sys_siglist[], use that; just out of paranoia,`
`44`		`- * check for NULL there too. (We assume there is no point in trying both`
`45`		`- * APIs.)`
`46`	`43`	`*/`
`47`		`-#if defined(HAVE_STRSIGNAL)`
	`44`	`+#ifdefHAVE_STRSIGNAL`
`48`	`45`	`result=strsignal(signum);`
`49`	`46`	`if (result)`
`50`	`47`	`returnresult;`
`51`		`-#elif defined(HAVE_DECL_SYS_SIGLIST)&&HAVE_DECL_SYS_SIGLIST`
`52`		`-if (signum>0&&signum<NSIG)`
`53`		`-{`
`54`		`-result=sys_siglist[signum];`
`55`		`-if (result)`
`56`		`-returnresult;`
`57`		`-}`
	`48`	`+#else`
	`49`	`+`
	`50`	`+/*`
	`51`	`+ * We used to have code here to try to usesys_siglist[] if available.`
	`52`	`+ * However, it seems that all platforms with sys_siglist[] have also had`
	`53`	`+ * strsignal() for many years now, so that was just a waste of code.`
	`54`	`+ */`
`58`	`55`	`#endif`
`59`	`56`
`60`	`57`	`/*`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commitcc92cca

File tree

4 files changed

4 files changed

`‎configure`

`‎configure.in`

`‎src/include/pg_config.h.in`

`‎src/port/pgstrsignal.c`

0 commit comments