Remove long-unused and broken TCL_ARRAYS.

alvherre · alvherre · commit 7157114d54d3 · 2008-02-29T20:58:33.000Z
diff --git a/src/backend/utils/adt/arrayfuncs.c b/src/backend/utils/adt/arrayfuncs.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/utils/adt/arrayfuncs.c,v 1.140 2008/01/01 19:45:52 momjian Exp $
+ *	  $PostgreSQL: pgsql/src/backend/utils/adt/arrayfuncs.c,v 1.141 2008/02/29 20:58:33 alvherre Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -1030,9 +1030,7 @@ array_out(PG_FUNCTION_ARGS)
 				if (ch == '"' || ch == '\\')
 				{
 					needquote = true;
-#ifndef TCL_ARRAYS
 					overall_length += 1;
-#endif
 				}
 				else if (ch == '{' || ch == '}' || ch == typdelim ||
 						 isspace((unsigned char) ch))
@@ -1103,7 +1101,6 @@ array_out(PG_FUNCTION_ARGS)
 		if (needquotes[k])
 		{
 			APPENDCHAR('"');
-#ifndef TCL_ARRAYS
 			for (tmp = values[k]; *tmp; tmp++)
 			{
 				char		ch = *tmp;
@@ -1113,9 +1110,6 @@ array_out(PG_FUNCTION_ARGS)
 				*p++ = ch;
 			}
 			*p = '\0';
-#else
-			APPENDSTR(values[k]);
-#endif
 			APPENDCHAR('"');
 		}
 		else
diff --git a/src/include/pg_config_manual.h b/src/include/pg_config_manual.h
@@ -6,7 +6,7 @@
  * for developers.	If you edit any of these, be sure to do a *full*
  * rebuild (and an initdb if noted).
  *
- * $PostgreSQL: pgsql/src/include/pg_config_manual.h,v 1.27 2007/06/08 18:23:53 tgl Exp $
+ * $PostgreSQL: pgsql/src/include/pg_config_manual.h,v 1.28 2008/02/29 20:58:33 alvherre Exp $
  *------------------------------------------------------------------------
  */
 
@@ -99,16 +99,6 @@
  */
 #define NUM_USER_DEFINED_LWLOCKS	4
 
-/*
- * Define this to make libpgtcl's "pg_result -assign" command process
- * C-style backslash sequences in returned tuple data and convert
- * PostgreSQL array values into Tcl lists.	CAUTION: This conversion
- * is *wrong* unless you install the routines in
- * contrib/string/string_io to make the server produce C-style
- * backslash sequences in the first place.
- */
-/* #define TCL_ARRAYS */
-
 /*
  * Define this if you want psql to _always_ ask for a username and a
  * password for password authentication.

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`*`
`9`	`9`	`*`
`10`	`10`	`* IDENTIFICATION`
`11`		`- * $PostgreSQL: pgsql/src/backend/utils/adt/arrayfuncs.c,v 1.140 2008/01/01 19:45:52 momjian Exp $`
	`11`	`+ * $PostgreSQL: pgsql/src/backend/utils/adt/arrayfuncs.c,v 1.141 2008/02/29 20:58:33 alvherre Exp $`
`12`	`12`	`*`
`13`	`13`	`*-------------------------------------------------------------------------`
`14`	`14`	`*/`
`@@ -1030,9 +1030,7 @@ array_out(PG_FUNCTION_ARGS)`
`1030`	`1030`	`if (ch == '"' \|\| ch == '\\')`
`1031`	`1031`	`{`
`1032`	`1032`	`needquote = true;`
`1033`		`-#ifndef TCL_ARRAYS`
`1034`	`1033`	`overall_length += 1;`
`1035`		`-#endif`
`1036`	`1034`	`}`
`1037`	`1035`	`else if (ch == '{' \|\| ch == '}' \|\| ch == typdelim \|\|`
`1038`	`1036`	`isspace((unsigned char) ch))`
`@@ -1103,7 +1101,6 @@ array_out(PG_FUNCTION_ARGS)`
`1103`	`1101`	`if (needquotes[k])`
`1104`	`1102`	`{`
`1105`	`1103`	`APPENDCHAR('"');`
`1106`		`-#ifndef TCL_ARRAYS`
`1107`	`1104`	`for (tmp = values[k]; *tmp; tmp++)`
`1108`	`1105`	`{`
`1109`	`1106`	`char ch = *tmp;`
`@@ -1113,9 +1110,6 @@ array_out(PG_FUNCTION_ARGS)`
`1113`	`1110`	`*p++ = ch;`
`1114`	`1111`	`}`
`1115`	`1112`	`*p = '\0';`
`1116`		`-#else`
`1117`		`- APPENDSTR(values[k]);`
`1118`		`-#endif`
`1119`	`1113`	`APPENDCHAR('"');`
`1120`	`1114`	`}`
`1121`	`1115`	`else`