Suppress compiler warning, and not incidentally make the code more

tglsfdc · tglsfdc · commit a4775a80fd44 · 2008-07-18T04:20:24.000Z
robust.  The previous coding was quite risky because it was testing
conditions different from 'is the array really allocated?'.
diff --git a/src/bin/psql/describe.c b/src/bin/psql/describe.c
@@ -8,7 +8,7 @@
  *
  * Copyright (c) 2000-2008, PostgreSQL Global Development Group
  *
- * $PostgreSQL: pgsql/src/bin/psql/describe.c,v 1.183 2008/07/18 03:32:52 tgl Exp $
+ * $PostgreSQL: pgsql/src/bin/psql/describe.c,v 1.184 2008/07/18 04:20:24 tgl Exp $
  */
 #include "postgres_fe.h"
 
@@ -1591,14 +1591,14 @@ describeOneTableDetails(const char *schemaname,
 	termPQExpBuffer(&title);
 	termPQExpBuffer(&tmpbuf);
 	
-	if (tableinfo.relkind == 'S')
+	if (seq_values)
 	{
 		for (ptr = seq_values; *ptr; ptr++)
 			free(*ptr);
 		free(seq_values);
 	}
     
-	if (show_modifiers)
+	if (modifiers)
 	{
 		for (ptr = modifiers; *ptr; ptr++)
 			free(*ptr);

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`*`
`9`	`9`	`* Copyright (c) 2000-2008, PostgreSQL Global Development Group`
`10`	`10`	`*`
`11`		`- * $PostgreSQL: pgsql/src/bin/psql/describe.c,v 1.183 2008/07/18 03:32:52 tgl Exp $`
	`11`	`+ * $PostgreSQL: pgsql/src/bin/psql/describe.c,v 1.184 2008/07/18 04:20:24 tgl Exp $`
`12`	`12`	`*/`
`13`	`13`	`#include "postgres_fe.h"`
`14`	`14`
`@@ -1591,14 +1591,14 @@ describeOneTableDetails(const char *schemaname,`
`1591`	`1591`	`termPQExpBuffer(&title);`
`1592`	`1592`	`termPQExpBuffer(&tmpbuf);`
`1593`	`1593`
`1594`		`- if (tableinfo.relkind == 'S')`
	`1594`	`+ if (seq_values)`
`1595`	`1595`	`{`
`1596`	`1596`	`for (ptr = seq_values; *ptr; ptr++)`
`1597`	`1597`	`free(*ptr);`
`1598`	`1598`	`free(seq_values);`
`1599`	`1599`	`}`
`1600`	`1600`
`1601`		`- if (show_modifiers)`
	`1601`	`+ if (modifiers)`
`1602`	`1602`	`{`
`1603`	`1603`	`for (ptr = modifiers; *ptr; ptr++)`
`1604`	`1604`	`free(*ptr);`