2004-01-28 Andrew Cagney <cagney@redhat.com>

	* tui/tui-stack.h: Update copyright.
	(struct frame_info): Add opaque declaration.
	(tui_update_locator_filename): Rename tuiUpdateLocatorFilename.
	(tui_show_locator_content): Rename tuiShowLocatorContent.
	(tui_show_frame_info): Rename tuiShowFrameInfo.
	* tui/tui-stack.c: Update copyright.  Update references.
	* tui/tui-winsource.c: Update references.
	* tui/tui-win.c: Update references.
	* tui/tui-layout.c: Update references.
	* tui/tui-hooks.c: Update copyright, update references.
	* tui/tui.c: Update copyright, update references.
	* tui/tui-disasm.c: Update references.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 22ccff3ac6b040bb42df950df883b333ea7162e6..52cff4b769337d4fbedb89d9b0ce6f197aced61c 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,18 @@
+2004-01-28  Andrew Cagney  <cagney@redhat.com>
+
+       * tui/tui-stack.h: Update copyright.
+       (struct frame_info): Add opaque declaration.
+       (tui_update_locator_filename): Rename tuiUpdateLocatorFilename.
+       (tui_show_locator_content): Rename tuiShowLocatorContent.
+       (tui_show_frame_info): Rename tuiShowFrameInfo.
+       * tui/tui-stack.c: Update copyright.  Update references.
+       * tui/tui-winsource.c: Update references.
+       * tui/tui-win.c: Update references.
+       * tui/tui-layout.c: Update references.
+       * tui/tui-hooks.c: Update copyright, update references.
+       * tui/tui.c: Update copyright, update references.
+       * tui/tui-disasm.c: Update references.
+
 2004-01-28  David Carlton  <carlton@kealia.com>
 
        * dwarf2read.c (add_partial_structure): Use demangled name if

diff --git a/gdb/tui/tui-disasm.c b/gdb/tui/tui-disasm.c
index 493c00ded6889c110440ab4f129015545578c6f8..7b12275c9f9be373b47059c5814b7e366da8ac0b 100644 (file)
--- a/gdb/tui/tui-disasm.c
+++ b/gdb/tui/tui-disasm.c
@@ -313,10 +313,10 @@ tui_show_disassem_and_update_source (CORE_ADDR startAddr)
       if (sal.symtab)
        {
          set_current_source_symtab_and_line (&sal);
-         tuiUpdateLocatorFilename (sal.symtab->filename);
+         tui_update_locator_filename (sal.symtab->filename);
        }
       else
-       tuiUpdateLocatorFilename ("?");
+       tui_update_locator_filename ("?");
     }
 
   return;

diff --git a/gdb/tui/tui-hooks.c b/gdb/tui/tui-hooks.c
index f0f2060d87b27422e6a063d4898b1d619b0fd4b5..a8f08eefc5339896999b8fc581de479c8794def3 100644 (file)
--- a/gdb/tui/tui-hooks.c
+++ b/gdb/tui/tui-hooks.c
@@ -1,6 +1,6 @@
 /* GDB hooks for TUI.
 
-   Copyright 2001, 2002, 2003 Free Software Foundation, Inc.
+   Copyright 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
 
    This file is part of GDB.
 
@@ -250,7 +250,7 @@ tui_selected_frame_level_changed_hook (int level)
         select_source_symtab (s);
 
       /* Display the frame position (even if there is no symbols).  */
-      tuiShowFrameInfo (fi);
+      tui_show_frame_info (fi);
 
       /* Refresh the register window if it's visible.  */
       if (tui_is_window_visible (DATA_WIN))
