diff options
| author | Tom Lane <tgl@sss.pgh.pa.us> | 2007-12-12 16:53:14 +0000 |
|---|---|---|
| committer | Tom Lane <tgl@sss.pgh.pa.us> | 2007-12-12 16:53:14 +0000 |
| commit | 286049dbe4e2763412ef71f62c61b2b297aed6cc (patch) | |
| tree | ec4efa93dcd290dd3abad687d94a49da72d78c2d /src | |
| parent | a3382de95404878b96d9b37c58ad02c97005eb5a (diff) | |
| download | postgresql-286049dbe4e2763412ef71f62c61b2b297aed6cc.tar.gz postgresql-286049dbe4e2763412ef71f62c61b2b297aed6cc.zip | |
Clean up unportable attempt to use #if inside a macro call, also
faulty code in third arm of #if. Per buildfarm reports.
Diffstat (limited to 'src')
| -rw-r--r-- | src/backend/postmaster/pgarch.c | 39 |
1 files changed, 26 insertions, 13 deletions
diff --git a/src/backend/postmaster/pgarch.c b/src/backend/postmaster/pgarch.c index f9a88b664b0..8b62fb6098c 100644 --- a/src/backend/postmaster/pgarch.c +++ b/src/backend/postmaster/pgarch.c @@ -19,7 +19,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/postmaster/pgarch.c,v 1.34 2007/12/12 09:39:54 petere Exp $ + * $PostgreSQL: pgsql/src/backend/postmaster/pgarch.c,v 1.35 2007/12/12 16:53:14 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -489,29 +489,42 @@ pgarch_archiveXlog(char *xlog) if (WIFEXITED(rc)) { ereport(lev, - (errmsg("archive command failed with exit code %d", WEXITSTATUS(rc)), - errdetail("The failed archive command was: %s", xlogarchcmd))); + (errmsg("archive command failed with exit code %d", + WEXITSTATUS(rc)), + errdetail("The failed archive command was: %s", + xlogarchcmd))); } else if (WIFSIGNALED(rc)) { - ereport(lev, ( #if defined(WIN32) - errmsg("archive command was terminated by exception 0x%X", WTERMSIG(rc)), - errhint("See C include file \"ntstatus.h\" for a description of the hexadecimal value."), + ereport(lev, + (errmsg("archive command was terminated by exception 0x%X", + WTERMSIG(rc)), + errhint("See C include file \"ntstatus.h\" for a description of the hexadecimal value."), + errdetail("The failed archive command was: %s", + xlogarchcmd))); #elif defined(HAVE_DECL_SYS_SIGLIST) && HAVE_DECL_SYS_SIGLIST - errmsg("archive command was terminated by signal %d: %s", - WTERMSIG(rc), - WTERMSIG(rc) < NSIG ? sys_siglist[WTERMSIG(rc)] : "(unknown)"), + ereport(lev, + (errmsg("archive command was terminated by signal %d: %s", + WTERMSIG(rc), + WTERMSIG(rc) < NSIG ? sys_siglist[WTERMSIG(rc)] : "(unknown)"), + errdetail("The failed archive command was: %s", + xlogarchcmd))); #else - errmsg("archive command was terminated by signal %d", WTERMSIG(exitstatus)), + ereport(lev, + (errmsg("archive command was terminated by signal %d", + WTERMSIG(rc)), + errdetail("The failed archive command was: %s", + xlogarchcmd))); #endif - errdetail("The failed archive command was: %s", xlogarchcmd))); } else { ereport(lev, - (errmsg("archive command exited with unrecognized status %d", rc), - errdetail("The failed archive command was: %s", xlogarchcmd))); + (errmsg("archive command exited with unrecognized status %d", + rc), + errdetail("The failed archive command was: %s", + xlogarchcmd))); } return false; |