From 0963fc96726f9fff7b5854ccfd4ba3acc95d18df Mon Sep 17 00:00:00 2001
From: Stephane Carrez <stcarrez@nerim.fr>
Date: Tue, 17 Jul 2001 21:37:18 +0000
Subject: [PATCH] 	* tuiWin.c (_tuiSetFocus): Replace subsetCompare with
 subset_compare. 	* tuiLayout.c (_tuiSetLayoutTo): Likewise. 	*
 tui.c (_tui_vToggle_command): Likewise.

---
 gdb/tui/ChangeLog   |  6 ++++++
 gdb/tui/tui.c       |  4 ++--
 gdb/tui/tuiLayout.c | 28 ++++++++++++++--------------
 gdb/tui/tuiWin.c    |  4 ++--
 4 files changed, 24 insertions(+), 18 deletions(-)

diff --git a/gdb/tui/ChangeLog b/gdb/tui/ChangeLog
index 45feef431d..30163968fd 100644
--- a/gdb/tui/ChangeLog
+++ b/gdb/tui/ChangeLog
@@ -1,3 +1,9 @@
+2001-07-17  Stephane Carrez  <Stephane.Carrez@worldnet.fr>
+
+	* tuiWin.c (_tuiSetFocus): Replace subsetCompare with subset_compare.
+	* tuiLayout.c (_tuiSetLayoutTo): Likewise.
+	* tui.c (_tui_vToggle_command): Likewise.
+
 2001-07-17  Elena Zannoni  <ezannoni@redhat.com>
 
 	* tui-file.c: Add include of tuiIO.h, for tuiPuts_unfiltered.
diff --git a/gdb/tui/tui.c b/gdb/tui/tui.c
index 4262d3aac1..e51e1b9399 100644
--- a/gdb/tui/tui.c
+++ b/gdb/tui/tui.c
@@ -600,9 +600,9 @@ _tui_vToggle_command (va_list args)
       for (i = 0; (ptr[i]); i++)
 	ptr[i] = toupper (arg[i]);
 
-      if (subsetCompare (ptr, TUI_FLOAT_REGS_NAME))
+      if (subset_compare (ptr, TUI_FLOAT_REGS_NAME))
 	tuiToggleFloatRegs ();
-/*        else if (subsetCompare(ptr, "ANOTHER TOGGLE OPTION"))
+/*        else if (subset_compare(ptr, "ANOTHER TOGGLE OPTION"))
    ...
  */
       else
diff --git a/gdb/tui/tuiLayout.c b/gdb/tui/tuiLayout.c
index 2b435b420d..9d30bdec97 100644
--- a/gdb/tui/tuiLayout.c
+++ b/gdb/tui/tuiLayout.c
@@ -499,17 +499,17 @@ _tuiSetLayoutTo (char *layoutName)
 	}
       else
 	{
-	  if (subsetCompare (bufPtr, "SRC"))
+	  if (subset_compare (bufPtr, "SRC"))
 	    newLayout = SRC_COMMAND;
-	  else if (subsetCompare (bufPtr, "ASM"))
+	  else if (subset_compare (bufPtr, "ASM"))
 	    newLayout = DISASSEM_COMMAND;
-	  else if (subsetCompare (bufPtr, "SPLIT"))
+	  else if (subset_compare (bufPtr, "SPLIT"))
 	    newLayout = SRC_DISASSEM_COMMAND;
-	  else if (subsetCompare (bufPtr, "REGS") ||
-		   subsetCompare (bufPtr, TUI_GENERAL_SPECIAL_REGS_NAME) ||
-		   subsetCompare (bufPtr, TUI_GENERAL_REGS_NAME) ||
-		   subsetCompare (bufPtr, TUI_FLOAT_REGS_NAME) ||
-		   subsetCompare (bufPtr, TUI_SPECIAL_REGS_NAME))
+	  else if (subset_compare (bufPtr, "REGS") ||
+		   subset_compare (bufPtr, TUI_GENERAL_SPECIAL_REGS_NAME) ||
+		   subset_compare (bufPtr, TUI_GENERAL_REGS_NAME) ||
+		   subset_compare (bufPtr, TUI_FLOAT_REGS_NAME) ||
+		   subset_compare (bufPtr, TUI_SPECIAL_REGS_NAME))
 	    {
 	      if (curLayout == SRC_COMMAND || curLayout == SRC_DATA_COMMAND)
 		newLayout = SRC_DATA_COMMAND;
@@ -521,7 +521,7 @@ _tuiSetLayoutTo (char *layoutName)
    layout command issued by the user. HP has asked us to hook up this code 
    - edie epstein
  */
-	      if (subsetCompare (bufPtr, TUI_FLOAT_REGS_NAME))
+	      if (subset_compare (bufPtr, TUI_FLOAT_REGS_NAME))
 		{
 		  if (dataWin->detail.dataDisplayInfo.regsDisplayType !=
 		      TUI_SFLOAT_REGS &&
@@ -532,12 +532,12 @@ _tuiSetLayoutTo (char *layoutName)
 		    dpyType =
 		      dataWin->detail.dataDisplayInfo.regsDisplayType;
 		}
-	      else if (subsetCompare (bufPtr,
+	      else if (subset_compare (bufPtr,
 				      TUI_GENERAL_SPECIAL_REGS_NAME))
 		dpyType = TUI_GENERAL_AND_SPECIAL_REGS;
-	      else if (subsetCompare (bufPtr, TUI_GENERAL_REGS_NAME))
+	      else if (subset_compare (bufPtr, TUI_GENERAL_REGS_NAME))
 		dpyType = TUI_GENERAL_REGS;
-	      else if (subsetCompare (bufPtr, TUI_SPECIAL_REGS_NAME))
+	      else if (subset_compare (bufPtr, TUI_SPECIAL_REGS_NAME))
 		dpyType = TUI_SPECIAL_REGS;
 	      else
 		{
@@ -559,9 +559,9 @@ _tuiSetLayoutTo (char *layoutName)
 /*              dpyType = TUI_GENERAL_REGS; 
  */
 	    }
-	  else if (subsetCompare (bufPtr, "NEXT"))
+	  else if (subset_compare (bufPtr, "NEXT"))
 	    newLayout = _nextLayout ();
-	  else if (subsetCompare (bufPtr, "PREV"))
+	  else if (subset_compare (bufPtr, "PREV"))
 	    newLayout = _prevLayout ();
 	  else
 	    status = TUI_FAILURE;
diff --git a/gdb/tui/tuiWin.c b/gdb/tui/tuiWin.c
index 925e1f4fa7..3843eb6920 100644
--- a/gdb/tui/tuiWin.c
+++ b/gdb/tui/tuiWin.c
@@ -664,9 +664,9 @@ _tuiSetFocus (char *arg, int fromTTY)
       for (i = 0; (i < strlen (bufPtr)); i++)
 	bufPtr[i] = toupper (arg[i]);
 
-      if (subsetCompare (bufPtr, "NEXT"))
+      if (subset_compare (bufPtr, "NEXT"))
 	winInfo = tuiNextWin (tuiWinWithFocus ());
-      else if (subsetCompare (bufPtr, "PREV"))
+      else if (subset_compare (bufPtr, "PREV"))
 	winInfo = tuiPrevWin (tuiWinWithFocus ());
       else
 	winInfo = partialWinByName (bufPtr);