@@ -268,7 +268,7 @@ tui_print_frame_info_listing_hook (struct symtab *s, int line,
                                    int stopline, int noerror)
 {
   select_source_symtab (s);
-  tuiShowFrameInfo (deprecated_selected_frame);
+  tui_show_frame_info (deprecated_selected_frame);
 }
 
 /* Called when the target process died or is detached.
@@ -276,7 +276,7 @@ tui_print_frame_info_listing_hook (struct symtab *s, int line,
 static void
 tui_detach_hook (void)
 {
-  tuiShowFrameInfo (0);
+  tui_show_frame_info (0);
   tui_display_main ();
 }
 

diff --git a/gdb/tui/tui-layout.c b/gdb/tui/tui-layout.c
index 38d8de57a00c97329e3aa15fd9ade42b2b5c6cc6..249f5d766090d7c2a05dbcf84503a0c4d0b037bc 100644 (file)
--- a/gdb/tui/tui-layout.c
+++ b/gdb/tui/tui-layout.c
@@ -842,7 +842,7 @@ _showSourceDisassemCommand (void)
              srcWin->detail.sourceInfo.hasLocator = FALSE;
              disassemWin->detail.sourceInfo.hasLocator = TRUE;
              m_beVisible (locator);
-             tuiShowLocatorContent ();
+             tui_show_locator_content ();
              tuiShowSourceContent (disassemWin);
 
              if (m_winPtrIsNull (cmdWin))
@@ -933,7 +933,7 @@ _showData (TuiLayoutType newLayout)
     }
   winList[winType]->detail.sourceInfo.hasLocator = TRUE;
   m_beVisible (locator);
-  tuiShowLocatorContent ();
+  tui_show_locator_content ();
   addToSourceWindows (winList[winType]);
   setCurrentLayoutTo (newLayout);
 
@@ -1113,7 +1113,7 @@ _showSourceOrDisassemAndCommand (TuiLayoutType layoutType)
        {
          (*winInfoPtr)->detail.sourceInfo.hasLocator = TRUE;
          m_beVisible (locator);
-         tuiShowLocatorContent ();
+         tui_show_locator_content ();
          tuiShowSourceContent (*winInfoPtr);
 
          if (m_winPtrIsNull (cmdWin))

diff --git a/gdb/tui/tui-stack.c b/gdb/tui/tui-stack.c
index 6bf64bb4b19a09e4c3248d204cb177824d2c2314..c7210a1f566200d3a6690c63a0dd42ee9770f2fa 100644 (file)
--- a/gdb/tui/tui-stack.c
+++ b/gdb/tui/tui-stack.c
@@ -1,7 +1,7 @@
 /* TUI display locator.
 
-   Copyright 1998, 1999, 2000, 2001, 2002, 2003 Free Software Foundation,
-   Inc.
+   Copyright 1998, 1999, 2000, 2001, 2002, 2003, 2004 Free Software
+   Foundation, Inc.
 
    Contributed by Hewlett-Packard Company.
 
@@ -244,11 +244,9 @@ tui_get_function_from_frame (struct frame_info *fi)
   return name;
 }
 
-/*
-   ** tuiShowLocatorContent()
- */
+/* tuiShowLocatorContent().   */
 void
-tuiShowLocatorContent (void)
+tui_show_locator_content (void)
 {
   char *string;
   TuiGenWinInfoPtr locator;
@@ -318,15 +316,15 @@ tui_set_locator_info (const char *filename, const char *procname, int lineno,
 
 /* Update only the filename portion of the locator.  */
 void
-tuiUpdateLocatorFilename (const char *filename)
+tui_update_locator_filename (const char *filename)
 {
   tui_set_locator_filename (filename);
-  tuiShowLocatorContent ();
+  tui_show_locator_content ();
 }
 
 /* Function to print the frame information for the TUI.  */
 void
-tuiShowFrameInfo (struct frame_info *fi)
+tui_show_frame_info (struct frame_info *fi)
 {
   TuiWinInfoPtr winInfo;
   register int i;
@@ -347,7 +345,7 @@ tuiShowFrameInfo (struct frame_info *fi)
                             tui_get_function_from_frame (fi),
                             sal.line,
                             get_frame_pc (fi));
-      tuiShowLocatorContent ();
+      tui_show_locator_content ();
       startLine = 0;
       for (i = 0; i < (sourceWindows ())->count; i++)
        {
@@ -405,7 +403,7 @@ tuiShowFrameInfo (struct frame_info *fi)
   else
     {
       tui_set_locator_info (NULL, NULL, 0, (CORE_ADDR) 0);
-      tuiShowLocatorContent ();
+      tui_show_locator_content ();
       for (i = 0; i < (sourceWindows ())->count; i++)
        {
          winInfo = (TuiWinInfoPtr) (sourceWindows ())->list[i];

diff --git a/gdb/tui/tui-stack.h b/gdb/tui/tui-stack.h
index 14be4974bedd7ea8c7fa40edc71cf69653a99478..65725b3fd2fa373f4fab96b6ef002fb4284b2ef5 100644 (file)
--- a/gdb/tui/tui-stack.h
+++ b/gdb/tui/tui-stack.h
@@ -1,5 +1,8 @@
 /* TUI display locator.
-   Copyright 1998, 1999, 2000, 2001, 2002 Free Software Foundation, Inc.
+
+   Copyright 1998, 1999, 2000, 2001, 2002, 2004 Free Software
+   Foundation, Inc.
+
    Contributed by Hewlett-Packard Company.
 
    This file is part of GDB.
@@ -19,15 +22,13 @@
    Foundation, Inc., 59 Temple Place - Suite 330,
    Boston, MA 02111-1307, USA.  */
 
-#ifndef _TUI_STACK_H
-#define _TUI_STACK_H
-/*
-   ** This header file supports
- */
+#ifndef TUI_STACK_H
+#define TUI_STACK_H
+
+struct frame_info;
 
-extern void tuiUpdateLocatorFilename (const char *);
-extern void tuiShowLocatorContent (void);
-extern void tuiShowFrameInfo (struct frame_info *);
+extern void tui_update_locator_filename (const char *);
+extern void tui_show_locator_content (void);
+extern void tui_show_frame_info (struct frame_info *);
 
 #endif
-/*_TUI_STACK_H*/

diff --git a/gdb/tui/tui-win.c b/gdb/tui/tui-win.c
index a7d35ce93f48f3d935c15d8efbd6f9e9f1310b9b..fa9f57453b7f02fce97d47acf08aa411ea458488 100644 (file)
--- a/gdb/tui/tui-win.c
+++ b/gdb/tui/tui-win.c
@@ -615,7 +615,7 @@ tuiRefreshAll (void)
            }
        }
     }
-  tuiShowLocatorContent ();
+  tui_show_locator_content ();
 }
 
 
@@ -1410,7 +1410,7 @@ _makeVisibleWithNewHeight (TuiWinInfoPtr winInfo)
       if (m_hasLocator (winInfo))
        {
          m_beVisible (locatorWinInfoPtr ());
-         tuiShowLocatorContent ();
+         tui_show_locator_content ();
        }
       break;
     case DATA_WIN:

diff --git a/gdb/tui/tui-winsource.c b/gdb/tui/tui-winsource.c
index 87609b4cde8b0002623a86684dbd18d2a393463c..e4f620ad9738ed705388c4f8e46c0f0f3ea93ba7 100644 (file)
--- a/gdb/tui/tui-winsource.c
+++ b/gdb/tui/tui-winsource.c
@@ -63,9 +63,9 @@ tui_display_main (void)
          tuiUpdateSourceWindowsWithAddr (addr);
          sal = find_pc_line (addr, 0);
           if (sal.symtab)
-             tuiUpdateLocatorFilename (sal.symtab->filename);
+             tui_update_locator_filename (sal.symtab->filename);
           else
-             tuiUpdateLocatorFilename ("??");
+             tui_update_locator_filename ("??");
        }
     }
 }

