* tuiWin.c (_tuiSetFocus): Replace subsetCompare with subset_compare.

* tuiLayout.c (_tuiSetLayoutTo): Likewise.
	* tui.c (_tui_vToggle_command): Likewise.
This commit is contained in:
Stephane Carrez 2001-07-17 21:37:18 +00:00
parent f9eb4b0146
commit 0963fc9672
4 changed files with 24 additions and 18 deletions

View file

@ -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> 2001-07-17 Elena Zannoni <ezannoni@redhat.com>
* tui-file.c: Add include of tuiIO.h, for tuiPuts_unfiltered. * tui-file.c: Add include of tuiIO.h, for tuiPuts_unfiltered.

View file

@ -600,9 +600,9 @@ _tui_vToggle_command (va_list args)
for (i = 0; (ptr[i]); i++) for (i = 0; (ptr[i]); i++)
ptr[i] = toupper (arg[i]); ptr[i] = toupper (arg[i]);
if (subsetCompare (ptr, TUI_FLOAT_REGS_NAME)) if (subset_compare (ptr, TUI_FLOAT_REGS_NAME))
tuiToggleFloatRegs (); tuiToggleFloatRegs ();
/* else if (subsetCompare(ptr, "ANOTHER TOGGLE OPTION")) /* else if (subset_compare(ptr, "ANOTHER TOGGLE OPTION"))
... ...
*/ */
else else

View file

@ -499,17 +499,17 @@ _tuiSetLayoutTo (char *layoutName)
} }
else else
{ {
if (subsetCompare (bufPtr, "SRC")) if (subset_compare (bufPtr, "SRC"))
newLayout = SRC_COMMAND; newLayout = SRC_COMMAND;
else if (subsetCompare (bufPtr, "ASM")) else if (subset_compare (bufPtr, "ASM"))
newLayout = DISASSEM_COMMAND; newLayout = DISASSEM_COMMAND;
else if (subsetCompare (bufPtr, "SPLIT")) else if (subset_compare (bufPtr, "SPLIT"))
newLayout = SRC_DISASSEM_COMMAND; newLayout = SRC_DISASSEM_COMMAND;
else if (subsetCompare (bufPtr, "REGS") || else if (subset_compare (bufPtr, "REGS") ||
subsetCompare (bufPtr, TUI_GENERAL_SPECIAL_REGS_NAME) || subset_compare (bufPtr, TUI_GENERAL_SPECIAL_REGS_NAME) ||
subsetCompare (bufPtr, TUI_GENERAL_REGS_NAME) || subset_compare (bufPtr, TUI_GENERAL_REGS_NAME) ||
subsetCompare (bufPtr, TUI_FLOAT_REGS_NAME) || subset_compare (bufPtr, TUI_FLOAT_REGS_NAME) ||
subsetCompare (bufPtr, TUI_SPECIAL_REGS_NAME)) subset_compare (bufPtr, TUI_SPECIAL_REGS_NAME))
{ {
if (curLayout == SRC_COMMAND || curLayout == SRC_DATA_COMMAND) if (curLayout == SRC_COMMAND || curLayout == SRC_DATA_COMMAND)
newLayout = 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 layout command issued by the user. HP has asked us to hook up this code
- edie epstein - edie epstein
*/ */
if (subsetCompare (bufPtr, TUI_FLOAT_REGS_NAME)) if (subset_compare (bufPtr, TUI_FLOAT_REGS_NAME))
{ {
if (dataWin->detail.dataDisplayInfo.regsDisplayType != if (dataWin->detail.dataDisplayInfo.regsDisplayType !=
TUI_SFLOAT_REGS && TUI_SFLOAT_REGS &&
@ -532,12 +532,12 @@ _tuiSetLayoutTo (char *layoutName)
dpyType = dpyType =
dataWin->detail.dataDisplayInfo.regsDisplayType; dataWin->detail.dataDisplayInfo.regsDisplayType;
} }
else if (subsetCompare (bufPtr, else if (subset_compare (bufPtr,
TUI_GENERAL_SPECIAL_REGS_NAME)) TUI_GENERAL_SPECIAL_REGS_NAME))
dpyType = TUI_GENERAL_AND_SPECIAL_REGS; 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; 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; dpyType = TUI_SPECIAL_REGS;
else else
{ {
@ -559,9 +559,9 @@ _tuiSetLayoutTo (char *layoutName)
/* dpyType = TUI_GENERAL_REGS; /* dpyType = TUI_GENERAL_REGS;
*/ */
} }
else if (subsetCompare (bufPtr, "NEXT")) else if (subset_compare (bufPtr, "NEXT"))
newLayout = _nextLayout (); newLayout = _nextLayout ();
else if (subsetCompare (bufPtr, "PREV")) else if (subset_compare (bufPtr, "PREV"))
newLayout = _prevLayout (); newLayout = _prevLayout ();
else else
status = TUI_FAILURE; status = TUI_FAILURE;

View file

@ -664,9 +664,9 @@ _tuiSetFocus (char *arg, int fromTTY)
for (i = 0; (i < strlen (bufPtr)); i++) for (i = 0; (i < strlen (bufPtr)); i++)
bufPtr[i] = toupper (arg[i]); bufPtr[i] = toupper (arg[i]);
if (subsetCompare (bufPtr, "NEXT")) if (subset_compare (bufPtr, "NEXT"))
winInfo = tuiNextWin (tuiWinWithFocus ()); winInfo = tuiNextWin (tuiWinWithFocus ());
else if (subsetCompare (bufPtr, "PREV")) else if (subset_compare (bufPtr, "PREV"))
winInfo = tuiPrevWin (tuiWinWithFocus ()); winInfo = tuiPrevWin (tuiWinWithFocus ());
else else
winInfo = partialWinByName (bufPtr); winInfo = partialWinByName (bufPtr);