summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBruce Momjian1996-11-04 04:05:16 +0000
committerBruce Momjian1996-11-04 04:05:16 +0000
commite43dfad289679ba11455dc4f4141dc385f71df4e (patch)
treee7f92ef0b569ea133340eea1990fcdfdae597728
parent7e42f4814d4914cb2be1cbe042cce547109dd6ce (diff)
Remove ESCAPE_PATCH define
-rw-r--r--src/backend/parser/scansup.c6
-rw-r--r--src/backend/utils/adt/arrayfuncs.c4
-rw-r--r--src/include/config.h1
3 files changed, 2 insertions, 9 deletions
diff --git a/src/backend/parser/scansup.c b/src/backend/parser/scansup.c
index 55ce8de69b6..a33cd41091c 100644
--- a/src/backend/parser/scansup.c
+++ b/src/backend/parser/scansup.c
@@ -8,7 +8,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/parser/scansup.c,v 1.3 1996/08/27 07:42:29 scrappy Exp $
+ * $Header: /cvsroot/pgsql/src/backend/parser/scansup.c,v 1.4 1996/11/04 04:04:58 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -137,11 +137,7 @@ scanstr(char *s)
}
}
default:
-#ifdef ESCAPE_PATCH
newStr[j] = s[i];
-#else
- elog (WARN, "Bad escape sequence, s[i] = %d", s[i]);
-#endif
} /* switch */
} /* s[i] == '\\' */
else
diff --git a/src/backend/utils/adt/arrayfuncs.c b/src/backend/utils/adt/arrayfuncs.c
index f3a7d5c3809..d7955cc28d7 100644
--- a/src/backend/utils/adt/arrayfuncs.c
+++ b/src/backend/utils/adt/arrayfuncs.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/utils/adt/arrayfuncs.c,v 1.5 1996/09/19 20:04:56 scrappy Exp $
+ * $Header: /cvsroot/pgsql/src/backend/utils/adt/arrayfuncs.c,v 1.6 1996/11/04 04:05:10 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -227,14 +227,12 @@ _ArrayCount(char *str, int dim[], int typdelim)
bool done = false;
while (!done) {
switch (*q) {
-#ifdef ESCAPE_PATCH
case '\\':
/* skip escaped characters (\ and ") inside strings */
if (scanning_string && *(q+1)) {
q++;
}
break;
-#endif
case '\0':
/* Signal a premature end of the string. DZ - 2-9-1996 */
elog(WARN, "malformed array constant: %s", str);
diff --git a/src/include/config.h b/src/include/config.h
index 3698a25844e..0c0509858c6 100644
--- a/src/include/config.h
+++ b/src/include/config.h
@@ -180,7 +180,6 @@
/* found in src/backend/utils/adt/arrayfuncs.c */
/* #define LOARRAY */
-#define ESCAPE_PATCH
#define ARRAY_PATCH
#define NULL_PATCH
#define OPENLINK_PATCHES