diff --git a/gdb/tui/tui.c b/gdb/tui/tui.c
index 74fd7ae51ea70eba0b834a8f1d3441228f1134e0..83ac52b6edf8ef54520f88bc367deb32ce02a3dc 100644 (file)
--- a/gdb/tui/tui.c
+++ b/gdb/tui/tui.c
@@ -1,7 +1,7 @@
 /* General functions for the WDB TUI.
 
-   Copyright 1998, 1999, 2000, 2001, 2002, 2003 Free Software Foundation,
-   Inc.
+   Copyright 1998, 1999, 2000, 2001, 2002, 2003, 2004 Free Software
+   Foundation, Inc.
 
    Contributed by Hewlett-Packard Company.
 
@@ -299,7 +299,7 @@ tui_set_key_mode (enum tui_key_mode mode)
   tui_current_key_mode = mode;
   rl_set_keymap (mode == tui_single_key_mode
                  ? tui_keymap : tui_readline_standard_keymap);
-  tuiShowLocatorContent ();
+  tui_show_locator_content ();
 }
 
 /* Initialize readline and configure the keymap for the switching
@@ -388,7 +388,7 @@ tui_enable (void)
       setTermWidthTo (COLS);
       def_prog_mode ();
 
-      tuiShowFrameInfo (0);
+      tui_show_frame_info (0);
       tui_set_layout (SRC_COMMAND, TUI_UNDEFINED_REGS);
       tuiSetWinFocusTo (srcWin);
       keypad (cmdWin->generic.handle, TRUE);
@@ -413,7 +413,7 @@ tui_enable (void)
 
   tui_active = 1;
   if (deprecated_selected_frame)
-     tuiShowFrameInfo (deprecated_selected_frame);
+     tui_show_frame_info (deprecated_selected_frame);
 
   /* Restore TUI keymap.  */
   tui_set_key_mode (tui_current_key_mode);
@@ -566,7 +566,7 @@ tui_show_source (const char *file, int line)
   tui_add_win_to_layout (SRC_WIN);
 
   tuiUpdateSourceWindowsWithLine (cursal.symtab, line);
-  tuiUpdateLocatorFilename (file);
+  tui_update_locator_filename (file);
 }
 
 void