aboutsummaryrefslogtreecommitdiff
path: root/src/backend/utils/error
diff options
context:
space:
mode:
Diffstat (limited to 'src/backend/utils/error')
-rw-r--r--src/backend/utils/error/elog.c17
-rw-r--r--src/backend/utils/error/exc.c4
-rw-r--r--src/backend/utils/error/format.c4
3 files changed, 14 insertions, 11 deletions
diff --git a/src/backend/utils/error/elog.c b/src/backend/utils/error/elog.c
index 36855ce6eb6..63fd69b10af 100644
--- a/src/backend/utils/error/elog.c
+++ b/src/backend/utils/error/elog.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/utils/error/elog.c,v 1.26 1998/02/11 19:12:50 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/utils/error/elog.c,v 1.27 1998/02/26 04:37:34 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -45,7 +45,7 @@ elog(int lev, const char *fmt,...)
va_list ap;
char buf[ELOG_MAXLEN],
line[ELOG_MAXLEN];
- char *bp;
+ char *bp;
const char *cp;
extern int errno,
sys_nerr;
@@ -162,10 +162,13 @@ elog(int lev, const char *fmt,...)
pq_putstr(line);
pq_flush();
}
- if (Pfout == NULL) {
- /* There is no socket. One explanation for this is we are running
- as the Postmaster. So we'll write the message to stderr.
- */
+ if (Pfout == NULL)
+ {
+
+ /*
+ * There is no socket. One explanation for this is we are running
+ * as the Postmaster. So we'll write the message to stderr.
+ */
fputs(line, stderr);
}
#endif /* !PG_STANDALONE */
@@ -177,7 +180,7 @@ elog(int lev, const char *fmt,...)
ProcReleaseSpins(NULL); /* get rid of spinlocks we hold */
if (!InError)
{
- kill(MyProcPid, 1); /* abort to traffic cop */
+ kill(MyProcPid, 1); /* abort to traffic cop */
pause();
}
diff --git a/src/backend/utils/error/exc.c b/src/backend/utils/error/exc.c
index 0851a92a5d7..ee79fa98142 100644
--- a/src/backend/utils/error/exc.c
+++ b/src/backend/utils/error/exc.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/utils/error/Attic/exc.c,v 1.19 1998/02/11 19:12:52 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/utils/error/Attic/exc.c,v 1.20 1998/02/26 04:37:35 momjian Exp $
*
* NOTE
* XXX this code needs improvement--check for state violations and
@@ -179,7 +179,7 @@ ExcRaise(Exception *excP,
ExcData data,
ExcMessage message)
{
- ExcFrame *efp;
+ ExcFrame *efp;
efp = ExcCurFrameP;
if (efp == NULL)
diff --git a/src/backend/utils/error/format.c b/src/backend/utils/error/format.c
index 384da49a6f5..e76f78cbca9 100644
--- a/src/backend/utils/error/format.c
+++ b/src/backend/utils/error/format.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/utils/error/Attic/format.c,v 1.5 1997/09/08 02:31:32 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/utils/error/Attic/format.c,v 1.6 1998/02/26 04:37:36 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -25,7 +25,7 @@ static char FormBuf[FormMaxSize];
* form
* ----------------
*/
-char *
+char *
form(const char *fmt,...)
{
va_list args;