From d059f789de8c289a9cded3e825abb3c53c7d239e Mon Sep 17 00:00:00 2001
From: Stephane Carrez <stcarrez@nerim.fr>
Date: Sun, 25 Aug 2002 10:04:08 +0000
Subject: [PATCH] 	* tuiStack.h (tuiGetLocatorFilename): Don't declare. 
 (tuiUpdateLocatorDisplay): Likewise. 	* tuiStack.c (tuiGetLocatorFilename):
 Remove. 	(tuiShowFrameInfo): Use tuiSetLocatorContent and
 tuiShowLocatorContent 	instead of tuiUpdateLocatorDisplay. 
 (tuiUpdateLocatorDisplay): Remove.

---
 gdb/tui/ChangeLog  |  9 +++++++++
 gdb/tui/tuiStack.c | 47 ++++------------------------------------------
 gdb/tui/tuiStack.h |  2 --
 3 files changed, 13 insertions(+), 45 deletions(-)

diff --git a/gdb/tui/ChangeLog b/gdb/tui/ChangeLog
index e571440da8..37fb3f88ae 100644
--- a/gdb/tui/ChangeLog
+++ b/gdb/tui/ChangeLog
@@ -1,3 +1,12 @@
+2002-08-25  Stephane Carrez  <stcarrez@nerim.fr>
+
+	* tuiStack.h (tuiGetLocatorFilename): Don't declare.
+	(tuiUpdateLocatorDisplay): Likewise.
+	* tuiStack.c (tuiGetLocatorFilename): Remove.
+	(tuiShowFrameInfo): Use tuiSetLocatorContent and tuiShowLocatorContent
+	instead of tuiUpdateLocatorDisplay.
+	(tuiUpdateLocatorDisplay): Remove.
+
 2002-08-25  Stephane Carrez  <stcarrez@nerim.fr>
 
 	* tuiStack.h (tuiClearLocatorDisplay): Don't declare.
diff --git a/gdb/tui/tuiStack.c b/gdb/tui/tuiStack.c
index 5ceecaf05a..e2c8a2717f 100644
--- a/gdb/tui/tuiStack.c
+++ b/gdb/tui/tuiStack.c
@@ -187,32 +187,6 @@ tuiSwitchFilename (char *fileName)
   return;
 }				/* tuiSwitchFilename */
 
-
-/*
-   ** tuiGetLocatorFilename().
-   **   Get the filename portion of the locator.
-   ** (elz)
- */
-void
-tuiGetLocatorFilename (TuiGenWinInfoPtr locator, char **filename)
-{
-
-  /* the current filename could be non known, in which case the xmalloc would
-     allocate no memory, because the length would be 0 */
-  if (((TuiWinElementPtr) locator->content[0])->whichElement.locator.fileName)
-    {
-      int name_length =
-      strlen (((TuiWinElementPtr) locator->content[0])->whichElement.locator.fileName);
-
-      (*filename) = (char *) xmalloc (name_length + 1);
-      strcpy ((*filename),
-	      ((TuiWinElementPtr) locator->content[0])->whichElement.locator.fileName);
-    }
-
-  return;
-}				/* tuiGetLocatorFilename */
-
-
 /*
    ** tuiUpdateLocatorInfoFromFrame().
    **        Function to update the locator, with the information extracted from frameInfo
@@ -278,21 +252,6 @@ tuiSetLocatorContent (struct frame_info *frameInfo)
   return;
 }				/* tuiSetLocatorContent */
 
-
-/*
-   ** tuiUpdateLocatorDisplay().
-   **        Function to update the locator display
- */
-void
-tuiUpdateLocatorDisplay (struct frame_info *frameInfo)
-{
-  tuiSetLocatorContent (frameInfo);
-  tuiShowLocatorContent ();
-
-  return;
-}				/* tuiUpdateLocatorDisplay */
-
-
 /*
    ** tuiShowFrameInfo().
    **        Function to print the frame inforrmation for the TUI.
@@ -318,7 +277,8 @@ tuiShowFrameInfo (struct frame_info *fi)
 
       startLine = 0;
       sourceAlreadyDisplayed = tuiSourceIsDisplayed (s->filename);
-      tuiUpdateLocatorDisplay (fi);
+      tuiSetLocatorContent (fi);
+      tuiShowLocatorContent ();
       for (i = 0; i < (sourceWindows ())->count; i++)
 	{
 	  TuiWhichElement *item;
@@ -373,7 +333,8 @@ tuiShowFrameInfo (struct frame_info *fi)
     }
   else
     {
-      tuiUpdateLocatorDisplay (fi);
+      tuiSetLocatorContent (fi);
+      tuiShowLocatorContent ();
       for (i = 0; i < (sourceWindows ())->count; i++)
 	{
 	  winInfo = (TuiWinInfoPtr) (sourceWindows ())->list[i];
diff --git a/gdb/tui/tuiStack.h b/gdb/tui/tuiStack.h
index 7667420177..0ffb68f3e6 100644
--- a/gdb/tui/tuiStack.h
+++ b/gdb/tui/tuiStack.h
@@ -30,13 +30,11 @@ extern void tuiSetLocatorInfo (char *, char *, int, CORE_ADDR,
 extern void tuiUpdateLocatorFilename (const char *);
 extern void tuiUpdateLocatorInfoFromFrame
   (struct frame_info *, TuiLocatorElementPtr);
-extern void tuiUpdateLocatorDisplay (struct frame_info *);
 extern void tuiSetLocatorContent (struct frame_info *);
 extern void tuiShowLocatorContent (void);
 extern void tuiClearLocatorContent (void);
 extern void tuiSwitchFilename (char *);
 extern void tuiShowFrameInfo (struct frame_info *);
-extern void tuiGetLocatorFilename (TuiGenWinInfoPtr, char **);
 
 
 #endif