Commit e43dfad2 authored by Bruce Momjian's avatar Bruce Momjian

Remove ESCAPE_PATCH define

parent 7e42f481
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
* *
* *
* IDENTIFICATION * 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) ...@@ -137,11 +137,7 @@ scanstr(char *s)
} }
} }
default: default:
#ifdef ESCAPE_PATCH
newStr[j] = s[i]; newStr[j] = s[i];
#else
elog (WARN, "Bad escape sequence, s[i] = %d", s[i]);
#endif
} /* switch */ } /* switch */
} /* s[i] == '\\' */ } /* s[i] == '\\' */
else else
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
* *
* *
* IDENTIFICATION * 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) ...@@ -227,14 +227,12 @@ _ArrayCount(char *str, int dim[], int typdelim)
bool done = false; bool done = false;
while (!done) { while (!done) {
switch (*q) { switch (*q) {
#ifdef ESCAPE_PATCH
case '\\': case '\\':
/* skip escaped characters (\ and ") inside strings */ /* skip escaped characters (\ and ") inside strings */
if (scanning_string && *(q+1)) { if (scanning_string && *(q+1)) {
q++; q++;
} }
break; break;
#endif
case '\0': case '\0':
/* Signal a premature end of the string. DZ - 2-9-1996 */ /* Signal a premature end of the string. DZ - 2-9-1996 */
elog(WARN, "malformed array constant: %s", str); elog(WARN, "malformed array constant: %s", str);
......
...@@ -180,7 +180,6 @@ ...@@ -180,7 +180,6 @@
/* found in src/backend/utils/adt/arrayfuncs.c */ /* found in src/backend/utils/adt/arrayfuncs.c */
/* #define LOARRAY */ /* #define LOARRAY */
#define ESCAPE_PATCH
#define ARRAY_PATCH #define ARRAY_PATCH
#define NULL_PATCH #define NULL_PATCH
#define OPENLINK_PATCHES #define OPENLINK_PATCHES
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment