2007-08-18 Michael Snyder <msnyder@svkmacdonelllnx>

	* ui-out.c (append_header_to_list): Possible cut and paste error.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 0dbf723d4543b8ca7ee2a7fc517fa85983373e8d..9c3b1118a4726778b2e69c369484d51abe63beb2 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,5 +1,7 @@
 2007-08-18  Michael Snyder  <msnyder@svkmacdonelllnx>
 
+       * ui-out.c (append_header_to_list): Possible cut and paste error.
+
        * MAINTAINERS: white space tweak.
 
 2007-08-17  Michael Snyder  <msnyder@access-company.com>

diff --git a/gdb/ui-out.c b/gdb/ui-out.c
index a85ca48ea6ee6adaa11436bc3f6ffb68146ebc01..a624e8fba1c1c16db883365676a58723b6679cda 100644 (file)
--- a/gdb/ui-out.c
+++ b/gdb/ui-out.c
@@ -1036,15 +1036,20 @@ append_header_to_list (struct ui_out *uiout,
   temphdr = XMALLOC (struct ui_out_hdr);
   temphdr->width = width;
   temphdr->alignment = alignment;
-  /* we have to copy the column title as the original may be an automatic */
+  /* We have to copy the column title as the original may be an
+     automatic.  */
   if (colhdr != NULL)
     temphdr->colhdr = xstrdup (colhdr);
   else
     temphdr->colhdr = NULL;
+
   if (col_name != NULL)
+    temphdr->col_name = xstrdup (col_name);
+  else if (colhdr != NULL)
     temphdr->col_name = xstrdup (colhdr);
   else
-    temphdr->col_name = xstrdup (colhdr);
+    temphdr->col_name = NULL;
+
   temphdr->next = NULL;
   if (uiout->table.header_first == NULL)
     {