The last patch fixes some incongruences in the #define used to compile the

scrappy · scrappy · commit fdaf47f9f44c · 1997-01-23T19:47:18.000Z
Tcl arrays support. Here are the correct values to be defined in config.h
and pgtclCmds.c.

Submitted by: Massimo Dal Zotto &lt;dz@cs.unitn.it&gt;
diff --git a/src/include/config.h b/src/include/config.h
@@ -318,7 +318,7 @@ typedef unsigned char slock_t;
  * of postgres C-like arrays, for example {{"a1" "a2"} {"b1" "b2"}} instead 
  * of {{"a1","a2"},{"b1","b2"}}.
  */
-#define TCL_ARRAY
+#define TCL_ARRAYS
 
 /*
  * The comparison routines for text and char data type give incorrect results
diff --git a/src/interfaces/libpgtcl/pgtclCmds.c b/src/interfaces/libpgtcl/pgtclCmds.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/interfaces/libpgtcl/Attic/pgtclCmds.c,v 1.11 1997/01/11 14:28:51 scrappy Exp $
+ *    $Header: /cvsroot/pgsql/src/interfaces/libpgtcl/Attic/pgtclCmds.c,v 1.12 1997/01/23 19:47:18 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -43,7 +43,7 @@ translate_escape(char *p, int isArray)
 {
     register char c, *q, *s;
 
-#ifdef DEBUG_ESCAPE
+#ifdef TCL_ARRAYS_DEBUG_ESCAPE
     printf("   escape = '%s'\n", p);
 #endif
     /* Address of the first character after the escape sequence */
@@ -125,7 +125,7 @@ translate_escape(char *p, int isArray)
 	*q++ = *s++;
     }
     *q = '\0';
-#ifdef DEBUG_ESCAPE
+#ifdef TCL_ARRAYS_DEBUG_ESCAPE
     printf("   after  = '%s'\n", p);
 #endif
     return p;
@@ -143,13 +143,13 @@ static char *
 tcl_value (char *value)
 {
     int literal, last;
-    register char c, *p, *q, *s;
+    register char *p;
 
     if (!value) {
 	return ((char *) NULL);
     }
 
-#ifdef DEBUG
+#ifdef TCL_ARRAYS_DEBUG
     printf("pq_value  = '%s'\n", value);
 #endif
     last = strlen(value)-1;
@@ -202,7 +202,7 @@ tcl_value (char *value)
 	    }
 	}
     }
-#ifdef DEBUG
+#ifdef TCL_ARRAYS_DEBUG
     printf("tcl_value = '%s'\n\n", value);
 #endif
     return (value);

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`*`
`8`	`8`	`*`
`9`	`9`	`* IDENTIFICATION`
`10`		`- * $Header: /cvsroot/pgsql/src/interfaces/libpgtcl/Attic/pgtclCmds.c,v 1.11 1997/01/11 14:28:51 scrappy Exp $`
	`10`	`+ * $Header: /cvsroot/pgsql/src/interfaces/libpgtcl/Attic/pgtclCmds.c,v 1.12 1997/01/23 19:47:18 scrappy Exp $`
`11`	`11`	`*`
`12`	`12`	`*-------------------------------------------------------------------------`
`13`	`13`	`*/`
`@@ -43,7 +43,7 @@ translate_escape(char *p, int isArray)`
`43`	`43`	`{`
`44`	`44`	`register char c, q, s;`
`45`	`45`
`46`		`-#ifdef DEBUG_ESCAPE`
	`46`	`+#ifdef TCL_ARRAYS_DEBUG_ESCAPE`
`47`	`47`	`printf(" escape = '%s'\n", p);`
`48`	`48`	`#endif`
`49`	`49`	`/* Address of the first character after the escape sequence */`
`@@ -125,7 +125,7 @@ translate_escape(char *p, int isArray)`
`125`	`125`	`q++ = s++;`
`126`	`126`	`}`
`127`	`127`	`*q = '\0';`
`128`		`-#ifdef DEBUG_ESCAPE`
	`128`	`+#ifdef TCL_ARRAYS_DEBUG_ESCAPE`
`129`	`129`	`printf(" after = '%s'\n", p);`
`130`	`130`	`#endif`
`131`	`131`	`return p;`
`@@ -143,13 +143,13 @@ static char *`
`143`	`143`	`tcl_value (char *value)`
`144`	`144`	`{`
`145`	`145`	`int literal, last;`
`146`		`- register char c, p, q, *s;`
	`146`	`+ register char *p;`
`147`	`147`
`148`	`148`	`if (!value) {`
`149`	`149`	`return ((char *) NULL);`
`150`	`150`	`}`
`151`	`151`
`152`		`-#ifdef DEBUG`
	`152`	`+#ifdef TCL_ARRAYS_DEBUG`
`153`	`153`	`printf("pq_value = '%s'\n", value);`
`154`	`154`	`#endif`
`155`	`155`	`last = strlen(value)-1;`
`@@ -202,7 +202,7 @@ tcl_value (char *value)`
`202`	`202`	`}`
`203`	`203`	`}`
`204`	`204`	`}`
`205`		`-#ifdef DEBUG`
	`205`	`+#ifdef TCL_ARRAYS_DEBUG`
`206`	`206`	`printf("tcl_value = '%s'\n\n", value);`
`207`	`207`	`#endif`
`208`	`208`	`return (value);`