diff options
| author | Peter Eisentraut <peter_e@gmx.net> | 2000-08-29 09:36:51 +0000 |
|---|---|---|
| committer | Peter Eisentraut <peter_e@gmx.net> | 2000-08-29 09:36:51 +0000 |
| commit | ef6164de1d60f65039a73f5975d50b4fa10b8a5b (patch) | |
| tree | f18f7bc27dee2ad232476f46825918eddc0f75fd /src/backend/postmaster/postmaster.c | |
| parent | dffd8cac3dd8fb99ed4299bf2ef7eddba6eeaba2 (diff) | |
| download | postgresql-ef6164de1d60f65039a73f5975d50b4fa10b8a5b.tar.gz postgresql-ef6164de1d60f65039a73f5975d50b4fa10b8a5b.zip | |
Revert removal of signed, volatile, and signal handler arg type tests.
Diffstat (limited to 'src/backend/postmaster/postmaster.c')
| -rw-r--r-- | src/backend/postmaster/postmaster.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/src/backend/postmaster/postmaster.c b/src/backend/postmaster/postmaster.c index c2d46a354cc..d7d2b99230f 100644 --- a/src/backend/postmaster/postmaster.c +++ b/src/backend/postmaster/postmaster.c @@ -11,7 +11,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/postmaster/postmaster.c,v 1.161 2000/08/27 19:00:26 petere Exp $ + * $Header: /cvsroot/pgsql/src/backend/postmaster/postmaster.c,v 1.162 2000/08/29 09:36:41 petere Exp $ * * NOTES * @@ -231,10 +231,10 @@ static void pmdaemonize(int argc, char *argv[]); static Port *ConnCreate(int serverFd); static void ConnFree(Port *port); static void reset_shared(int port); -static void SIGHUP_handler(int signum); -static void pmdie(int signum); -static void reaper(int signum); -static void dumpstatus(int signum); +static void SIGHUP_handler(SIGNAL_ARGS); +static void pmdie(SIGNAL_ARGS); +static void reaper(SIGNAL_ARGS); +static void dumpstatus(SIGNAL_ARGS); static void CleanupProc(int pid, int exitstatus); static int DoBackend(Port *port); static void ExitPostmaster(int status); @@ -246,7 +246,7 @@ static int processCancelRequest(Port *port, PacketLen len, void *pkt); static int initMasks(fd_set *rmask, fd_set *wmask); static long PostmasterRandom(void); static void RandomSalt(char *salt); -static void SignalChildren(int signum); +static void SignalChildren(SIGNAL_ARGS); static int CountChildren(void); static bool CreateOptsFile(int argc, char *argv[]); @@ -1266,7 +1266,7 @@ reset_shared(int port) * main loop */ static void -SIGHUP_handler(int signum) +SIGHUP_handler(SIGNAL_ARGS) { got_SIGHUP = true; if (Shutdown > SmartShutdown) @@ -1281,14 +1281,14 @@ SIGHUP_handler(int signum) * pmdie -- signal handler for cleaning up after a kill signal. */ static void -pmdie(int signum) +pmdie(SIGNAL_ARGS) { PG_SETMASK(&BlockSig); if (DebugLvl >= 1) - elog(DEBUG, "pmdie %d", signum); + elog(DEBUG, "pmdie %d", postgres_signal_arg); - switch (signum) + switch (postgres_signal_arg) { case SIGUSR2: @@ -1399,7 +1399,7 @@ pmdie(int signum) * Reaper -- signal handler to cleanup after a backend (child) dies. */ static void -reaper(int signum) +reaper(SIGNAL_ARGS) { /* GH: replace waitpid for !HAVE_WAITPID. Does this work ? */ #ifdef HAVE_WAITPID @@ -1970,7 +1970,7 @@ ExitPostmaster(int status) } static void -dumpstatus(int signum) +dumpstatus(SIGNAL_ARGS) { Dlelem *curr; |