88 *
99 *
1010 * IDENTIFICATION
11- * $Header: /cvsroot/pgsql/src/backend/parser/scansup.c,v 1.4 1996/11/04 04:04:58 momjian Exp $
11+ * $Header: /cvsroot/pgsql/src/backend/parser/scansup.c,v 1.5 1996/11/15 18:38:55 momjian Exp $
1212 *
1313 *-------------------------------------------------------------------------
1414 */
2323#include "utils/elog.h"
2424#include "parser/scansup.h"
2525
26- /*
27- *Scanner error handler.
28- */
29- static void
30- serror (char * str )
31- {
32- elog (WARN ,"*** scanner error: %s\n" ,str );
33- }
34-
3526/* ----------------
3627 *scanstr
3728 *
@@ -51,31 +42,14 @@ char*
5142scanstr (char * s )
5243{
5344static char newStr [MAX_PARSE_BUFFER ];
54- int len ,i ,start ,j ;
55- char delimiter ;
45+ int len ,i ,j ;
5646
5747if (s == NULL || s [0 ]== '\0' )
5848return s ;
5949
6050len = strlen (s );
61- start = 0 ;
62-
63- /* remove leading and trailing quotes, if any */
64- /* the normal backend lexer only accepts single quotes, but the
65- bootstrap lexer accepts double quotes */
66- delimiter = 0 ;
67- if (s [0 ]== '"' || s [0 ]== '\'' ){
68- delimiter = s [0 ];
69- start = 1 ;
70- }
71- if (delimiter != 0 ) {
72- if (s [len - 1 ]== delimiter )
73- len = len - 1 ;
74- else
75- serror ("mismatched quote delimiters" );
76- }
7751
78- for (i = start ,j = 0 ;i < len ;i ++ ) {
52+ for (i = 0 ,j = 0 ;i < len ;i ++ ) {
7953if (s [i ]== '\'' ) {
8054i = i + 1 ;
8155if (s [i ]== '\'' )