[PATCH]: Replace subsetCompare with subset_compare in tui

Stephane Carrez Stephane.Carrez@worldnet.fr
Tue Jul 17 14:38:00 GMT 2001


Hi!

I've committed the following patch that fixes the problem with subsetCompare
being undefined for tui.  In fact, the function exists in utils.c but its
name was gnu'ified to subset_compare.

	Stephane

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.
Index: tui.c
===================================================================
RCS file: /cvs/src/src/gdb/tui/tui.c,v
retrieving revision 1.7
diff -u -p -r1.7 tui.c
--- tui.c	2001/07/14 19:31:09	1.7
+++ tui.c	2001/07/17 21:31:17
@@ -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
Index: tuiWin.c
===================================================================
RCS file: /cvs/src/src/gdb/tui/tuiWin.c,v
retrieving revision 1.6
diff -u -p -r1.6 tuiWin.c
--- tuiWin.c	2001/07/16 22:13:38	1.6
+++ tuiWin.c	2001/07/17 21:31:25
@@ -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);
Index: tuiLayout.c
===================================================================
RCS file: /cvs/src/src/gdb/tui/tuiLayout.c,v
retrieving revision 1.7
diff -u -p -r1.7 tuiLayout.c
--- tuiLayout.c	2001/07/14 19:31:09	1.7
+++ tuiLayout.c	2001/07/17 21:31:29
@@ -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;


More information about the Gdb-patches mailing list