From 77d31cf3c17070c38b6536fc8b8f264525930cda Mon Sep 17 00:00:00 2001
From: Bruce Momjian <bruce@momjian.us>
Date: Sun, 13 Feb 2000 13:21:11 +0000
Subject: [PATCH] 2. trigger.c fails to compile due to a syntax error. It
contains a switch statement that has an empty default label. A label of
a switch statement must be followed by a statement (or a label which
is followed by a statement (or a label which ...)).
3. Files include stringinfo.h failed to compile. The macro,
'appendStringInfoCharMacro' is implemented with a '?:' operation
that returns a void expression for the true part and a char expresion
for the false part. Both the true and false parts of the '?:' oper-
ator must return the same type.
Billy G. Allie
---
src/backend/commands/trigger.c | 4 +---
src/include/lib/stringinfo.h | 4 ++--
2 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/src/backend/commands/trigger.c b/src/backend/commands/trigger.c
index ae0b57457a1..0b0b3cf2ece 100644
--- a/src/backend/commands/trigger.c
+++ b/src/backend/commands/trigger.c
@@ -7,7 +7,7 @@
* Portions Copyright (c) 1994, Regents of the University of California
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/commands/trigger.c,v 1.59 2000/02/06 10:19:45 wieck Exp $
+ * $Header: /cvsroot/pgsql/src/backend/commands/trigger.c,v 1.60 2000/02/13 13:21:10 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -1201,8 +1201,6 @@ deferredTriggerExecute(DeferredTriggerEvent event, int itemno)
SaveTriggerData.tg_trigger =
rel->trigdesc->tg_after_row[TRIGGER_EVENT_DELETE][itemno];
break;
-
- default:
}
/* ----------
diff --git a/src/include/lib/stringinfo.h b/src/include/lib/stringinfo.h
index 25b91b9c2dd..05ba4b58a17 100644
--- a/src/include/lib/stringinfo.h
+++ b/src/include/lib/stringinfo.h
@@ -10,7 +10,7 @@
* Portions Copyright (c) 1996-2000, PostgreSQL, Inc
* Portions Copyright (c) 1994, Regents of the University of California
*
- * $Id: stringinfo.h,v 1.16 2000/01/26 05:58:09 momjian Exp $
+ * $Id: stringinfo.h,v 1.17 2000/02/13 13:21:11 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -98,7 +98,7 @@ extern void appendStringInfoChar(StringInfo str, char ch);
#define appendStringInfoCharMacro(str,ch) \
(((str)->len + 1 >= (str)->maxlen) ? \
appendStringInfoChar(str, ch) : \
- ((str)->data[(str)->len] = (ch), (str)->data[++(str)->len] = '\0'))
+ (void)((str)->data[(str)->len] = (ch), (str)->data[++(str)->len] = '\0'))
/*------------------------
* appendBinaryStringInfo
--
GitLab