From f6e0130b5bee398b68ed64144cd0a467e8b8713a Mon Sep 17 00:00:00 2001
From: Tom Lane <tgl@sss.pgh.pa.us>
Date: Sat, 2 Nov 2002 15:54:13 +0000
Subject: [PATCH] Clean up a few fprintf(stderr)'s that should be elog's.
---
src/backend/access/transam/xlog.c | 5 ++---
src/backend/executor/nodeSort.c | 4 ++--
src/backend/utils/init/findbe.c | 10 ++++------
3 files changed, 8 insertions(+), 11 deletions(-)
diff --git a/src/backend/access/transam/xlog.c b/src/backend/access/transam/xlog.c
index 6a3732c914b..6152ab88c1b 100644
--- a/src/backend/access/transam/xlog.c
+++ b/src/backend/access/transam/xlog.c
@@ -7,7 +7,7 @@
* Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group
* Portions Copyright (c) 1994, Regents of the University of California
*
- * $Header: /cvsroot/pgsql/src/backend/access/transam/xlog.c,v 1.108 2002/10/07 17:04:30 tgl Exp $
+ * $Header: /cvsroot/pgsql/src/backend/access/transam/xlog.c,v 1.109 2002/11/02 15:54:12 tgl Exp $
*
*-------------------------------------------------------------------------
*/
@@ -1206,13 +1206,12 @@ XLogFlush(XLogRecPtr record)
if (XLOG_DEBUG)
{
- elog(LOG, "XLogFlush%s%s: request %X/%X; write %X/%X; flush %X/%X\n",
+ elog(LOG, "XLogFlush%s%s: request %X/%X; write %X/%X; flush %X/%X",
(IsBootstrapProcessingMode()) ? "(bootstrap)" : "",
(InRedo) ? "(redo)" : "",
record.xlogid, record.xrecoff,
LogwrtResult.Write.xlogid, LogwrtResult.Write.xrecoff,
LogwrtResult.Flush.xlogid, LogwrtResult.Flush.xrecoff);
- fflush(stderr);
}
/* Disabled during REDO */
diff --git a/src/backend/executor/nodeSort.c b/src/backend/executor/nodeSort.c
index 6ce648e2b24..e12baeb76a3 100644
--- a/src/backend/executor/nodeSort.c
+++ b/src/backend/executor/nodeSort.c
@@ -8,7 +8,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/executor/nodeSort.c,v 1.36 2002/06/20 20:29:28 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/executor/nodeSort.c,v 1.37 2002/11/02 15:54:13 tgl Exp $
*
*-------------------------------------------------------------------------
*/
@@ -186,7 +186,7 @@ ExecSort(Sort *node)
* finally set the sorted flag to true
*/
sortstate->sort_Done = true;
- SO1_printf(stderr, "ExecSort: sorting done.\n");
+ SO1_printf("ExecSort: %s\n", "sorting done");
}
SO1_printf("ExecSort: %s\n",
diff --git a/src/backend/utils/init/findbe.c b/src/backend/utils/init/findbe.c
index 3c5e04055a5..ce5c521f3e0 100644
--- a/src/backend/utils/init/findbe.c
+++ b/src/backend/utils/init/findbe.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/utils/init/Attic/findbe.c,v 1.30 2002/09/04 20:31:31 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/utils/init/Attic/findbe.c,v 1.31 2002/11/02 15:54:13 tgl Exp $
*
*-------------------------------------------------------------------------
*/
@@ -174,8 +174,7 @@ FindExec(char *full_path, const char *argv0, const char *binary_name)
elog(DEBUG1, "FindExec: found \"%s\" using argv[0]", full_path);
return 0;
}
- fprintf(stderr, "FindExec: invalid binary \"%s\"\n",
- buf);
+ elog(LOG, "FindExec: invalid binary \"%s\"", buf);
return -1;
}
@@ -213,8 +212,7 @@ FindExec(char *full_path, const char *argv0, const char *binary_name)
case -1: /* wasn't even a candidate, keep looking */
break;
case -2: /* found but disqualified */
- fprintf(stderr, "FindExec: could not read binary \"%s\"\n",
- buf);
+ elog(LOG, "FindExec: could not read binary \"%s\"", buf);
free(path);
return -1;
}
@@ -224,6 +222,6 @@ FindExec(char *full_path, const char *argv0, const char *binary_name)
free(path);
}
- fprintf(stderr, "FindExec: could not find a %s to execute...\n", binary_name);
+ elog(LOG, "FindExec: could not find a %s to execute", binary_name);
return -1;
}
--
GitLab