]> granicus.if.org Git - postgresql/commitdiff
Suppress compiler warning, and not incidentally make the code more
authorTom Lane <tgl@sss.pgh.pa.us>
Fri, 18 Jul 2008 04:20:24 +0000 (04:20 +0000)
committerTom Lane <tgl@sss.pgh.pa.us>
Fri, 18 Jul 2008 04:20:24 +0000 (04:20 +0000)
robust.  The previous coding was quite risky because it was testing
conditions different from 'is the array really allocated?'.

src/bin/psql/describe.c

index 0a0819cc02992eb972a663d924697d2be1029e23..137ea6c2d4454fb5297c624e9aa8d382500529ee 100644 (file)
@@ -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 @@ error_return:
        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);