FreeChainXenon/binutils-gdb
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

* tuiWin.c, tui.c, tuiCommand.c: Use ansi prototype.

Browse source 
tuiIO.c, tuiData.c: Likewise.
	tuiDataWin.c, tuiDisassem.c: Likewise.
	tuiGeneralWin.c, tuiLayout.c: Likewise.
	tuiRegs.c, tuiSource.c: Likewise.
	tuiSouceWin.c, tuiStack.c: Likewise.
This commit is contained in:
Stephane Carrez 2001-07-14 19:31:09 +00:00
parent def902788f
commit eca6576c19
14 changed files with 240 additions and 1999 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
gdb/tui/ChangeLog
View file

@ -1,3 +1,12 @@
2001-07-14 Stephane Carrez <Stephane.Carrez@worldnet.fr>
* tuiWin.c, tui.c, tuiCommand.c: Use ansi prototype.
tuiIO.c, tuiData.c: Likewise.
tuiDataWin.c, tuiDisassem.c: Likewise.
tuiGeneralWin.c, tuiLayout.c: Likewise.
tuiRegs.c, tuiSource.c: Likewise.
tuiSouceWin.c, tuiStack.c: Likewise.
2001-07-14 Stephane Carrez <Stephane.Carrez@worldnet.fr> 2001-07-14 Stephane Carrez <Stephane.Carrez@worldnet.fr>
* tuiWin.c, tuiWin.h, tui.c, tui.h, tuiCommand.c: Add FSF copyright. * tuiWin.c, tuiWin.h, tui.c, tui.h, tuiCommand.c: Add FSF copyright.

190
gdb/tui/tui.c
View file

@ -75,12 +75,7 @@ static Opaque _tui_vDo (TuiOpaqueFuncPtr, va_list);
** tuiInit(). ** tuiInit().
*/ */
void void
#ifdef __STDC__
tuiInit (char *argv0) tuiInit (char *argv0)
#else
tuiInit (argv0)
char *argv0;
#endif
{ {
extern void init_page_info (); extern void init_page_info ();
extern void initialize_tui_files (void); extern void initialize_tui_files (void);
@ -113,11 +108,7 @@ extern void initialize_tui_files (void);
** tuiInitWindows(). ** tuiInitWindows().
*/ */
void void
#ifdef __STDC__
tuiInitWindows (void) tuiInitWindows (void)
#else
tuiInitWindows ()
#endif
{ {
TuiWinType type; TuiWinType type;
@ -138,11 +129,7 @@ tuiInitWindows ()
** Kill signal handler and cleanup termination method ** Kill signal handler and cleanup termination method
*/ */
void void
#ifdef __STDC__
tuiResetScreen (void) tuiResetScreen (void)
#else
tuiResetScreen ()
#endif
{ {
TuiWinType type = SRC_WIN; TuiWinType type = SRC_WIN;
@ -170,11 +157,7 @@ tuiResetScreen ()
** Kill signal handler and cleanup termination method ** Kill signal handler and cleanup termination method
*/ */
void void
#ifdef __STDC__
tuiCleanUp (void) tuiCleanUp (void)
#else
tuiCleanUp ()
#endif
{ {
char *buffer; char *buffer;
extern char *term_cursor_move; extern char *term_cursor_move;
@ -196,15 +179,7 @@ tuiCleanUp ()
** tuiError(). ** tuiError().
*/ */
void void
#ifdef __STDC__ tuiError (char *string, int exitGdb)
tuiError (
char *string,
int exitGdb)
#else
tuiError (string, exitGdb)
char *string;
int exitGdb;
#endif
{ {
puts_unfiltered (string); puts_unfiltered (string);
if (exitGdb) if (exitGdb)
@ -222,13 +197,7 @@ tuiError (string, exitGdb)
** tuiError with args in a va_list. ** tuiError with args in a va_list.
*/ */
void void
#ifdef __STDC__ tui_vError (va_list args)
tui_vError (
va_list args)
#else
tui_vError (args)
va_list args;
#endif
{ {
char *string; char *string;
int exitGdb; int exitGdb;
@ -247,13 +216,7 @@ tui_vError (args)
** Wrapper on top of free() to ensure that input address is greater than 0x0 ** Wrapper on top of free() to ensure that input address is greater than 0x0
*/ */
void void
#ifdef __STDC__ tuiFree (char *ptr)
tuiFree (
char *ptr)
#else
tuiFree (ptr)
char *ptr;
#endif
{ {
if (ptr != (char *) NULL) if (ptr != (char *) NULL)
{ {
@ -270,15 +233,7 @@ tuiFree (ptr)
** low address input. ** low address input.
*/ */
Opaque Opaque
#ifdef __STDC__ tuiGetLowDisassemblyAddress (Opaque low, Opaque pc)
tuiGetLowDisassemblyAddress (
Opaque low,
Opaque pc)
#else
tuiGetLowDisassemblyAddress (low, pc)
Opaque low;
Opaque pc;
#endif
{ {
int line; int line;
Opaque newLow; Opaque newLow;
@ -307,13 +262,7 @@ tuiGetLowDisassemblyAddress (low, pc)
** disassembly window with args in a va_list. ** disassembly window with args in a va_list.
*/ */
Opaque Opaque
#ifdef __STDC__ tui_vGetLowDisassemblyAddress (va_list args)
tui_vGetLowDisassemblyAddress (
va_list args)
#else
tui_vGetLowDisassemblyAddress (args)
va_list args;
#endif
{ {
int line; int line;
Opaque newLow; Opaque newLow;
@ -344,14 +293,7 @@ tui_vGetLowDisassemblyAddress (args)
** be replaced by judicious use of QUIT. ** be replaced by judicious use of QUIT.
*/ */
Opaque Opaque
#ifdef __STDC__ tuiDo (TuiOpaqueFuncPtr func, ...)
tuiDo (
TuiOpaqueFuncPtr func,...)
#else
tuiDo (func, va_alist)
TuiOpaqueFuncPtr func;
va_dcl
#endif
{ {
extern int terminal_is_ours; extern int terminal_is_ours;
@ -367,11 +309,7 @@ tuiDo (func, va_alist)
{ {
va_list args; va_list args;
#ifdef __STDC__
va_start (args, func); va_start (args, func);
#else
va_start (args);
#endif
ret = _tui_vDo (func, args); ret = _tui_vDo (func, args);
va_end (args); va_end (args);
} }
@ -398,14 +336,7 @@ tuiDo (func, va_alist)
** **
*/ */
Opaque Opaque
#ifdef __STDC__ tuiDoAndReturnToTop (TuiOpaqueFuncPtr func, ...)
tuiDoAndReturnToTop (
TuiOpaqueFuncPtr func,...)
#else
tuiDoAndReturnToTop (func, va_alist)
TuiOpaqueFuncPtr func;
va_dcl
#endif
{ {
extern int terminal_is_ours; extern int terminal_is_ours;
@ -421,11 +352,7 @@ tuiDoAndReturnToTop (func, va_alist)
{ {
va_list args; va_list args;
#ifdef __STDC__
va_start (args, func); va_start (args, func);
#else
va_start (args);
#endif
ret = _tui_vDo (func, args); ret = _tui_vDo (func, args);
/* force a return to the top level */ /* force a return to the top level */
@ -437,13 +364,7 @@ tuiDoAndReturnToTop (func, va_alist)
void void
#ifdef __STDC__ tui_vSelectSourceSymtab (va_list args)
tui_vSelectSourceSymtab (
va_list args)
#else
tui_vSelectSourceSymtab (args)
va_list args;
#endif
{ {
struct symtab *s = va_arg (args, struct symtab *); struct symtab *s = va_arg (args, struct symtab *);
@ -499,15 +420,7 @@ Usage:\ttoggle $fregs\n\ttoggle breakpoints";
** be replaced by judicious use of QUIT. ** be replaced by judicious use of QUIT.
*/ */
Opaque Opaque
#ifdef __STDC__ va_catch_errors (TuiOpaqueFuncPtr func, va_list args)
va_catch_errors (
TuiOpaqueFuncPtr func,
va_list args)
#else
va_catch_errors (func, args)
TuiOpaqueFuncPtr func;
va_list args;
#endif
{ {
Opaque ret = (Opaque) NULL; Opaque ret = (Opaque) NULL;
@ -557,32 +470,14 @@ va_catch_errors (func, args)
** argument list as well. ** argument list as well.
*/ */
Opaque Opaque
#ifdef __STDC__ vcatch_errors (OpaqueFuncPtr func, ...)
vcatch_errors (
OpaqueFuncPtr func,...)
#else
vcatch_errors (va_alist)
va_dcl
/*
vcatch_errors(func, va_alist)
OpaqueFuncPtr func;
va_dcl
*/
#endif
{ {
Opaque ret = (Opaque) NULL; Opaque ret = (Opaque) NULL;
va_list args; va_list args;
#ifdef __STDC__
va_start (args, func); va_start (args, func);
/* /*
va_arg(args, OpaqueFuncPtr); va_arg(args, OpaqueFuncPtr);
*/ */
#else
OpaqueFuncPtr func;
va_start (args);
func = va_arg (args, OpaqueFuncPtr);
#endif
ret = va_catch_errors (func, args); ret = va_catch_errors (func, args);
va_end (args); va_end (args);
@ -591,17 +486,7 @@ vcatch_errors (va_alist)
void void
#ifdef __STDC__ strcat_to_buf (char *buf, int buflen, char *itemToAdd)
strcat_to_buf (
char *buf,
int buflen,
char *itemToAdd)
#else
strcat_to_buf (buf, buflen, itemToAdd)
char *buf;
int buflen;
char *itemToAdd;
#endif
{ {
if (itemToAdd != (char *) NULL && buf != (char *) NULL) if (itemToAdd != (char *) NULL && buf != (char *) NULL)
{ {
@ -616,31 +501,12 @@ strcat_to_buf (buf, buflen, itemToAdd)
/* VARARGS */ /* VARARGS */
void void
#ifdef ANSI_PROTOTYPES strcat_to_buf_with_fmt (char *buf, int bufLen, char *format, ...)
strcat_to_buf_with_fmt (
char *buf,
int bufLen,
char *format,...)
#else
strcat_to_buf_with_fmt (va_alist)
va_dcl
#endif
{ {
char *linebuffer; char *linebuffer;
struct cleanup *old_cleanups; struct cleanup *old_cleanups;
va_list args; va_list args;
#ifdef ANSI_PROTOTYPES
va_start (args, format); va_start (args, format);
#else
char *buf;
int bufLen;
char *format;
va_start (args);
buf = va_arg (args, char *);
bufLen = va_arg (args, int);
format = va_arg (args, char *);
#endif
vasprintf (&linebuffer, format, args); vasprintf (&linebuffer, format, args);
old_cleanups = make_cleanup (xfree, linebuffer); old_cleanups = make_cleanup (xfree, linebuffer);
strcat_to_buf (buf, bufLen, linebuffer); strcat_to_buf (buf, bufLen, linebuffer);
@ -673,15 +539,7 @@ strcat_to_buf_with_fmt (va_alist)
** be replaced by judicious use of QUIT. ** be replaced by judicious use of QUIT.
*/ */
static Opaque static Opaque
#ifdef __STDC__ _tui_vDo (TuiOpaqueFuncPtr func, va_list args)
_tui_vDo (
TuiOpaqueFuncPtr func,
va_list args)
#else
_tui_vDo (func, args)
TuiOpaqueFuncPtr func;
va_list args;
#endif
{ {
extern int terminal_is_ours; extern int terminal_is_ours;
@ -712,15 +570,7 @@ _tui_vDo (func, args)
static void static void
#ifdef __STDC__ _toggle_command (char *arg, int fromTTY)
_toggle_command (
char *arg,
int fromTTY)
#else
_toggle_command (arg, fromTTY)
char *arg;
int fromTTY;
#endif
{ {
printf_filtered ("Specify feature to toggle.\n%s\n", printf_filtered ("Specify feature to toggle.\n%s\n",
(tui_version) ? TUI_TOGGLE_USAGE : TOGGLE_USAGE); (tui_version) ? TUI_TOGGLE_USAGE : TOGGLE_USAGE);
@ -733,13 +583,7 @@ _toggle_command (arg, fromTTY)
** _tui_vToggle_command(). ** _tui_vToggle_command().
*/ */
static void static void
#ifdef __STDC__ _tui_vToggle_command (va_list args)
_tui_vToggle_command (
va_list args)
#else
_tui_vToggle_command (args)
va_list args;
#endif
{ {
char *arg; char *arg;
int fromTTY; int fromTTY;
@ -771,11 +615,7 @@ _tui_vToggle_command (args)
static void static void
#ifdef __STDC__
_tuiReset (void) _tuiReset (void)
#else
_tuiReset ()
#endif
{ {
struct termio mode; struct termio mode;

36
gdb/tui/tuiCommand.c
View file

@ -41,13 +41,7 @@
** Dispatch the correct tui function based upon the control character. ** Dispatch the correct tui function based upon the control character.
*/ */
unsigned int unsigned int
#ifdef __STDC__ tuiDispatchCtrlChar (unsigned int ch)
tuiDispatchCtrlChar (
unsigned int ch)
#else
tuiDispatchCtrlChar (ch)
unsigned int ch;
#endif
{ {
TuiWinInfoPtr winInfo = tuiWinWithFocus (); TuiWinInfoPtr winInfo = tuiWinWithFocus ();
@ -129,13 +123,7 @@ tuiDispatchCtrlChar (ch)
** checking for overflow. Returns the new value of the char count. ** checking for overflow. Returns the new value of the char count.
*/ */
int int
#ifdef __STDC__ tuiIncrCommandCharCountBy (int count)
tuiIncrCommandCharCountBy (
int count)
#else
tuiIncrCommandCharCountBy (count)
int count;
#endif
{ {
if (tui_version) if (tui_version)
{ {
@ -156,13 +144,7 @@ tuiIncrCommandCharCountBy (count)
** checking for overflow. Returns the new value of the char count. ** checking for overflow. Returns the new value of the char count.
*/ */
int int
#ifdef __STDC__ tuiDecrCommandCharCountBy (int count)
tuiDecrCommandCharCountBy (
int count)
#else
tuiDecrCommandCharCountBy (count)
int count;
#endif
{ {
if (tui_version) if (tui_version)
{ {
@ -182,13 +164,7 @@ tuiDecrCommandCharCountBy (count)
** Set the character count to count. ** Set the character count to count.
*/ */
int int
#ifdef __STDC__ tuiSetCommandCharCountTo (int count)
tuiSetCommandCharCountTo (
int count)
#else
tuiSetCommandCharCountTo (count)
int count;
#endif
{ {
if (tui_version) if (tui_version)
{ {
@ -211,11 +187,7 @@ tuiSetCommandCharCountTo (count)
** Clear the character count to count. ** Clear the character count to count.
*/ */
int int
#ifdef __STDC__
tuiClearCommandCharCount (void) tuiClearCommandCharCount (void)
#else
tuiClearCommandCharCount ()
#endif
{ {
if (tui_version) if (tui_version)
cmdWin->detail.commandInfo.curch = 0; cmdWin->detail.commandInfo.curch = 0;

368
gdb/tui/tuiData.c
View file

@ -83,11 +83,7 @@ static void freeContentElements (TuiWinContent, int, TuiWinType);
** Answer a whether the terminal window has been resized or not ** Answer a whether the terminal window has been resized or not
*/ */
int int
#ifdef __STDC__
tuiWinResized (void) tuiWinResized (void)
#else
tuiWinResized ()
#endif
{ {
return _winResized; return _winResized;
} /* tuiWinResized */ } /* tuiWinResized */
@ -98,13 +94,7 @@ tuiWinResized ()
** Set a whether the terminal window has been resized or not ** Set a whether the terminal window has been resized or not
*/ */
void void
#ifdef __STDC__ tuiSetWinResizedTo (int resized)
tuiSetWinResizedTo (
int resized)
#else
tuiSetWinResizedTo (resized)
int resized;
#endif
{ {
_winResized = resized; _winResized = resized;
@ -117,11 +107,7 @@ tuiSetWinResizedTo (resized)
** Answer a pointer to the current layout definition ** Answer a pointer to the current layout definition
*/ */
TuiLayoutDefPtr TuiLayoutDefPtr
#ifdef __STDC__
tuiLayoutDef (void) tuiLayoutDef (void)
#else
tuiLayoutDef ()
#endif
{ {
return &_layoutDef; return &_layoutDef;
} /* tuiLayoutDef */ } /* tuiLayoutDef */
@ -132,11 +118,7 @@ tuiLayoutDef ()
** Answer the window with the logical focus ** Answer the window with the logical focus
*/ */
TuiWinInfoPtr TuiWinInfoPtr
#ifdef __STDC__
tuiWinWithFocus (void) tuiWinWithFocus (void)
#else
tuiWinWithFocus ()
#endif
{ {
return _winWithFocus; return _winWithFocus;
} /* tuiWinWithFocus */ } /* tuiWinWithFocus */
@ -147,13 +129,7 @@ tuiWinWithFocus ()
** Set the window that has the logical focus ** Set the window that has the logical focus
*/ */
void void
#ifdef __STDC__ tuiSetWinWithFocus (TuiWinInfoPtr winInfo)
tuiSetWinWithFocus (
TuiWinInfoPtr winInfo)
#else
tuiSetWinWithFocus (winInfo)
TuiWinInfoPtr winInfo;
#endif
{ {
_winWithFocus = winInfo; _winWithFocus = winInfo;
@ -166,11 +142,7 @@ tuiSetWinWithFocus (winInfo)
** Answer the length in chars, of tabs ** Answer the length in chars, of tabs
*/ */
int int
#ifdef __STDC__
tuiDefaultTabLen (void) tuiDefaultTabLen (void)
#else
tuiDefaultTabLen ()
#endif
{ {
return _defaultTabLen; return _defaultTabLen;
} /* tuiDefaultTabLen */ } /* tuiDefaultTabLen */
@ -181,13 +153,7 @@ tuiDefaultTabLen ()
** Set the length in chars, of tabs ** Set the length in chars, of tabs
*/ */
void void
#ifdef __STDC__ tuiSetDefaultTabLen (int len)
tuiSetDefaultTabLen (
int len)
#else
tuiSetDefaultTabLen (len)
int len;
#endif
{ {
_defaultTabLen = len; _defaultTabLen = len;
@ -202,11 +168,7 @@ tuiSetDefaultTabLen (len)
** be displayed at the same time. ** be displayed at the same time.
*/ */
TuiListPtr TuiListPtr
#ifdef __STDC__
sourceWindows (void) sourceWindows (void)
#else
sourceWindows ()
#endif
{ {
return &_sourceWindows; return &_sourceWindows;
} /* currentSourceWindows */ } /* currentSourceWindows */
@ -219,11 +181,7 @@ sourceWindows ()
** displayed at the same time. ** displayed at the same time.
*/ */
void void
#ifdef __STDC__
clearSourceWindows (void) clearSourceWindows (void)
#else
clearSourceWindows ()
#endif
{ {
_sourceWindows.list[0] = (Opaque) NULL; _sourceWindows.list[0] = (Opaque) NULL;
_sourceWindows.list[1] = (Opaque) NULL; _sourceWindows.list[1] = (Opaque) NULL;
@ -238,11 +196,7 @@ clearSourceWindows ()
** Clear the pertinant detail in the source windows. ** Clear the pertinant detail in the source windows.
*/ */
void void
#ifdef __STDC__
clearSourceWindowsDetail (void) clearSourceWindowsDetail (void)
#else
clearSourceWindowsDetail ()
#endif
{ {
int i; int i;
@ -260,13 +214,7 @@ clearSourceWindowsDetail ()
** both can be displayed at the same time. ** both can be displayed at the same time.
*/ */
void void
#ifdef __STDC__ addToSourceWindows (TuiWinInfoPtr winInfo)
addToSourceWindows (
TuiWinInfoPtr winInfo)
#else
addToSourceWindows (winInfo)
TuiWinInfoPtr winInfo;
#endif
{ {
if (_sourceWindows.count < 2) if (_sourceWindows.count < 2)
_sourceWindows.list[_sourceWindows.count++] = (Opaque) winInfo; _sourceWindows.list[_sourceWindows.count++] = (Opaque) winInfo;
@ -280,13 +228,7 @@ addToSourceWindows (winInfo)
** Clear the pertinant detail in the windows. ** Clear the pertinant detail in the windows.
*/ */
void void
#ifdef __STDC__ clearWinDetail (TuiWinInfoPtr winInfo)
clearWinDetail (
TuiWinInfoPtr winInfo)
#else
clearWinDetail (winInfo)
TuiWinInfoPtr winInfo;
#endif
{ {
if (m_winPtrNotNull (winInfo)) if (m_winPtrNotNull (winInfo))
{ {
@ -327,11 +269,7 @@ clearWinDetail (winInfo)
** Accessor for the blank string. ** Accessor for the blank string.
*/ */
char * char *
#ifdef __STDC__
blankStr (void) blankStr (void)
#else
blankStr ()
#endif
{ {
return _tuiBlankStr; return _tuiBlankStr;
} /* blankStr */ } /* blankStr */
@ -342,11 +280,7 @@ blankStr ()
** Accessor for the location string. ** Accessor for the location string.
*/ */
char * char *
#ifdef __STDC__
locationStr (void) locationStr (void)
#else
locationStr ()
#endif
{ {
return _tuiLocationStr; return _tuiLocationStr;
} /* locationStr */ } /* locationStr */
@ -357,11 +291,7 @@ locationStr ()
** Accessor for the break string. ** Accessor for the break string.
*/ */
char * char *
#ifdef __STDC__
breakStr (void) breakStr (void)
#else
breakStr ()
#endif
{ {
return _tuiBreakStr; return _tuiBreakStr;
} /* breakStr */ } /* breakStr */
@ -372,11 +302,7 @@ breakStr ()
** Accessor for the breakLocation string. ** Accessor for the breakLocation string.
*/ */
char * char *
#ifdef __STDC__
breakLocationStr (void) breakLocationStr (void)
#else
breakLocationStr ()
#endif
{ {
return _tuiBreakLocationStr; return _tuiBreakLocationStr;
} /* breakLocationStr */ } /* breakLocationStr */
@ -387,11 +313,7 @@ breakLocationStr ()
** Accessor for the null string. ** Accessor for the null string.
*/ */
char * char *
#ifdef __STDC__
nullStr (void) nullStr (void)
#else
nullStr ()
#endif
{ {
return _tuiNullStr; return _tuiNullStr;
} /* nullStr */ } /* nullStr */
@ -402,11 +324,7 @@ nullStr ()
** Accessor for the source execution info ptr. ** Accessor for the source execution info ptr.
*/ */
TuiGenWinInfoPtr TuiGenWinInfoPtr
#ifdef __STDC__
sourceExecInfoWinPtr (void) sourceExecInfoWinPtr (void)
#else
sourceExecInfoWinPtr ()
#endif
{ {
return &_execInfo[0]; return &_execInfo[0];
} /* sourceExecInfoWinPtr */ } /* sourceExecInfoWinPtr */
@ -417,11 +335,7 @@ sourceExecInfoWinPtr ()
** Accessor for the disassem execution info ptr. ** Accessor for the disassem execution info ptr.
*/ */
TuiGenWinInfoPtr TuiGenWinInfoPtr
#ifdef __STDC__
disassemExecInfoWinPtr (void) disassemExecInfoWinPtr (void)
#else
disassemExecInfoWinPtr ()
#endif
{ {
return &_execInfo[1]; return &_execInfo[1];
} /* disassemExecInfoWinPtr */ } /* disassemExecInfoWinPtr */
@ -433,11 +347,7 @@ disassemExecInfoWinPtr ()
** static locator win info struct. ** static locator win info struct.
*/ */
TuiGenWinInfoPtr TuiGenWinInfoPtr
#ifdef __STDC__
locatorWinInfoPtr (void) locatorWinInfoPtr (void)
#else
locatorWinInfoPtr ()
#endif
{ {
return &_locator; return &_locator;
} /* locatorWinInfoPtr */ } /* locatorWinInfoPtr */
@ -448,11 +358,7 @@ locatorWinInfoPtr ()
** Accessor for the history limit ** Accessor for the history limit
*/ */
int int
#ifdef __STDC__
historyLimit (void) historyLimit (void)
#else
historyLimit ()
#endif
{ {
return _historyLimit; return _historyLimit;
} /* historyLimit */ } /* historyLimit */
@ -463,13 +369,7 @@ historyLimit ()
** Mutator for the history limit ** Mutator for the history limit
*/ */
void void
#ifdef __STDC__ setHistoryLimitTo (int h)
setHistoryLimitTo (
int h)
#else
setHistoryLimitTo (h)
int h;
#endif
{ {
_historyLimit = h; _historyLimit = h;
@ -481,11 +381,7 @@ setHistoryLimitTo (h)
** Accessor for the termHeight ** Accessor for the termHeight
*/ */
int int
#ifdef __STDC__
termHeight (void) termHeight (void)
#else
termHeight ()
#endif
{ {
return _termHeight; return _termHeight;
} /* termHeight */ } /* termHeight */
@ -496,13 +392,7 @@ termHeight ()
** Mutator for the term height ** Mutator for the term height
*/ */
void void
#ifdef __STDC__ setTermHeightTo (int h)
setTermHeightTo (
int h)
#else
setTermHeightTo (h)
int h;
#endif
{ {
_termHeight = h; _termHeight = h;
@ -515,11 +405,7 @@ setTermHeightTo (h)
** Accessor for the termWidth ** Accessor for the termWidth
*/ */
int int
#ifdef __STDC__
termWidth (void) termWidth (void)
#else
termWidth ()
#endif
{ {
return _termWidth; return _termWidth;
} /* termWidth */ } /* termWidth */
@ -530,13 +416,7 @@ termWidth ()
** Mutator for the termWidth ** Mutator for the termWidth
*/ */
void void
#ifdef __STDC__ setTermWidthTo (int w)
setTermWidthTo (
int w)
#else
setTermWidthTo (w)
int w;
#endif
{ {
_termWidth = w; _termWidth = w;
@ -549,11 +429,7 @@ setTermWidthTo (w)
** Accessor for the current layout ** Accessor for the current layout
*/ */
TuiLayoutType TuiLayoutType
#ifdef __STDC__
currentLayout (void) currentLayout (void)
#else
currentLayout ()
#endif
{ {
return _currentLayout; return _currentLayout;
} /* currentLayout */ } /* currentLayout */
@ -564,13 +440,7 @@ currentLayout ()
** Mutator for the current layout ** Mutator for the current layout
*/ */
void void
#ifdef __STDC__ setCurrentLayoutTo (TuiLayoutType newLayout)
setCurrentLayoutTo (
TuiLayoutType newLayout)
#else
setCurrentLayoutTo (newLayout)
TuiLayoutType newLayout;
#endif
{ {
_currentLayout = newLayout; _currentLayout = newLayout;
@ -583,17 +453,7 @@ setCurrentLayoutTo (newLayout)
** Set the origin of the window ** Set the origin of the window
*/ */
void void
#ifdef __STDC__ setGenWinOrigin (TuiGenWinInfoPtr winInfo, int x, int y)
setGenWinOrigin (
TuiGenWinInfoPtr winInfo,
int x,
int y)
#else
setGenWinOrigin (winInfo, x, y)
TuiGenWinInfoPtr winInfo;
int x;
int y;
#endif
{ {
winInfo->origin.x = x; winInfo->origin.x = x;
winInfo->origin.y = y; winInfo->origin.y = y;
@ -613,13 +473,7 @@ setGenWinOrigin (winInfo, x, y)
** if necessary ** if necessary
*/ */
TuiWinInfoPtr TuiWinInfoPtr
#ifdef __STDC__ tuiNextWin (TuiWinInfoPtr curWin)
tuiNextWin (
TuiWinInfoPtr curWin)
#else
tuiNextWin (curWin)
TuiWinInfoPtr curWin;
#endif
{ {
TuiWinType type = curWin->generic.type; TuiWinType type = curWin->generic.type;
TuiWinInfoPtr nextWin = (TuiWinInfoPtr) NULL; TuiWinInfoPtr nextWin = (TuiWinInfoPtr) NULL;
@ -651,13 +505,7 @@ tuiNextWin (curWin)
** if necessary ** if necessary
*/ */
TuiWinInfoPtr TuiWinInfoPtr
#ifdef __STDC__ tuiPrevWin (TuiWinInfoPtr curWin)
tuiPrevWin (
TuiWinInfoPtr curWin)
#else
tuiPrevWin (curWin)
TuiWinInfoPtr curWin;
#endif
{ {
TuiWinType type = curWin->generic.type; TuiWinType type = curWin->generic.type;
TuiWinInfoPtr prev = (TuiWinInfoPtr) NULL; TuiWinInfoPtr prev = (TuiWinInfoPtr) NULL;
@ -690,15 +538,7 @@ tuiPrevWin (curWin)
** freed after use. ** freed after use.
*/ */
char * char *
#ifdef __STDC__ displayableWinContentOf (TuiGenWinInfoPtr winInfo, TuiWinElementPtr elementPtr)
displayableWinContentOf (
TuiGenWinInfoPtr winInfo,
TuiWinElementPtr elementPtr)
#else
displayableWinContentOf (winInfo, elementPtr)
TuiGenWinInfoPtr winInfo;
TuiWinElementPtr elementPtr;
#endif
{ {
char *string = nullStr (); char *string = nullStr ();
@ -827,15 +667,7 @@ displayableWinContentOf (winInfo, elementPtr)
** Answer a the content at the location indicated by index ** Answer a the content at the location indicated by index
*/ */
char * char *
#ifdef __STDC__ displayableWinContentAt (TuiGenWinInfoPtr winInfo, int index)
displayableWinContentAt (
TuiGenWinInfoPtr winInfo,
int index)
#else
displayableWinContentAt (winInfo, index)
TuiGenWinInfoPtr winInfo;
int index;
#endif
{ {
return (displayableWinContentOf (winInfo, (TuiWinElementPtr) winInfo->content[index])); return (displayableWinContentOf (winInfo, (TuiWinElementPtr) winInfo->content[index]));
} /* winContentAt */ } /* winContentAt */
@ -846,15 +678,7 @@ displayableWinContentAt (winInfo, index)
** Answer the height of the element in lines ** Answer the height of the element in lines
*/ */
int int
#ifdef __STDC__ winElementHeight (TuiGenWinInfoPtr winInfo, TuiWinElementPtr element)
winElementHeight (
TuiGenWinInfoPtr winInfo,
TuiWinElementPtr element)
#else
winElementHeight (winInfo, element)
TuiGenWinInfoPtr winInfo;
TuiWinElementPtr element;
#endif
{ {
int h; int h;
@ -873,13 +697,7 @@ winElementHeight (winInfo, element)
** Answer the window represented by name ** Answer the window represented by name
*/ */
TuiWinInfoPtr TuiWinInfoPtr
#ifdef __STDC__ winByName (char *name)
winByName (
char *name)
#else
winByName (name)
char *name;
#endif
{ {
TuiWinInfoPtr winInfo = (TuiWinInfoPtr) NULL; TuiWinInfoPtr winInfo = (TuiWinInfoPtr) NULL;
int i = 0; int i = 0;
@ -900,13 +718,7 @@ winByName (name)
** Answer the window represented by name ** Answer the window represented by name
*/ */
TuiWinInfoPtr TuiWinInfoPtr
#ifdef __STDC__ partialWinByName (char *name)
partialWinByName (
char *name)
#else
partialWinByName (name)
char *name;
#endif
{ {
TuiWinInfoPtr winInfo = (TuiWinInfoPtr) NULL; TuiWinInfoPtr winInfo = (TuiWinInfoPtr) NULL;
@ -933,13 +745,7 @@ partialWinByName (name)
** Answer the name of the window ** Answer the name of the window
*/ */
char * char *
#ifdef __STDC__ winName (TuiGenWinInfoPtr winInfo)
winName (
TuiGenWinInfoPtr winInfo)
#else
winName (winInfo)
TuiGenWinInfoPtr winInfo;
#endif
{ {
char *name = (char *) NULL; char *name = (char *) NULL;
@ -970,11 +776,7 @@ winName (winInfo)
** initializeStaticData ** initializeStaticData
*/ */
void void
#ifdef __STDC__
initializeStaticData (void) initializeStaticData (void)
#else
initializeStaticData ()
#endif
{ {
initGenericPart (sourceExecInfoWinPtr ()); initGenericPart (sourceExecInfoWinPtr ());
initGenericPart (disassemExecInfoWinPtr ()); initGenericPart (disassemExecInfoWinPtr ());
@ -988,11 +790,7 @@ initializeStaticData ()
** allocGenericWinInfo(). ** allocGenericWinInfo().
*/ */
TuiGenWinInfoPtr TuiGenWinInfoPtr
#ifdef __STDC__
allocGenericWinInfo (void) allocGenericWinInfo (void)
#else
allocGenericWinInfo ()
#endif
{ {
TuiGenWinInfoPtr win; TuiGenWinInfoPtr win;
@ -1008,13 +806,7 @@ allocGenericWinInfo ()
** initGenericPart(). ** initGenericPart().
*/ */
void void
#ifdef __STDC__ initGenericPart (TuiGenWinInfoPtr win)
initGenericPart (
TuiGenWinInfoPtr win)
#else
initGenericPart (win)
TuiGenWinInfoPtr win;
#endif
{ {
win->width = win->width =
win->height = win->height =
@ -1036,15 +828,7 @@ initGenericPart (win)
** initContentElement(). ** initContentElement().
*/ */
void void
#ifdef __STDC__ initContentElement (TuiWinElementPtr element, TuiWinType type)
initContentElement (
TuiWinElementPtr element,
TuiWinType type)
#else
initContentElement (element, type)
TuiWinElementPtr element;
TuiWinType type;
#endif
{ {
element->highlight = FALSE; element->highlight = FALSE;
switch (type) switch (type)
@ -1093,13 +877,7 @@ initContentElement (element, type)
** initWinInfo(). ** initWinInfo().
*/ */
void void
#ifdef __STDC__ initWinInfo (TuiWinInfoPtr winInfo)
initWinInfo (
TuiWinInfoPtr winInfo)
#else
initWinInfo (winInfo)
TuiWinInfoPtr winInfo;
#endif
{ {
initGenericPart (&winInfo->generic); initGenericPart (&winInfo->generic);
winInfo->canHighlight = winInfo->canHighlight =
@ -1140,13 +918,7 @@ initWinInfo (winInfo)
** allocWinInfo(). ** allocWinInfo().
*/ */
TuiWinInfoPtr TuiWinInfoPtr
#ifdef __STDC__ allocWinInfo (TuiWinType type)
allocWinInfo (
TuiWinType type)
#else
allocWinInfo (type)
TuiWinType type;
#endif
{ {
TuiWinInfoPtr winInfo = (TuiWinInfoPtr) NULL; TuiWinInfoPtr winInfo = (TuiWinInfoPtr) NULL;
@ -1166,15 +938,7 @@ allocWinInfo (type)
** Allocates the content and elements in a block. ** Allocates the content and elements in a block.
*/ */
TuiWinContent TuiWinContent
#ifdef __STDC__ allocContent (int numElements, TuiWinType type)
allocContent (
int numElements,
TuiWinType type)
#else
allocContent (numElements, type)
int numElements;
TuiWinType type;
#endif
{ {
TuiWinContent content = (TuiWinContent) NULL; TuiWinContent content = (TuiWinContent) NULL;
char *elementBlockPtr = (char *) NULL; char *elementBlockPtr = (char *) NULL;
@ -1220,15 +984,7 @@ allocContent (numElements, type)
** is returned. ** is returned.
*/ */
int int
#ifdef __STDC__ addContentElements (TuiGenWinInfoPtr winInfo, int numElements)
addContentElements (
TuiGenWinInfoPtr winInfo,
int numElements)
#else
addContentElements (winInfo, numElements)
TuiGenWinInfoPtr winInfo;
int numElements;
#endif
{ {
TuiWinElementPtr elementPtr; TuiWinElementPtr elementPtr;
int i, indexStart; int i, indexStart;
@ -1266,13 +1022,7 @@ addContentElements (winInfo, numElements)
** else in tact. ** else in tact.
*/ */
void void
#ifdef __STDC__ tuiDelWindow (TuiWinInfoPtr winInfo)
tuiDelWindow (
TuiWinInfoPtr winInfo)
#else
tuiDelWindow (winInfo)
TuiWinInfoPtr winInfo;
#endif
{ {
Opaque detail; Opaque detail;
int i; int i;
@ -1329,13 +1079,7 @@ tuiDelWindow (winInfo)
** freeWindow(). ** freeWindow().
*/ */
void void
#ifdef __STDC__ freeWindow (TuiWinInfoPtr winInfo)
freeWindow (
TuiWinInfoPtr winInfo)
#else
freeWindow (winInfo)
TuiWinInfoPtr winInfo;
#endif
{ {
Opaque detail; Opaque detail;
int i; int i;
@ -1403,11 +1147,7 @@ freeWindow (winInfo)
** freeAllSourceWinsContent(). ** freeAllSourceWinsContent().
*/ */
void void
#ifdef __STDC__
freeAllSourceWinsContent (void) freeAllSourceWinsContent (void)
#else
freeAllSourceWinsContent ()
#endif
{ {
int i; int i;
@ -1430,13 +1170,7 @@ freeAllSourceWinsContent ()
** freeWinContent(). ** freeWinContent().
*/ */
void void
#ifdef __STDC__ freeWinContent (TuiGenWinInfoPtr winInfo)
freeWinContent (
TuiGenWinInfoPtr winInfo)
#else
freeWinContent (winInfo)
TuiGenWinInfoPtr winInfo;
#endif
{ {
if (winInfo->content != (OpaquePtr) NULL) if (winInfo->content != (OpaquePtr) NULL)
{ {
@ -1455,11 +1189,7 @@ freeWinContent (winInfo)
** freeAllWindows(). ** freeAllWindows().
*/ */
void void
#ifdef __STDC__
freeAllWindows (void) freeAllWindows (void)
#else
freeAllWindows ()
#endif
{ {
TuiWinType type = SRC_WIN; TuiWinType type = SRC_WIN;
@ -1472,15 +1202,7 @@ freeAllWindows ()
void void
#ifdef __STDC__ tuiDelDataWindows (TuiWinContent content, int contentSize)
tuiDelDataWindows (
TuiWinContent content,
int contentSize)
#else
tuiDelDataWindows (content, contentSize)
TuiWinContent content;
int contentSize;
#endif
{ {
int i; int i;
@ -1505,15 +1227,7 @@ tuiDelDataWindows (content, contentSize)
void void
#ifdef __STDC__ freeDataContent (TuiWinContent content, int contentSize)
freeDataContent (
TuiWinContent content,
int contentSize)
#else
freeDataContent (content, contentSize)
TuiWinContent content;
int contentSize;
#endif
{ {
int i; int i;
@ -1549,17 +1263,7 @@ freeDataContent (content, contentSize)
** freeContent(). ** freeContent().
*/ */
static void static void
#ifdef __STDC__ freeContent (TuiWinContent content, int contentSize, TuiWinType winType)
freeContent (
TuiWinContent content,
int contentSize,
TuiWinType winType)
#else
freeContent (content, contentSize, winType)
TuiWinContent content;
int contentSize;
TuiWinType winType;
#endif
{ {
if (content != (TuiWinContent) NULL) if (content != (TuiWinContent) NULL)
{ {
@ -1575,17 +1279,7 @@ freeContent (content, contentSize, winType)
** freeContentElements(). ** freeContentElements().
*/ */
static void static void
#ifdef __STDC__ freeContentElements (TuiWinContent content, int contentSize, TuiWinType type)
freeContentElements (
TuiWinContent content,
int contentSize,
TuiWinType type)
#else
freeContentElements (content, contentSize, type)
TuiWinContent content;
int contentSize;
TuiWinType type;
#endif
{ {
if (content != (TuiWinContent) NULL) if (content != (TuiWinContent) NULL)
{ {

76
gdb/tui/tuiDataWin.c
View file

@ -42,11 +42,7 @@
** If none are displayed, then return (-1). ** If none are displayed, then return (-1).
*/ */
int int
#ifdef __STDC__
tuiFirstDataItemDisplayed (void) tuiFirstDataItemDisplayed (void)
#else
tuiFirstDataItemDisplayed ()
#endif
{ {
int elementNo = (-1); int elementNo = (-1);
int i; int i;
@ -71,13 +67,7 @@ tuiFirstDataItemDisplayed ()
** past the data area (-1) is returned. ** past the data area (-1) is returned.
*/ */
int int
#ifdef __STDC__ tuiFirstDataElementNoInLine (int lineNo)
tuiFirstDataElementNoInLine (
int lineNo)
#else
tuiFirstDataElementNoInLine (lineNo)
int lineNo;
#endif
{ {
int firstElementNo = (-1); int firstElementNo = (-1);
@ -101,11 +91,7 @@ tuiFirstDataElementNoInLine (lineNo)
** This is usually done when the data window is scrolled. ** This is usually done when the data window is scrolled.
*/ */
void void
#ifdef __STDC__
tuiDeleteDataContentWindows (void) tuiDeleteDataContentWindows (void)
#else
tuiDeleteDataContentWindows ()
#endif
{ {
int i; int i;
TuiGenWinInfoPtr dataItemWinPtr; TuiGenWinInfoPtr dataItemWinPtr;
@ -124,13 +110,7 @@ tuiDeleteDataContentWindows ()
void void
#ifdef __STDC__ tuiEraseDataContent (char *prompt)
tuiEraseDataContent (
char *prompt)
#else
tuiEraseDataContent (prompt)
char *prompt;
#endif
{ {
werase (dataWin->generic.handle); werase (dataWin->generic.handle);
checkAndDisplayHighlightIfNeeded (dataWin); checkAndDisplayHighlightIfNeeded (dataWin);
@ -160,11 +140,7 @@ tuiEraseDataContent (prompt)
** content. It does not set the content. ** content. It does not set the content.
*/ */
void void
#ifdef __STDC__
tuiDisplayAllData (void) tuiDisplayAllData (void)
#else
tuiDisplayAllData ()
#endif
{ {
if (dataWin->generic.contentSize <= 0) if (dataWin->generic.contentSize <= 0)
tuiEraseDataContent (NO_DATA_STRING); tuiEraseDataContent (NO_DATA_STRING);
@ -193,13 +169,7 @@ tuiDisplayAllData ()
** data window. ** data window.
*/ */
void void
#ifdef __STDC__ tuiDisplayDataFromLine (int lineNo)
tuiDisplayDataFromLine (
int lineNo)
#else
tuiDisplayDataFromLine (lineNo)
int lineNo;
#endif
{ {
int _lineNo = lineNo; int _lineNo = lineNo;
@ -247,15 +217,7 @@ tuiDisplayDataFromLine (lineNo)
** Display data starting at element elementNo ** Display data starting at element elementNo
*/ */
void void
#ifdef __STDC__ tuiDisplayDataFrom (int elementNo, int reuseWindows)
tuiDisplayDataFrom (
int elementNo,
int reuseWindows)
#else
tuiDisplayDataFrom (elementNo, reuseWindows)
int elementNo;
int reuseWindows;
#endif
{ {
int firstLine = (-1); int firstLine = (-1);
@ -282,11 +244,7 @@ tuiDisplayDataFrom (elementNo, reuseWindows)
** Function to redisplay the contents of the data window. ** Function to redisplay the contents of the data window.
*/ */
void void
#ifdef __STDC__
tuiRefreshDataWin (void) tuiRefreshDataWin (void)
#else
tuiRefreshDataWin ()
#endif
{ {
tuiEraseDataContent ((char *) NULL); tuiEraseDataContent ((char *) NULL);
if (dataWin->generic.contentSize > 0) if (dataWin->generic.contentSize > 0)
@ -306,13 +264,7 @@ tuiRefreshDataWin ()
** Function to check the data values and hilite any that have changed ** Function to check the data values and hilite any that have changed
*/ */
void void
#ifdef __STDC__ tuiCheckDataValues (struct frame_info *frame)
tuiCheckDataValues (
struct frame_info *frame)
#else
tuiCheckDataValues (frame)
struct frame_info *frame;
#endif
{ {
tuiCheckRegisterValues (frame); tuiCheckRegisterValues (frame);
@ -350,13 +302,7 @@ tuiCheckDataValues (frame)
** changed with args in a va_list ** changed with args in a va_list
*/ */
void void
#ifdef __STDC__ tui_vCheckDataValues (va_list args)
tui_vCheckDataValues (
va_list args)
#else
tui_vCheckDataValues (args)
va_list args;
#endif
{ {
struct frame_info *frame = va_arg (args, struct frame_info *); struct frame_info *frame = va_arg (args, struct frame_info *);
@ -371,15 +317,7 @@ tui_vCheckDataValues (args)
** Scroll the data window vertically forward or backward. ** Scroll the data window vertically forward or backward.
*/ */
void void
#ifdef __STDC__ tuiVerticalDataScroll (TuiScrollDirection scrollDirection, int numToScroll)
tuiVerticalDataScroll (
TuiScrollDirection scrollDirection,
int numToScroll)
#else
tuiVerticalDataScroll (scrollDirection, numToScroll)
TuiScrollDirection scrollDirection;
int numToScroll;
#endif
{ {
int firstElementNo; int firstElementNo;
int firstLine = (-1); int firstLine = (-1);

57
gdb/tui/tuiDisassem.c
View file

@ -47,15 +47,7 @@ static struct breakpoint *_hasBreak (CORE_ADDR);
** Function to set the disassembly window's content. ** Function to set the disassembly window's content.
*/ */
TuiStatus TuiStatus
#ifdef __STDC__ tuiSetDisassemContent (struct symtab *s, Opaque startAddr)
tuiSetDisassemContent (
struct symtab *s,
Opaque startAddr)
#else
tuiSetDisassemContent (s, startAddr)
struct symtab *s;
Opaque startAddr;
#endif
{ {
TuiStatus ret = TUI_FAILURE; TuiStatus ret = TUI_FAILURE;
struct ui_file *gdb_dis_out; struct ui_file *gdb_dis_out;
@ -149,13 +141,7 @@ extern void strcat_address_numeric (CORE_ADDR, int, char *, int);
** Function to display the disassembly window with disassembled code. ** Function to display the disassembly window with disassembled code.
*/ */
void void
#ifdef __STDC__ tuiShowDisassem (Opaque startAddr)
tuiShowDisassem (
Opaque startAddr)
#else
tuiShowDisassem (startAddr)
Opaque startAddr;
#endif
{ {
struct symtab *s = find_pc_symtab ((CORE_ADDR) startAddr); struct symtab *s = find_pc_symtab ((CORE_ADDR) startAddr);
TuiWinInfoPtr winWithFocus = tuiWinWithFocus (); TuiWinInfoPtr winWithFocus = tuiWinWithFocus ();
@ -178,13 +164,7 @@ tuiShowDisassem (startAddr)
** Function to display the disassembly window. ** Function to display the disassembly window.
*/ */
void void
#ifdef __STDC__ tuiShowDisassemAndUpdateSource (Opaque startAddr)
tuiShowDisassemAndUpdateSource (
Opaque startAddr)
#else
tuiShowDisassemAndUpdateSource (startAddr)
Opaque startAddr;
#endif
{ {
struct symtab_and_line sal; struct symtab_and_line sal;
@ -212,13 +192,7 @@ tuiShowDisassemAndUpdateSource (startAddr)
** the disassembly as specified by the horizontal offset. ** the disassembly as specified by the horizontal offset.
*/ */
void void
#ifdef __STDC__ tuiShowDisassemAsIs (Opaque addr)
tuiShowDisassemAsIs (
Opaque addr)
#else
tuiShowDisassemAsIs (addr)
Opaque addr;
#endif
{ {
tuiAddWinToLayout (DISASSEM_WIN); tuiAddWinToLayout (DISASSEM_WIN);
tuiUpdateSourceWindowAsIs (disassemWin, (struct symtab *) NULL, addr, FALSE); tuiUpdateSourceWindowAsIs (disassemWin, (struct symtab *) NULL, addr, FALSE);
@ -237,11 +211,7 @@ tuiShowDisassemAsIs (addr)
** tuiGetBeginAsmAddress(). ** tuiGetBeginAsmAddress().
*/ */
Opaque Opaque
#ifdef __STDC__
tuiGetBeginAsmAddress (void) tuiGetBeginAsmAddress (void)
#else
tuiGetBeginAsmAddress ()
#endif
{ {
TuiGenWinInfoPtr locator; TuiGenWinInfoPtr locator;
TuiLocatorElementPtr element; TuiLocatorElementPtr element;
@ -272,15 +242,8 @@ tuiGetBeginAsmAddress ()
** Scroll the disassembly forward or backward vertically ** Scroll the disassembly forward or backward vertically
*/ */
void void
#ifdef __STDC__ tuiVerticalDisassemScroll (TuiScrollDirection scrollDirection,
tuiVerticalDisassemScroll ( int numToScroll)
TuiScrollDirection scrollDirection,
int numToScroll)
#else
tuiVerticalDisassemScroll (scrollDirection, numToScroll)
TuiScrollDirection scrollDirection;
int numToScroll;
#endif
{ {
if (disassemWin->generic.content != (OpaquePtr) NULL) if (disassemWin->generic.content != (OpaquePtr) NULL)
{ {
@ -335,13 +298,7 @@ tuiVerticalDisassemScroll (scrollDirection, numToScroll)
** source file indicated ** source file indicated
*/ */
static struct breakpoint * static struct breakpoint *
#ifdef __STDC__ _hasBreak (CORE_ADDR addr)
_hasBreak (
CORE_ADDR addr)
#else
_hasBreak (addr)
CORE_ADDR addr;
#endif
{ {
struct breakpoint *bpWithBreak = (struct breakpoint *) NULL; struct breakpoint *bpWithBreak = (struct breakpoint *) NULL;
struct breakpoint *bp; struct breakpoint *bp;

114
gdb/tui/tuiGeneralWin.c
View file

@ -39,13 +39,7 @@ static void _winResize (void);
** Refresh the window ** Refresh the window
*/ */
void void
#ifdef __STDC__ tuiRefreshWin (TuiGenWinInfoPtr winInfo)
tuiRefreshWin (
TuiGenWinInfoPtr winInfo)
#else
tuiRefreshWin (winInfo)
TuiGenWinInfoPtr winInfo;
#endif
{ {
if (winInfo->type == DATA_WIN && winInfo->contentSize > 0) if (winInfo->type == DATA_WIN && winInfo->contentSize > 0)
{ {
@ -81,13 +75,7 @@ tuiRefreshWin (winInfo)
** Function to delete the curses window, checking for null ** Function to delete the curses window, checking for null
*/ */
void void
#ifdef __STDC__ tuiDelwin (WINDOW * window)
tuiDelwin (
WINDOW * window)
#else
tuiDelwin (window)
WINDOW *window;
#endif
{ {
if (window != (WINDOW *) NULL) if (window != (WINDOW *) NULL)
delwin (window); delwin (window);
@ -100,15 +88,7 @@ tuiDelwin (window)
** boxWin(). ** boxWin().
*/ */
void void
#ifdef __STDC__ boxWin (TuiGenWinInfoPtr winInfo, int highlightFlag)
boxWin (
TuiGenWinInfoPtr winInfo,
int highlightFlag)
#else
boxWin (winInfo, highlightFlag)
TuiGenWinInfoPtr winInfo;
int highlightFlag;
#endif
{ {
if (m_genWinPtrNotNull (winInfo) && winInfo->handle != (WINDOW *) NULL) if (m_genWinPtrNotNull (winInfo) && winInfo->handle != (WINDOW *) NULL)
{ {
@ -130,13 +110,7 @@ boxWin (winInfo, highlightFlag)
** unhighlightWin(). ** unhighlightWin().
*/ */
void void
#ifdef __STDC__ unhighlightWin (TuiWinInfoPtr winInfo)
unhighlightWin (
TuiWinInfoPtr winInfo)
#else
unhighlightWin (winInfo)
TuiWinInfoPtr winInfo;
#endif
{ {
if (m_winPtrNotNull (winInfo) && winInfo->generic.handle != (WINDOW *) NULL) if (m_winPtrNotNull (winInfo) && winInfo->generic.handle != (WINDOW *) NULL)
{ {
@ -151,13 +125,7 @@ unhighlightWin (winInfo)
** highlightWin(). ** highlightWin().
*/ */
void void
#ifdef __STDC__ highlightWin (TuiWinInfoPtr winInfo)
highlightWin (
TuiWinInfoPtr winInfo)
#else
highlightWin (winInfo)
TuiWinInfoPtr winInfo;
#endif
{ {
if (m_winPtrNotNull (winInfo) && if (m_winPtrNotNull (winInfo) &&
winInfo->canHighlight && winInfo->generic.handle != (WINDOW *) NULL) winInfo->canHighlight && winInfo->generic.handle != (WINDOW *) NULL)
@ -173,13 +141,7 @@ highlightWin (winInfo)
** checkAndDisplayHighlightIfNecessay ** checkAndDisplayHighlightIfNecessay
*/ */
void void
#ifdef __STDC__ checkAndDisplayHighlightIfNeeded (TuiWinInfoPtr winInfo)
checkAndDisplayHighlightIfNeeded (
TuiWinInfoPtr winInfo)
#else
checkAndDisplayHighlightIfNeeded (winInfo)
TuiWinInfoPtr winInfo;
#endif
{ {
if (m_winPtrNotNull (winInfo) && winInfo->generic.type != CMD_WIN) if (m_winPtrNotNull (winInfo) && winInfo->generic.type != CMD_WIN)
{ {
@ -197,15 +159,7 @@ checkAndDisplayHighlightIfNeeded (winInfo)
** makeWindow(). ** makeWindow().
*/ */
void void
#ifdef __STDC__ makeWindow (TuiGenWinInfoPtr winInfo, int boxIt)
makeWindow (
TuiGenWinInfoPtr winInfo,
int boxIt)
#else
makeWindow (winInfo, boxIt)
TuiGenWinInfoPtr winInfo;
int boxIt;
#endif
{ {
WINDOW *handle; WINDOW *handle;
@ -242,13 +196,7 @@ makeWindow (winInfo, boxIt)
** Clear the window of all contents without calling wclear. ** Clear the window of all contents without calling wclear.
*/ */
void void
#ifdef __STDC__ tuiClearWin (TuiGenWinInfoPtr winInfo)
tuiClearWin (
TuiGenWinInfoPtr winInfo)
#else
tuiClearWin (winInfo)
TuiGenWinInfoPtr winInfo;
#endif
{ {
if (m_genWinPtrNotNull (winInfo) && winInfo->handle != (WINDOW *) NULL) if (m_genWinPtrNotNull (winInfo) && winInfo->handle != (WINDOW *) NULL)
{ {
@ -272,15 +220,7 @@ tuiClearWin (winInfo)
** and create it again when making it visible. ** and create it again when making it visible.
*/ */
void void
#ifdef __STDC__ makeVisible (TuiGenWinInfoPtr winInfo, int visible)
makeVisible (
TuiGenWinInfoPtr winInfo,
int visible)
#else
makeVisible (winInfo, visible)
TuiGenWinInfoPtr winInfo;
int visible;
#endif
{ {
/* Don't tear down/recreate command window */ /* Don't tear down/recreate command window */
if (winInfo->type == CMD_WIN) if (winInfo->type == CMD_WIN)
@ -315,13 +255,7 @@ makeVisible (winInfo, visible)
** Makes all windows invisible (except the command and locator windows) ** Makes all windows invisible (except the command and locator windows)
*/ */
void void
#ifdef __STDC__ makeAllVisible (int visible)
makeAllVisible (
int visible)
#else
makeAllVisible (visible)
int visible;
#endif
{ {
int i; int i;
@ -345,15 +279,7 @@ makeAllVisible (visible)
** scrollWinForward ** scrollWinForward
*/ */
void void
#ifdef __STDC__ scrollWinForward (TuiGenWinInfoPtr winInfo, int numLines)
scrollWinForward (
TuiGenWinInfoPtr winInfo,
int numLines)
#else
scrollWinForward (winInfo, numLines)
TuiGenWinInfoPtr winInfo;
int numLines;
#endif
{ {
if (winInfo->content != (OpaquePtr) NULL && if (winInfo->content != (OpaquePtr) NULL &&
winInfo->lastVisibleLine < winInfo->contentSize - 1) winInfo->lastVisibleLine < winInfo->contentSize - 1)
@ -395,15 +321,7 @@ scrollWinForward (winInfo, numLines)
** scrollWinBackward ** scrollWinBackward
*/ */
void void
#ifdef __STDC__ scrollWinBackward (TuiGenWinInfoPtr winInfo, int numLines)
scrollWinBackward (
TuiGenWinInfoPtr winInfo,
int numLines)
#else
scrollWinBackward (winInfo, numLines)
TuiGenWinInfoPtr winInfo;
int numLines;
#endif
{ {
if (winInfo->content != (OpaquePtr) NULL && if (winInfo->content != (OpaquePtr) NULL &&
(winInfo->lastVisibleLine - winInfo->viewportHeight) > 0) (winInfo->lastVisibleLine - winInfo->viewportHeight) > 0)
@ -445,13 +363,7 @@ scrollWinBackward (winInfo, numLines)
** Function to refresh all the windows currently displayed ** Function to refresh all the windows currently displayed
*/ */
void void
#ifdef __STDC__ refreshAll (TuiWinInfoPtr * list)
refreshAll (
TuiWinInfoPtr * list)
#else
refreshAll (list)
TuiWinInfoPtr *list;
#endif
{ {
TuiWinType type; TuiWinType type;
TuiGenWinInfoPtr locator = locatorWinInfoPtr (); TuiGenWinInfoPtr locator = locatorWinInfoPtr ();

95
gdb/tui/tuiIO.c
View file

@ -28,11 +28,7 @@
#include "tuiCommand.h" #include "tuiCommand.h"
#include "tuiWin.h" #include "tuiWin.h"
#ifdef ANSI_PROTOTYPES
#include <stdarg.h> #include <stdarg.h>
#else
#include <varargs.h>
#endif
/* The Solaris header files seem to provide no declaration for this at /* The Solaris header files seem to provide no declaration for this at
all when __STDC__ is defined. This shouldn't conflict with all when __STDC__ is defined. This shouldn't conflict with
@ -62,15 +58,7 @@ static unsigned int _tuiHandleResizeDuringIO (unsigned int);
** mode), calls tuiPuts_unfiltered(). ** mode), calls tuiPuts_unfiltered().
*/ */
void void
#ifdef __STDC__ tuiPuts_unfiltered (const char *string, struct ui_file * stream)
tuiPuts_unfiltered (
const char *string,
struct ui_file * stream)
#else
tuiPuts_unfiltered (string, stream)
char *string;
struct ui_file *stream;
#endif
{ {
int len = strlen (string); int len = strlen (string);
int i, linech; int i, linech;
@ -277,12 +265,7 @@ tui_tputs (str, affcnt, putfunc)
** Wrapper around wgetch with the window in a va_list ** Wrapper around wgetch with the window in a va_list
*/ */
unsigned int unsigned int
#ifdef __STDC__
tui_vwgetch (va_list args) tui_vwgetch (va_list args)
#else
tui_vwgetch (args)
va_list args;
#endif
{ {
unsigned int ch; unsigned int ch;
WINDOW *window; WINDOW *window;
@ -298,12 +281,7 @@ tui_vwgetch (args)
** Wrapper around read() with paramets in a va_list ** Wrapper around read() with paramets in a va_list
*/ */
unsigned int unsigned int
#ifdef __STDC__
tui_vread (va_list args) tui_vread (va_list args)
#else
tui_vread (args)
va_list args;
#endif
{ {
int result = 0; int result = 0;
int filedes = va_arg (args, int); int filedes = va_arg (args, int);
@ -320,17 +298,7 @@ tui_vread (args)
** Function to perform a read() catching resize events ** Function to perform a read() catching resize events
*/ */
int int
#ifdef __STDC__ tuiRead (int filedes, char *buf, int nbytes)
tuiRead (
int filedes,
char *buf,
int nbytes)
#else
tuiRead (filedes, buf, nbytes)
int filedes;
char *buf;
int nbytes;
#endif
{ {
int result = 0; int result = 0;
@ -351,11 +319,7 @@ tuiRead (filedes, buf, nbytes)
** command_line_input() in top.c ** command_line_input() in top.c
*/ */
unsigned int unsigned int
#ifdef __STDC__
tuiGetc (void) tuiGetc (void)
#else
tuiGetc ()
#endif
{ {
unsigned int ch; unsigned int ch;
extern char *rl_prompt; extern char *rl_prompt;
@ -399,11 +363,7 @@ tuiGetc ()
utils.c */ utils.c */
unsigned int unsigned int
#ifdef __STDC__
tuiBufferGetc (void) tuiBufferGetc (void)
#else
tuiBufferGetc ()
#endif
{ {
unsigned int ch; unsigned int ch;
static unsigned char _ibuffer[512]; static unsigned char _ibuffer[512];
@ -452,13 +412,7 @@ tuiBufferGetc ()
** tuiStartNewLines(). ** tuiStartNewLines().
*/ */
void void
#ifdef __STDC__ tuiStartNewLines (int numLines)
tuiStartNewLines (
int numLines)
#else
tuiStartNewLines (numLines)
int numLines;
#endif
{ {
if (numLines > 0) if (numLines > 0)
{ {
@ -483,13 +437,7 @@ tuiStartNewLines (numLines)
** With numLines in a va_list ** With numLines in a va_list
*/ */
void void
#ifdef __STDC__ tui_vStartNewLines (va_list args)
tui_vStartNewLines (
va_list args)
#else
tui_vStartNewLines (args)
va_list args;
#endif
{ {
int numLines = va_arg (args, int); int numLines = va_arg (args, int);
@ -511,13 +459,8 @@ tui_vStartNewLines (args)
** to return from getc or read. ** to return from getc or read.
*/ */
static unsigned int static unsigned int
#ifdef __STDC__ _tuiHandleResizeDuringIO (unsigned int originalCh)
_tuiHandleResizeDuringIO ( /* the char just read */
unsigned int originalCh) /* the char just read */
#else
_tuiHandleResizeDuringIO (originalCh)
unsigned int originalCh;
#endif
{ {
if (tuiWinResized ()) if (tuiWinResized ())
{ {
@ -537,13 +480,7 @@ _tuiHandleResizeDuringIO (originalCh)
** Function to update the command window information. ** Function to update the command window information.
*/ */
static void static void
#ifdef __STDC__ _updateCommandInfo (int sizeOfString)
_updateCommandInfo (
int sizeOfString)
#else
_updateCommandInfo (sizeOfString)
int sizeOfString;
#endif
{ {
if ((sizeOfString + if ((sizeOfString +
@ -573,13 +510,7 @@ int tui_owns_terminal = 0;
*/ */
void void
#ifdef __STDC__ tuiTermSetup (int turn_off_echo)
tuiTermSetup (
int turn_off_echo)
#else
tuiTermSetup (turn_off_echo)
int turn_off_echo;
#endif
{ {
char *buffer; char *buffer;
int start; int start;
@ -668,15 +599,7 @@ tuiTermSetup (turn_off_echo)
* way out of tuiDo, thus setting up the terminal this way for * way out of tuiDo, thus setting up the terminal this way for
* debugger command I/O. */ * debugger command I/O. */
void void
#ifdef __STDC__ tuiTermUnsetup (int turn_on_echo, int to_column)
tuiTermUnsetup (
int turn_on_echo,
int to_column)
#else
tuiTermUnsetup (turn_on_echo, to_column)
int turn_on_echo;
int to_column;
#endif
{ {
int start; int start;
int end; int end;

268
gdb/tui/tuiLayout.c
View file

@ -79,13 +79,7 @@ static TuiLayoutType lastLayout = UNDEFINED_LAYOUT;
** Show the screen layout defined ** Show the screen layout defined
*/ */
void void
#ifdef __STDC__ showLayout (TuiLayoutType layout)
showLayout (
TuiLayoutType layout)
#else
showLayout (layout)
TuiLayoutType layout;
#endif
{ {
TuiLayoutType curLayout = currentLayout (); TuiLayoutType curLayout = currentLayout ();
@ -145,15 +139,8 @@ showLayout (layout)
** to regsDisplayType. ** to regsDisplayType.
*/ */
TuiStatus TuiStatus
#ifdef __STDC__ tuiSetLayout (TuiLayoutType layoutType,
tuiSetLayout ( TuiRegisterDisplayType regsDisplayType)
TuiLayoutType layoutType,
TuiRegisterDisplayType regsDisplayType)
#else
tuiSetLayout (layoutType, regsDisplayType)
TuiLayoutType layoutType;
TuiRegisterDisplayType regsDisplayType;
#endif
{ {
TuiStatus status = TUI_SUCCESS; TuiStatus status = TUI_SUCCESS;
@ -295,13 +282,7 @@ tuiSetLayout (layoutType, regsDisplayType)
** REGS, $REGS, $GREGS, $FREGS, $SREGS with arguments in a va_list ** REGS, $REGS, $GREGS, $FREGS, $SREGS with arguments in a va_list
*/ */
TuiStatus TuiStatus
#ifdef __STDC__ tui_vSetLayoutTo (va_list args)
tui_vSetLayoutTo (
va_list args)
#else
tui_vSetLayoutTo (args)
va_list args;
#endif
{ {
char *layoutName; char *layoutName;
@ -318,13 +299,7 @@ tui_vSetLayoutTo (args)
** window to be added. ** window to be added.
*/ */
void void
#ifdef __STDC__ tuiAddWinToLayout (TuiWinType type)
tuiAddWinToLayout (
TuiWinType type)
#else
tuiAddWinToLayout (type)
TuiWinType type;
#endif
{ {
TuiLayoutType curLayout = currentLayout (); TuiLayoutType curLayout = currentLayout ();
@ -378,13 +353,7 @@ tuiAddWinToLayout (type)
** with arguments in a va_list. ** with arguments in a va_list.
*/ */
void void
#ifdef __STDC__ tui_vAddWinToLayout (va_list args)
tui_vAddWinToLayout (
va_list args)
#else
tui_vAddWinToLayout (args)
va_list args;
#endif
{ {
TuiWinType type = va_arg (args, TuiWinType); TuiWinType type = va_arg (args, TuiWinType);
@ -401,15 +370,7 @@ tui_vAddWinToLayout (args)
** type and the layout. ** type and the layout.
*/ */
int int
#ifdef __STDC__ tuiDefaultWinHeight (TuiWinType type, TuiLayoutType layout)
tuiDefaultWinHeight (
TuiWinType type,
TuiLayoutType layout)
#else
tuiDefaultWinHeight (type, layout)
TuiWinType type;
TuiLayoutType layout;
#endif
{ {
int h; int h;
@ -451,15 +412,7 @@ tuiDefaultWinHeight (type, layout)
** type and the layout. ** type and the layout.
*/ */
int int
#ifdef __STDC__ tuiDefaultWinViewportHeight (TuiWinType type, TuiLayoutType layout)
tuiDefaultWinViewportHeight (
TuiWinType type,
TuiLayoutType layout)
#else
tuiDefaultWinViewportHeight (type, layout)
TuiWinType type;
TuiLayoutType layout;
#endif
{ {
int h; int h;
@ -522,13 +475,7 @@ Source/Disassembly/Command layouts.\n");
** $REGS, $GREGS, $FREGS, $SREGS. ** $REGS, $GREGS, $FREGS, $SREGS.
*/ */
static TuiStatus static TuiStatus
#ifdef __STDC__ _tuiSetLayoutTo (char *layoutName)
_tuiSetLayoutTo (
char *layoutName)
#else
_tuiSetLayoutTo (layoutName)
char *layoutName;
#endif
{ {
TuiStatus status = TUI_SUCCESS; TuiStatus status = TUI_SUCCESS;
@ -631,11 +578,7 @@ _tuiSetLayoutTo (layoutName)
static Opaque static Opaque
#ifdef __STDC__
_extractDisplayStartAddr (void) _extractDisplayStartAddr (void)
#else
_extractDisplayStartAddr ()
#endif
{ {
TuiLayoutType curLayout = currentLayout (); TuiLayoutType curLayout = currentLayout ();
Opaque addr; Opaque addr;
@ -663,13 +606,7 @@ _extractDisplayStartAddr ()
static void static void
#ifdef __STDC__ _tuiHandleXDBLayout (TuiLayoutDefPtr layoutDef)
_tuiHandleXDBLayout (
TuiLayoutDefPtr layoutDef)
#else
_tuiHandleXDBLayout (layoutDef)
TuiLayoutDefPtr layoutDef;
#endif
{ {
if (layoutDef->split) if (layoutDef->split)
{ {
@ -690,27 +627,13 @@ _tuiHandleXDBLayout (layoutDef)
static void static void
#ifdef __STDC__ _tuiToggleLayout_command (char *arg, int fromTTY)
_tuiToggleLayout_command (
char *arg,
int fromTTY)
#else
_tuiToggleLayout_command (arg, fromTTY)
char *arg;
int fromTTY;
#endif
{ {
tuiDo ((TuiOpaqueFuncPtr) _tui_vToggleLayout_command, arg, fromTTY); tuiDo ((TuiOpaqueFuncPtr) _tui_vToggleLayout_command, arg, fromTTY);
} }
static void static void
#ifdef __STDC__ _tui_vToggleLayout_command (va_list args)
_tui_vToggleLayout_command (
va_list args)
#else
_tui_vToggleLayout_command (args)
va_list args;
#endif
{ {
TuiLayoutDefPtr layoutDef = tuiLayoutDef (); TuiLayoutDefPtr layoutDef = tuiLayoutDef ();
@ -727,27 +650,13 @@ _tui_vToggleLayout_command (args)
static void static void
#ifdef __STDC__ _tuiToggleSplitLayout_command (char *arg, int fromTTY)
_tuiToggleSplitLayout_command (
char *arg,
int fromTTY)
#else
_tuiToggleSplitLayout_command (arg, fromTTY)
char *arg;
int fromTTY;
#endif
{ {
tuiDo ((TuiOpaqueFuncPtr) _tui_vToggleSplitLayout_command, arg, fromTTY); tuiDo ((TuiOpaqueFuncPtr) _tui_vToggleSplitLayout_command, arg, fromTTY);
} }
static void static void
#ifdef __STDC__ _tui_vToggleSplitLayout_command (va_list args)
_tui_vToggleSplitLayout_command (
va_list args)
#else
_tui_vToggleSplitLayout_command (args)
va_list args;
#endif
{ {
TuiLayoutDefPtr layoutDef = tuiLayoutDef (); TuiLayoutDefPtr layoutDef = tuiLayoutDef ();
@ -759,15 +668,7 @@ _tui_vToggleSplitLayout_command (args)
static void static void
#ifdef __STDC__ _tuiLayout_command (char *arg, int fromTTY)
_tuiLayout_command (
char *arg,
int fromTTY)
#else
_tuiLayout_command (arg, fromTTY)
char *arg;
int fromTTY;
#endif
{ {
if ((TuiStatus) tuiDo ( if ((TuiStatus) tuiDo (
(TuiOpaqueFuncPtr) tui_vSetLayoutTo, arg) != TUI_SUCCESS) (TuiOpaqueFuncPtr) tui_vSetLayoutTo, arg) != TUI_SUCCESS)
@ -781,11 +682,7 @@ _tuiLayout_command (arg, fromTTY)
** Answer the previous layout to cycle to. ** Answer the previous layout to cycle to.
*/ */
static TuiLayoutType static TuiLayoutType
#ifdef __STDC__
_nextLayout (void) _nextLayout (void)
#else
_nextLayout ()
#endif
{ {
TuiLayoutType newLayout; TuiLayoutType newLayout;
@ -808,11 +705,7 @@ _nextLayout ()
** Answer the next layout to cycle to. ** Answer the next layout to cycle to.
*/ */
static TuiLayoutType static TuiLayoutType
#ifdef __STDC__
_prevLayout (void) _prevLayout (void)
#else
_prevLayout ()
#endif
{ {
TuiLayoutType newLayout; TuiLayoutType newLayout;
@ -835,17 +728,7 @@ _prevLayout ()
** _makeCommandWindow(). ** _makeCommandWindow().
*/ */
static void static void
#ifdef __STDC__ _makeCommandWindow (TuiWinInfoPtr * winInfoPtr, int height, int originY)
_makeCommandWindow (
TuiWinInfoPtr * winInfoPtr,
int height,
int originY)
#else
_makeCommandWindow (winInfoPtr, height, originY)
TuiWinInfoPtr *winInfoPtr;
int height;
int originY;
#endif
{ {
_initAndMakeWin ((Opaque *) winInfoPtr, _initAndMakeWin ((Opaque *) winInfoPtr,
CMD_WIN, CMD_WIN,
@ -865,17 +748,7 @@ _makeCommandWindow (winInfoPtr, height, originY)
** _makeSourceWindow(). ** _makeSourceWindow().
*/ */
static void static void
#ifdef __STDC__ _makeSourceWindow (TuiWinInfoPtr * winInfoPtr, int height, int originY)
_makeSourceWindow (
TuiWinInfoPtr * winInfoPtr,
int height,
int originY)
#else
_makeSourceWindow (winInfoPtr, height, originY)
TuiWinInfoPtr *winInfoPtr;
int height;
int originY;
#endif
{ {
_makeSourceOrDisassemWindow (winInfoPtr, SRC_WIN, height, originY); _makeSourceOrDisassemWindow (winInfoPtr, SRC_WIN, height, originY);
@ -887,17 +760,7 @@ _makeSourceWindow (winInfoPtr, height, originY)
** _makeDisassemWindow(). ** _makeDisassemWindow().
*/ */
static void static void
#ifdef __STDC__ _makeDisassemWindow (TuiWinInfoPtr * winInfoPtr, int height, int originY)
_makeDisassemWindow (
TuiWinInfoPtr * winInfoPtr,
int height,
int originY)
#else
_makeDisassemWindow (winInfoPtr, height, originY)
TuiWinInfoPtr *winInfoPtr;
int height;
int originY;
#endif
{ {
_makeSourceOrDisassemWindow (winInfoPtr, DISASSEM_WIN, height, originY); _makeSourceOrDisassemWindow (winInfoPtr, DISASSEM_WIN, height, originY);
@ -909,17 +772,7 @@ _makeDisassemWindow (winInfoPtr, height, originY)
** _makeDataWindow(). ** _makeDataWindow().
*/ */
static void static void
#ifdef __STDC__ _makeDataWindow (TuiWinInfoPtr * winInfoPtr, int height, int originY)
_makeDataWindow (
TuiWinInfoPtr * winInfoPtr,
int height,
int originY)
#else
_makeDataWindow (winInfoPtr, height, originY)
TuiWinInfoPtr *winInfoPtr;
int height;
int originY;
#endif
{ {
_initAndMakeWin ((Opaque *) winInfoPtr, _initAndMakeWin ((Opaque *) winInfoPtr,
DATA_WIN, DATA_WIN,
@ -939,11 +792,7 @@ _makeDataWindow (winInfoPtr, height, originY)
** Show the Source/Command layout ** Show the Source/Command layout
*/ */
static void static void
#ifdef __STDC__
_showSourceCommand (void) _showSourceCommand (void)
#else
_showSourceCommand ()
#endif
{ {
_showSourceOrDisassemAndCommand (SRC_COMMAND); _showSourceOrDisassemAndCommand (SRC_COMMAND);
@ -956,11 +805,7 @@ _showSourceCommand ()
** Show the Dissassem/Command layout ** Show the Dissassem/Command layout
*/ */
static void static void
#ifdef __STDC__
_showDisassemCommand (void) _showDisassemCommand (void)
#else
_showDisassemCommand ()
#endif
{ {
_showSourceOrDisassemAndCommand (DISASSEM_COMMAND); _showSourceOrDisassemAndCommand (DISASSEM_COMMAND);
@ -973,11 +818,7 @@ _showDisassemCommand ()
** Show the Source/Disassem/Command layout ** Show the Source/Disassem/Command layout
*/ */
static void static void
#ifdef __STDC__
_showSourceDisassemCommand (void) _showSourceDisassemCommand (void)
#else
_showSourceDisassemCommand ()
#endif
{ {
TuiGenWinInfoPtr locator = locatorWinInfoPtr (); TuiGenWinInfoPtr locator = locatorWinInfoPtr ();
@ -1095,13 +936,7 @@ _showSourceDisassemCommand ()
** Show the Source/Data/Command or the Dissassembly/Data/Command layout ** Show the Source/Data/Command or the Dissassembly/Data/Command layout
*/ */
static void static void
#ifdef __STDC__ _showData (TuiLayoutType newLayout)
_showData (
TuiLayoutType newLayout)
#else
_showData (newLayout)
TuiLayoutType newLayout;
#endif
{ {
int totalHeight = (termHeight () - cmdWin->generic.height); int totalHeight = (termHeight () - cmdWin->generic.height);
int srcHeight, dataHeight; int srcHeight, dataHeight;
@ -1169,23 +1004,8 @@ _showData (newLayout)
** _initGenWinInfo(). ** _initGenWinInfo().
*/ */
static void static void
#ifdef __STDC__ _initGenWinInfo (TuiGenWinInfoPtr winInfo, TuiWinType type,
_initGenWinInfo ( int height, int width, int originX, int originY)
TuiGenWinInfoPtr winInfo,
TuiWinType type,
int height,
int width,
int originX,
int originY)
#else
_initGenWinInfo (winInfo, type, height, width, originX, originY)
TuiGenWinInfoPtr winInfo;
TuiWinType type;
int height;
int width;
int originX;
int originY;
#endif
{ {
int h = height; int h = height;
@ -1210,25 +1030,8 @@ _initGenWinInfo (winInfo, type, height, width, originX, originY)
** _initAndMakeWin(). ** _initAndMakeWin().
*/ */
static void static void
#ifdef __STDC__ _initAndMakeWin (Opaque * winInfoPtr, TuiWinType winType,
_initAndMakeWin ( int height, int width, int originX, int originY, int boxIt)
Opaque * winInfoPtr,
TuiWinType winType,
int height,
int width,
int originX,
int originY,
int boxIt)
#else
_initAndMakeWin (winInfoPtr, winType, height, width, originX, originY, boxIt)
Opaque *winInfoPtr;
TuiWinType winType;
int height;
int width;
int originX;
int originY;
int boxIt;
#endif
{ {
Opaque opaqueWinInfo = *winInfoPtr; Opaque opaqueWinInfo = *winInfoPtr;
TuiGenWinInfoPtr generic; TuiGenWinInfoPtr generic;
@ -1270,19 +1073,8 @@ _initAndMakeWin (winInfoPtr, winType, height, width, originX, originY, boxIt)
** _makeSourceOrDisassemWindow(). ** _makeSourceOrDisassemWindow().
*/ */
static void static void
#ifdef __STDC__ _makeSourceOrDisassemWindow (TuiWinInfoPtr * winInfoPtr, TuiWinType type,
_makeSourceOrDisassemWindow ( int height, int originY)
TuiWinInfoPtr * winInfoPtr,
TuiWinType type,
int height,
int originY)
#else
_makeSourceOrDisassemWindow (winInfoPtr, type, height, originY)
TuiWinInfoPtr *winInfoPtr;
TuiWinType type;
int height;
int originY;
#endif
{ {
TuiGenWinInfoPtr executionInfo = (TuiGenWinInfoPtr) NULL; TuiGenWinInfoPtr executionInfo = (TuiGenWinInfoPtr) NULL;
@ -1322,13 +1114,7 @@ _makeSourceOrDisassemWindow (winInfoPtr, type, height, originY)
** Show the Source/Command or the Disassem layout ** Show the Source/Command or the Disassem layout
*/ */
static void static void
#ifdef __STDC__ _showSourceOrDisassemAndCommand (TuiLayoutType layoutType)
_showSourceOrDisassemAndCommand (
TuiLayoutType layoutType)
#else
_showSourceOrDisassemAndCommand (layoutType)
TuiLayoutType layoutType;
#endif
{ {
if (currentLayout () != layoutType) if (currentLayout () != layoutType)
{ {

289
gdb/tui/tuiRegs.c
View file

@ -98,11 +98,7 @@ static void _tui_vShowRegisters_commandSupport (va_list);
** If there are no registers (-1) is returned. ** If there are no registers (-1) is returned.
*/ */
int int
#ifdef __STDC__
tuiLastRegsLineNo (void) tuiLastRegsLineNo (void)
#else
tuiLastRegsLineNo ()
#endif
{ {
register int numLines = (-1); register int numLines = (-1);
@ -125,13 +121,7 @@ tuiLastRegsLineNo ()
** there are, -1 is returned. ** there are, -1 is returned.
*/ */
int int
#ifdef __STDC__ tuiLineFromRegElementNo (int elementNo)
tuiLineFromRegElementNo (
int elementNo)
#else
tuiLineFromRegElementNo (elementNo)
int elementNo;
#endif
{ {
if (elementNo < dataWin->detail.dataDisplayInfo.regsContentCount) if (elementNo < dataWin->detail.dataDisplayInfo.regsContentCount)
{ {
@ -160,13 +150,7 @@ tuiLineFromRegElementNo (elementNo)
** past the register area (-1) is returned. ** past the register area (-1) is returned.
*/ */
int int
#ifdef __STDC__ tuiFirstRegElementNoInLine (int lineNo)
tuiFirstRegElementNoInLine (
int lineNo)
#else
tuiFirstRegElementNoInLine (lineNo)
int lineNo;
#endif
{ {
if ((lineNo * dataWin->detail.dataDisplayInfo.regsColumnCount) if ((lineNo * dataWin->detail.dataDisplayInfo.regsColumnCount)
<= dataWin->detail.dataDisplayInfo.regsContentCount) <= dataWin->detail.dataDisplayInfo.regsContentCount)
@ -184,13 +168,7 @@ tuiFirstRegElementNoInLine (lineNo)
** the register area (-1) is returned. ** the register area (-1) is returned.
*/ */
int int
#ifdef __STDC__ tuiLastRegElementNoInLine (int lineNo)
tuiLastRegElementNoInLine (
int lineNo)
#else
tuiLastRegElementNoInLine (lineNo)
int lineNo;
#endif
{ {
if ((lineNo * dataWin->detail.dataDisplayInfo.regsColumnCount) <= if ((lineNo * dataWin->detail.dataDisplayInfo.regsColumnCount) <=
dataWin->detail.dataDisplayInfo.regsContentCount) dataWin->detail.dataDisplayInfo.regsContentCount)
@ -207,13 +185,7 @@ tuiLastRegElementNoInLine (lineNo)
** the registers. ** the registers.
*/ */
int int
#ifdef __STDC__ tuiCalculateRegsColumnCount (TuiRegisterDisplayType dpyType)
tuiCalculateRegsColumnCount (
TuiRegisterDisplayType dpyType)
#else
tuiCalculateRegsColumnCount (dpyType)
TuiRegisterDisplayType dpyType;
#endif
{ {
int colCount, colWidth; int colCount, colWidth;
@ -239,13 +211,7 @@ tuiCalculateRegsColumnCount (dpyType)
** cleared. What registers are displayed is dependent upon dpyType. ** cleared. What registers are displayed is dependent upon dpyType.
*/ */
void void
#ifdef __STDC__ tuiShowRegisters (TuiRegisterDisplayType dpyType)
tuiShowRegisters (
TuiRegisterDisplayType dpyType)
#else
tuiShowRegisters (dpyType)
TuiRegisterDisplayType dpyType;
#endif
{ {
TuiStatus ret = TUI_FAILURE; TuiStatus ret = TUI_FAILURE;
int refreshValuesOnly = FALSE; int refreshValuesOnly = FALSE;
@ -318,13 +284,7 @@ tuiShowRegisters (dpyType)
** the end of the registers is done here. ** the end of the registers is done here.
*/ */
void void
#ifdef __STDC__ tuiDisplayRegistersFrom (int startElementNo)
tuiDisplayRegistersFrom (
int startElementNo)
#else
tuiDisplayRegistersFrom (startElementNo)
int startElementNo;
#endif
{ {
if (dataWin->detail.dataDisplayInfo.regsContent != (TuiWinContent) NULL && if (dataWin->detail.dataDisplayInfo.regsContent != (TuiWinContent) NULL &&
dataWin->detail.dataDisplayInfo.regsContentCount > 0) dataWin->detail.dataDisplayInfo.regsContentCount > 0)
@ -410,15 +370,7 @@ tuiDisplayRegistersFrom (startElementNo)
** of the register display. ** of the register display.
*/ */
void void
#ifdef __STDC__ tuiDisplayRegElementAtLine (int startElementNo, int startLineNo)
tuiDisplayRegElementAtLine (
int startElementNo,
int startLineNo)
#else
tuiDisplayRegElementAtLine (startElementNo, startLineNo)
int startElementNo;
int startLineNo;
#endif
{ {
if (dataWin->detail.dataDisplayInfo.regsContent != (TuiWinContent) NULL && if (dataWin->detail.dataDisplayInfo.regsContent != (TuiWinContent) NULL &&
dataWin->detail.dataDisplayInfo.regsContentCount > 0) dataWin->detail.dataDisplayInfo.regsContentCount > 0)
@ -457,15 +409,7 @@ tuiDisplayRegElementAtLine (startElementNo, startLineNo)
** actually started from. If nothing is displayed (-1) is returned. ** actually started from. If nothing is displayed (-1) is returned.
*/ */
int int
#ifdef __STDC__ tuiDisplayRegistersFromLine (int lineNo, int forceDisplay)
tuiDisplayRegistersFromLine (
int lineNo,
int forceDisplay)
#else
tuiDisplayRegistersFromLine (lineNo, forceDisplay)
int lineNo;
int forceDisplay;
#endif
{ {
int elementNo; int elementNo;
@ -512,13 +456,7 @@ tuiDisplayRegistersFromLine (lineNo, forceDisplay)
** they are updated with the new value and highlighted. ** they are updated with the new value and highlighted.
*/ */
void void
#ifdef __STDC__ tuiCheckRegisterValues (struct frame_info *frame)
tuiCheckRegisterValues (
struct frame_info *frame)
#else
tuiCheckRegisterValues (frame)
struct frame_info *frame;
#endif
{ {
if (m_winPtrNotNull (dataWin) && dataWin->generic.isVisible) if (m_winPtrNotNull (dataWin) && dataWin->generic.isVisible)
{ {
@ -576,11 +514,7 @@ tuiCheckRegisterValues (frame)
** tuiToggleFloatRegs(). ** tuiToggleFloatRegs().
*/ */
void void
#ifdef __STDC__
tuiToggleFloatRegs (void) tuiToggleFloatRegs (void)
#else
tuiToggleFloatRegs ()
#endif
{ {
TuiLayoutDefPtr layoutDef = tuiLayoutDef (); TuiLayoutDefPtr layoutDef = tuiLayoutDef ();
@ -637,13 +571,7 @@ registers.\n",
** Return the register name. ** Return the register name.
*/ */
static char * static char *
#ifdef __STDC__ _tuiRegisterName (int regNum)
_tuiRegisterName (
int regNum)
#else
_tuiRegisterName (regNum)
int regNum;
#endif
{ {
if (reg_names[regNum] != (char *) NULL && *(reg_names[regNum]) != (char) 0) if (reg_names[regNum] != (char *) NULL && *(reg_names[regNum]) != (char) 0)
return reg_names[regNum]; return reg_names[regNum];
@ -658,21 +586,9 @@ _tuiRegisterName (regNum)
** suitable for printing or display ** suitable for printing or display
*/ */
static void static void
#ifdef __STDC__ _tuiRegisterFormat (char *buf, int bufLen, int regNum,
_tuiRegisterFormat ( TuiDataElementPtr dataElement,
char *buf, enum precision_type precision)
int bufLen,
int regNum,
TuiDataElementPtr dataElement,
enum precision_type precision)
#else
_tuiRegisterFormat (buf, bufLen, regNum, dataElement, precision)
char *buf;
int bufLen;
int regNum;
TuiDataElementPtr dataElement;
enum precision_type precision;
#endif
{ {
char tmpBuf[15]; char tmpBuf[15];
char *fmt; char *fmt;
@ -693,13 +609,7 @@ _tuiRegisterFormat (buf, bufLen, regNum, dataElement, precision)
** Set the content of the data window to consist of the general registers. ** Set the content of the data window to consist of the general registers.
*/ */
static TuiStatus static TuiStatus
#ifdef __STDC__ _tuiSetGeneralRegsContent (int refreshValuesOnly)
_tuiSetGeneralRegsContent (
int refreshValuesOnly)
#else
_tuiSetGeneralRegsContent (refreshValuesOnly)
int refreshValuesOnly;
#endif
{ {
return (_tuiSetRegsContent (0, return (_tuiSetRegsContent (0,
NUM_GENERAL_REGS - 1, NUM_GENERAL_REGS - 1,
@ -716,13 +626,7 @@ _tuiSetGeneralRegsContent (refreshValuesOnly)
** Set the content of the data window to consist of the special registers. ** Set the content of the data window to consist of the special registers.
*/ */
static TuiStatus static TuiStatus
#ifdef __STDC__ _tuiSetSpecialRegsContent (int refreshValuesOnly)
_tuiSetSpecialRegsContent (
int refreshValuesOnly)
#else
_tuiSetSpecialRegsContent (refreshValuesOnly)
int refreshValuesOnly;
#endif
{ {
TuiStatus ret = TUI_FAILURE; TuiStatus ret = TUI_FAILURE;
int i, endRegNum; int i, endRegNum;
@ -749,13 +653,7 @@ _tuiSetSpecialRegsContent (refreshValuesOnly)
** Set the content of the data window to consist of the special registers. ** Set the content of the data window to consist of the special registers.
*/ */
static TuiStatus static TuiStatus
#ifdef __STDC__ _tuiSetGeneralAndSpecialRegsContent (int refreshValuesOnly)
_tuiSetGeneralAndSpecialRegsContent (
int refreshValuesOnly)
#else
_tuiSetGeneralAndSpecialRegsContent (refreshValuesOnly)
int refreshValuesOnly;
#endif
{ {
TuiStatus ret = TUI_FAILURE; TuiStatus ret = TUI_FAILURE;
int i, endRegNum = (-1); int i, endRegNum = (-1);
@ -778,15 +676,8 @@ _tuiSetGeneralAndSpecialRegsContent (refreshValuesOnly)
** Set the content of the data window to consist of the float registers. ** Set the content of the data window to consist of the float registers.
*/ */
static TuiStatus static TuiStatus
#ifdef __STDC__ _tuiSetFloatRegsContent (TuiRegisterDisplayType dpyType,
_tuiSetFloatRegsContent ( int refreshValuesOnly)
TuiRegisterDisplayType dpyType,
int refreshValuesOnly)
#else
_tuiSetFloatRegsContent (dpyType, refreshValuesOnly)
TuiRegisterDisplayType dpyType;
int refreshValuesOnly;
#endif
{ {
TuiStatus ret = TUI_FAILURE; TuiStatus ret = TUI_FAILURE;
int i, startRegNum; int i, startRegNum;
@ -814,17 +705,9 @@ _tuiSetFloatRegsContent (dpyType, refreshValuesOnly)
** If TRUE, newValue is filled in with the new value. ** If TRUE, newValue is filled in with the new value.
*/ */
static int static int
#ifdef __STDC__ _tuiRegValueHasChanged (TuiDataElementPtr dataElement,
_tuiRegValueHasChanged ( struct frame_info *frame,
TuiDataElementPtr dataElement, char *newValue)
struct frame_info *frame,
char *newValue)
#else
_tuiRegValueHasChanged (dataElement, frame, newValue)
TuiDataElementPtr dataElement;
struct frame_info *frame;
char *newValue;
#endif
{ {
int hasChanged = FALSE; int hasChanged = FALSE;
@ -856,17 +739,8 @@ _tuiRegValueHasChanged (dataElement, frame, newValue)
** Get the register raw value. The raw value is returned in regValue. ** Get the register raw value. The raw value is returned in regValue.
*/ */
static TuiStatus static TuiStatus
#ifdef __STDC__ _tuiGetRegisterRawValue (int regNum, char *regValue,
_tuiGetRegisterRawValue ( struct frame_info *frame)
int regNum,
char *regValue,
struct frame_info *frame)
#else
_tuiGetRegisterRawValue (regNum, regValue, frame)
int regNum;
char *regValue;
struct frame_info *frame;
#endif
{ {
TuiStatus ret = TUI_FAILURE; TuiStatus ret = TUI_FAILURE;
@ -887,19 +761,9 @@ _tuiGetRegisterRawValue (regNum, regValue, frame)
** the register value. ** the register value.
*/ */
static void static void
#ifdef __STDC__ _tuiSetRegisterElement (int regNum, struct frame_info *frame,
_tuiSetRegisterElement ( TuiDataElementPtr dataElement,
int regNum, int refreshValueOnly)
struct frame_info *frame,
TuiDataElementPtr dataElement,
int refreshValueOnly)
#else
_tuiSetRegisterElement (regNum, frame, dataElement, refreshValueOnly)
int regNum;
struct frame_info *frame;
TuiDataElementPtr dataElement;
int refreshValueOnly;
#endif
{ {
if (dataElement != (TuiDataElementPtr) NULL) if (dataElement != (TuiDataElementPtr) NULL)
{ {
@ -926,21 +790,10 @@ _tuiSetRegisterElement (regNum, frame, dataElement, refreshValueOnly)
** refreshValuesOnly is TRUE, startRegNum and endRegNum are ignored. ** refreshValuesOnly is TRUE, startRegNum and endRegNum are ignored.
*/ */
static TuiStatus static TuiStatus
#ifdef __STDC__ _tuiSetRegsContent (int startRegNum, int endRegNum,
_tuiSetRegsContent ( struct frame_info *frame,
int startRegNum, TuiRegisterDisplayType dpyType,
int endRegNum, int refreshValuesOnly)
struct frame_info *frame,
TuiRegisterDisplayType dpyType,
int refreshValuesOnly)
#else
_tuiSetRegsContent (startRegNum, endRegNum, frame, dpyType, refreshValuesOnly)
int startRegNum;
int endRegNum;
struct frame_info *frame;
TuiRegisterDisplayType dpyType;
int refreshValuesOnly;
#endif
{ {
TuiStatus ret = TUI_FAILURE; TuiStatus ret = TUI_FAILURE;
int numRegs = endRegNum - startRegNum + 1; int numRegs = endRegNum - startRegNum + 1;
@ -1014,17 +867,9 @@ _tuiSetRegsContent (startRegNum, endRegNum, frame, dpyType, refreshValuesOnly)
** than the value will be displayed in reverse video ** than the value will be displayed in reverse video
*/ */
static void static void
#ifdef __STDC__ _tuiDisplayRegister (int regNum,
_tuiDisplayRegister ( TuiGenWinInfoPtr winInfo, /* the data item window */
int regNum, enum precision_type precision)
TuiGenWinInfoPtr winInfo, /* the data item window */
enum precision_type precision)
#else
_tuiDisplayRegister (regNum, winInfo, precision)
int regNum;
TuiGenWinInfoPtr winInfo; /* the data item window */
enum precision_type precision;
#endif
{ {
if (winInfo->handle != (WINDOW *) NULL) if (winInfo->handle != (WINDOW *) NULL)
{ {
@ -1076,13 +921,7 @@ _tuiDisplayRegister (regNum, winInfo, precision)
static void static void
#ifdef __STDC__ _tui_vShowRegisters_commandSupport (va_list args)
_tui_vShowRegisters_commandSupport (
va_list args)
#else
_tui_vShowRegisters_commandSupport (args)
va_list args;
#endif
{ {
TuiRegisterDisplayType dpyType = va_arg (args, TuiRegisterDisplayType); TuiRegisterDisplayType dpyType = va_arg (args, TuiRegisterDisplayType);
@ -1099,15 +938,7 @@ _tui_vShowRegisters_commandSupport (args)
static void static void
#ifdef __STDC__ _tuiShowFloat_command (char *arg, int fromTTY)
_tuiShowFloat_command (
char *arg,
int fromTTY)
#else
_tuiShowFloat_command (arg, fromTTY)
char *arg;
int fromTTY;
#endif
{ {
if (m_winPtrIsNull (dataWin) || !dataWin->generic.isVisible || if (m_winPtrIsNull (dataWin) || !dataWin->generic.isVisible ||
(dataWin->detail.dataDisplayInfo.regsDisplayType != TUI_SFLOAT_REGS && (dataWin->detail.dataDisplayInfo.regsDisplayType != TUI_SFLOAT_REGS &&
@ -1120,15 +951,7 @@ _tuiShowFloat_command (arg, fromTTY)
static void static void
#ifdef __STDC__ _tuiShowGeneral_command (char *arg, int fromTTY)
_tuiShowGeneral_command (
char *arg,
int fromTTY)
#else
_tuiShowGeneral_command (arg, fromTTY)
char *arg;
int fromTTY;
#endif
{ {
tuiDo ((TuiOpaqueFuncPtr) _tui_vShowRegisters_commandSupport, tuiDo ((TuiOpaqueFuncPtr) _tui_vShowRegisters_commandSupport,
TUI_GENERAL_REGS); TUI_GENERAL_REGS);
@ -1138,15 +961,7 @@ _tuiShowGeneral_command (arg, fromTTY)
static void static void
#ifdef __STDC__ _tuiShowSpecial_command (char *arg, int fromTTY)
_tuiShowSpecial_command (
char *arg,
int fromTTY)
#else
_tuiShowSpecial_command (arg, fromTTY)
char *arg;
int fromTTY;
#endif
{ {
tuiDo ((TuiOpaqueFuncPtr) _tui_vShowRegisters_commandSupport, tuiDo ((TuiOpaqueFuncPtr) _tui_vShowRegisters_commandSupport,
TUI_SPECIAL_REGS); TUI_SPECIAL_REGS);
@ -1156,15 +971,7 @@ _tuiShowSpecial_command (arg, fromTTY)
static void static void
#ifdef __STDC__ _tuiToggleFloatRegs_command (char *arg, int fromTTY)
_tuiToggleFloatRegs_command (
char *arg,
int fromTTY)
#else
_tuiToggleFloatRegs_command (arg, fromTTY)
char *arg;
int fromTTY;
#endif
{ {
if (m_winPtrNotNull (dataWin) && dataWin->generic.isVisible) if (m_winPtrNotNull (dataWin) && dataWin->generic.isVisible)
tuiDo ((TuiOpaqueFuncPtr) tuiToggleFloatRegs); tuiDo ((TuiOpaqueFuncPtr) tuiToggleFloatRegs);
@ -1184,15 +991,7 @@ _tuiToggleFloatRegs_command (arg, fromTTY)
static void static void
#ifdef __STDC__ _tuiScrollRegsForward_command (char *arg, int fromTTY)
_tuiScrollRegsForward_command (
char *arg,
int fromTTY)
#else
_tuiScrollRegsForward_command (arg, fromTTY)
char *arg;
int fromTTY;
#endif
{ {
tuiDo ((TuiOpaqueFuncPtr) tui_vScroll, FORWARD_SCROLL, dataWin, 1); tuiDo ((TuiOpaqueFuncPtr) tui_vScroll, FORWARD_SCROLL, dataWin, 1);
@ -1201,15 +1000,7 @@ _tuiScrollRegsForward_command (arg, fromTTY)
static void static void
#ifdef __STDC__ _tuiScrollRegsBackward_command (char *arg, int fromTTY)
_tuiScrollRegsBackward_command (
char *arg,
int fromTTY)
#else
_tuiScrollRegsBackward_command (arg, fromTTY)
char *arg;
int fromTTY;
#endif
{ {
tuiDo ((TuiOpaqueFuncPtr) tui_vScroll, BACKWARD_SCROLL, dataWin, 1); tuiDo ((TuiOpaqueFuncPtr) tui_vScroll, BACKWARD_SCROLL, dataWin, 1);

62
gdb/tui/tuiSource.c
View file

@ -65,17 +65,7 @@ static struct breakpoint *_hasBreak (char *, int);
** Function to display source in the source window. ** Function to display source in the source window.
*/ */
TuiStatus TuiStatus
#ifdef __STDC__ tuiSetSourceContent (struct symtab *s, int lineNo, int noerror)
tuiSetSourceContent (
struct symtab *s,
int lineNo,
int noerror)
#else
tuiSetSourceContent (s, lineNo, noerror)
struct symtab *s;
int lineNo;
int noerror;
#endif
{ {
TuiStatus ret = TUI_FAILURE; TuiStatus ret = TUI_FAILURE;
@ -269,15 +259,7 @@ tuiSetSourceContent (s, lineNo, noerror)
cannot be accessed */ cannot be accessed */
void void
#ifdef __STDC__ tuiSetSourceContentNil (TuiWinInfoPtr winInfo, char *warning_string)
tuiSetSourceContentNil (
TuiWinInfoPtr winInfo,
char *warning_string)
#else
tuiSetSourceContentNil (winInfo, warning_string)
TuiWinInfoPtr winInfo;
char *warning_string;
#endif
{ {
int lineWidth; int lineWidth;
int nLines; int nLines;
@ -350,17 +332,7 @@ tuiSetSourceContentNil (winInfo, warning_string)
** initializes the horizontal scroll to 0. ** initializes the horizontal scroll to 0.
*/ */
void void
#ifdef __STDC__ tuiShowSource (struct symtab *s, Opaque line, int noerror)
tuiShowSource (
struct symtab *s,
Opaque line,
int noerror)
#else
tuiShowSource (s, line, noerror)
struct symtab *s;
Opaque line;
int noerror;
#endif
{ {
srcWin->detail.sourceInfo.horizontalOffset = 0; srcWin->detail.sourceInfo.horizontalOffset = 0;
m_tuiShowSourceAsIs (s, line, noerror); m_tuiShowSourceAsIs (s, line, noerror);
@ -374,13 +346,7 @@ tuiShowSource (s, line, noerror)
** Answer whether the source is currently displayed in the source window. ** Answer whether the source is currently displayed in the source window.
*/ */
int int
#ifdef __STDC__ tuiSourceIsDisplayed (char *fname)
tuiSourceIsDisplayed (
char *fname)
#else
tuiSourceIsDisplayed (fname)
char *fname;
#endif
{ {
return (srcWin->generic.contentInUse && return (srcWin->generic.contentInUse &&
(strcmp (((TuiWinElementPtr) (locatorWinInfoPtr ())-> (strcmp (((TuiWinElementPtr) (locatorWinInfoPtr ())->
@ -393,15 +359,7 @@ tuiSourceIsDisplayed (fname)
** Scroll the source forward or backward vertically ** Scroll the source forward or backward vertically
*/ */
void void
#ifdef __STDC__ tuiVerticalSourceScroll (TuiScrollDirection scrollDirection, int numToScroll)
tuiVerticalSourceScroll (
TuiScrollDirection scrollDirection,
int numToScroll)
#else
tuiVerticalSourceScroll (scrollDirection, numToScroll)
TuiScrollDirection scrollDirection;
int numToScroll;
#endif
{ {
if (srcWin->generic.content != (OpaquePtr) NULL) if (srcWin->generic.content != (OpaquePtr) NULL)
{ {
@ -448,15 +406,7 @@ tuiVerticalSourceScroll (scrollDirection, numToScroll)
** the source file indicated ** the source file indicated
*/ */
static struct breakpoint * static struct breakpoint *
#ifdef __STDC__ _hasBreak (char *sourceFileName, int lineNo)
_hasBreak (
char *sourceFileName,
int lineNo)
#else
_hasBreak (sourceFileName, lineNo)
char *sourceFileName;
int lineNo;
#endif
{ {
struct breakpoint *bpWithBreak = (struct breakpoint *) NULL; struct breakpoint *bpWithBreak = (struct breakpoint *) NULL;
struct breakpoint *bp; struct breakpoint *bp;

259
gdb/tui/tuiSourceWin.c
View file

@ -65,11 +65,7 @@ extern struct symtab *current_source_symtab;
** tuiSrcWinIsDisplayed(). ** tuiSrcWinIsDisplayed().
*/ */
int int
#ifdef __STDC__
tuiSrcWinIsDisplayed (void) tuiSrcWinIsDisplayed (void)
#else
tuiSrcWinIsDisplayed ()
#endif
{ {
return (m_winPtrNotNull (srcWin) && srcWin->generic.isVisible); return (m_winPtrNotNull (srcWin) && srcWin->generic.isVisible);
} /* tuiSrcWinIsDisplayed */ } /* tuiSrcWinIsDisplayed */
@ -79,11 +75,7 @@ tuiSrcWinIsDisplayed ()
** tuiAsmWinIsDisplayed(). ** tuiAsmWinIsDisplayed().
*/ */
int int
#ifdef __STDC__
tuiAsmWinIsDisplayed (void) tuiAsmWinIsDisplayed (void)
#else
tuiAsmWinIsDisplayed ()
#endif
{ {
return (m_winPtrNotNull (disassemWin) && disassemWin->generic.isVisible); return (m_winPtrNotNull (disassemWin) && disassemWin->generic.isVisible);
} /* tuiAsmWinIsDisplayed */ } /* tuiAsmWinIsDisplayed */
@ -94,11 +86,7 @@ tuiAsmWinIsDisplayed ()
** Function to display the "main" routine" ** Function to display the "main" routine"
*/ */
void void
#ifdef __STDC__
tuiDisplayMainFunction (void) tuiDisplayMainFunction (void)
#else
tuiDisplayMainFunction ()
#endif
{ {
if ((sourceWindows ())->count > 0) if ((sourceWindows ())->count > 0)
{ {
@ -128,19 +116,8 @@ tuiDisplayMainFunction ()
** initializes the horizontal scroll to 0. ** initializes the horizontal scroll to 0.
*/ */
void void
#ifdef __STDC__ tuiUpdateSourceWindow (TuiWinInfoPtr winInfo, struct symtab *s,
tuiUpdateSourceWindow ( Opaque lineOrAddr, int noerror)
TuiWinInfoPtr winInfo,
struct symtab *s,
Opaque lineOrAddr,
int noerror)
#else
tuiUpdateSourceWindow (winInfo, s, lineOrAddr, noerror)
TuiWinInfoPtr winInfo;
struct symtab *s;
Opaque lineOrAddr;
int noerror;
#endif
{ {
winInfo->detail.sourceInfo.horizontalOffset = 0; winInfo->detail.sourceInfo.horizontalOffset = 0;
tuiUpdateSourceWindowAsIs (winInfo, s, lineOrAddr, noerror); tuiUpdateSourceWindowAsIs (winInfo, s, lineOrAddr, noerror);
@ -155,19 +132,8 @@ tuiUpdateSourceWindow (winInfo, s, lineOrAddr, noerror)
** function shows the source as specified by the horizontal offset. ** function shows the source as specified by the horizontal offset.
*/ */
void void
#ifdef __STDC__ tuiUpdateSourceWindowAsIs (TuiWinInfoPtr winInfo, struct symtab *s,
tuiUpdateSourceWindowAsIs ( Opaque lineOrAddr, int noerror)
TuiWinInfoPtr winInfo,
struct symtab *s,
Opaque lineOrAddr,
int noerror)
#else
tuiUpdateSourceWindowAsIs (winInfo, s, lineOrAddr, noerror)
TuiWinInfoPtr winInfo;
struct symtab *s;
Opaque lineOrAddr;
int noerror;
#endif
{ {
TuiStatus ret; TuiStatus ret;
@ -212,13 +178,7 @@ tuiUpdateSourceWindowAsIs (winInfo, s, lineOrAddr, noerror)
** reflect the input address. ** reflect the input address.
*/ */
void void
#ifdef __STDC__ tuiUpdateSourceWindowsWithAddr (Opaque addr)
tuiUpdateSourceWindowsWithAddr (
Opaque addr)
#else
tuiUpdateSourceWindowsWithAddr (addr)
Opaque addr;
#endif
{ {
if (addr > (Opaque) NULL) if (addr > (Opaque) NULL)
{ {
@ -263,13 +223,7 @@ tuiUpdateSourceWindowsWithAddr (addr)
** Update the source window with the address in a va_list ** Update the source window with the address in a va_list
*/ */
void void
#ifdef __STDC__ tui_vUpdateSourceWindowsWithAddr (va_list args)
tui_vUpdateSourceWindowsWithAddr (
va_list args)
#else
tui_vUpdateSourceWindowsWithAddr (args)
va_list args;
#endif
{ {
Opaque addr = va_arg (args, Opaque); Opaque addr = va_arg (args, Opaque);
@ -285,15 +239,7 @@ tui_vUpdateSourceWindowsWithAddr (args)
** reflect the input address. ** reflect the input address.
*/ */
void void
#ifdef __STDC__ tuiUpdateSourceWindowsWithLine (struct symtab *s, int line)
tuiUpdateSourceWindowsWithLine (
struct symtab *s,
int line)
#else
tuiUpdateSourceWindowsWithLine (s, line)
struct symtab *s;
int line;
#endif
{ {
switch (currentLayout ()) switch (currentLayout ())
{ {
@ -317,13 +263,7 @@ tuiUpdateSourceWindowsWithLine (s, line)
** Update the source window with the line number in a va_list ** Update the source window with the line number in a va_list
*/ */
void void
#ifdef __STDC__ tui_vUpdateSourceWindowsWithLine (va_list args)
tui_vUpdateSourceWindowsWithLine (
va_list args)
#else
tui_vUpdateSourceWindowsWithLine (args)
va_list args;
#endif
{ {
struct symtab *s = va_arg (args, struct symtab *); struct symtab *s = va_arg (args, struct symtab *);
int line = va_arg (args, int); int line = va_arg (args, int);
@ -338,15 +278,7 @@ tui_vUpdateSourceWindowsWithLine (args)
** tuiClearSourceContent(). ** tuiClearSourceContent().
*/ */
void void
#ifdef __STDC__ tuiClearSourceContent (TuiWinInfoPtr winInfo, int displayPrompt)
tuiClearSourceContent (
TuiWinInfoPtr winInfo,
int displayPrompt)
#else
tuiClearSourceContent (winInfo, displayPrompt)
TuiWinInfoPtr winInfo;
int displayPrompt;
#endif
{ {
if (m_winPtrNotNull (winInfo)) if (m_winPtrNotNull (winInfo))
{ {
@ -371,13 +303,7 @@ tuiClearSourceContent (winInfo, displayPrompt)
** tuiClearAllSourceWinsContent(). ** tuiClearAllSourceWinsContent().
*/ */
void void
#ifdef __STDC__ tuiClearAllSourceWinsContent (int displayPrompt)
tuiClearAllSourceWinsContent (
int displayPrompt)
#else
tuiClearAllSourceWinsContent (displayPrompt)
int displayPrompt;
#endif
{ {
int i; int i;
@ -393,15 +319,7 @@ tuiClearAllSourceWinsContent (displayPrompt)
** tuiEraseSourceContent(). ** tuiEraseSourceContent().
*/ */
void void
#ifdef __STDC__ tuiEraseSourceContent (TuiWinInfoPtr winInfo, int displayPrompt)
tuiEraseSourceContent (
TuiWinInfoPtr winInfo,
int displayPrompt)
#else
tuiEraseSourceContent (winInfo, displayPrompt)
TuiWinInfoPtr winInfo;
int displayPrompt;
#endif
{ {
int xPos; int xPos;
int halfWidth = (winInfo->generic.width - 2) / 2; int halfWidth = (winInfo->generic.width - 2) / 2;
@ -444,13 +362,7 @@ tuiEraseSourceContent (winInfo, displayPrompt)
** tuiEraseAllSourceContent(). ** tuiEraseAllSourceContent().
*/ */
void void
#ifdef __STDC__ tuiEraseAllSourceWinsContent (int displayPrompt)
tuiEraseAllSourceWinsContent (
int displayPrompt)
#else
tuiEraseAllSourceWinsContent (displayPrompt)
int displayPrompt;
#endif
{ {
int i; int i;
@ -466,13 +378,7 @@ tuiEraseAllSourceWinsContent (displayPrompt)
** tuiShowSourceContent(). ** tuiShowSourceContent().
*/ */
void void
#ifdef __STDC__ tuiShowSourceContent (TuiWinInfoPtr winInfo)
tuiShowSourceContent (
TuiWinInfoPtr winInfo)
#else
tuiShowSourceContent (winInfo)
TuiWinInfoPtr winInfo;
#endif
{ {
int curLine, i, curX; int curLine, i, curX;
@ -501,11 +407,7 @@ tuiShowSourceContent (winInfo)
** tuiShowAllSourceWinsContent() ** tuiShowAllSourceWinsContent()
*/ */
void void
#ifdef __STDC__
tuiShowAllSourceWinsContent (void) tuiShowAllSourceWinsContent (void)
#else
tuiShowAllSourceWinsContent ()
#endif
{ {
int i; int i;
@ -521,17 +423,9 @@ tuiShowAllSourceWinsContent ()
** Scroll the source forward or backward horizontally ** Scroll the source forward or backward horizontally
*/ */
void void
#ifdef __STDC__ tuiHorizontalSourceScroll (TuiWinInfoPtr winInfo,
tuiHorizontalSourceScroll ( TuiScrollDirection direction,
TuiWinInfoPtr winInfo, int numToScroll)
TuiScrollDirection direction,
int numToScroll)
#else
tuiHorizontalSourceScroll (winInfo, direction, numToScroll)
TuiWinInfoPtr winInfo;
TuiScrollDirection direction;
int numToScroll;
#endif
{ {
if (winInfo->generic.content != (OpaquePtr) NULL) if (winInfo->generic.content != (OpaquePtr) NULL)
{ {
@ -572,15 +466,7 @@ tuiHorizontalSourceScroll (winInfo, direction, numToScroll)
** Set or clear the hasBreak flag in the line whose line is lineNo. ** Set or clear the hasBreak flag in the line whose line is lineNo.
*/ */
void void
#ifdef __STDC__ tuiSetIsExecPointAt (Opaque lineOrAddr, TuiWinInfoPtr winInfo)
tuiSetIsExecPointAt (
Opaque lineOrAddr,
TuiWinInfoPtr winInfo)
#else
tuiSetIsExecPointAt (lineOrAddr, winInfo)
Opaque lineOrAddr;
TuiWinInfoPtr winInfo;
#endif
{ {
int i; int i;
TuiWinContent content = (TuiWinContent) winInfo->generic.content; TuiWinContent content = (TuiWinContent) winInfo->generic.content;
@ -604,17 +490,7 @@ tuiSetIsExecPointAt (lineOrAddr, winInfo)
** Set or clear the hasBreak flag in the line whose line is lineNo. ** Set or clear the hasBreak flag in the line whose line is lineNo.
*/ */
void void
#ifdef __STDC__ tuiSetHasBreakAt (struct breakpoint *bp, TuiWinInfoPtr winInfo, int hasBreak)
tuiSetHasBreakAt (
struct breakpoint *bp,
TuiWinInfoPtr winInfo,
int hasBreak)
#else
tuiSetHasBreakAt (bp, winInfo, hasBreak)
struct breakpoint *bp;
TuiWinInfoPtr winInfo;
int hasBreak;
#endif
{ {
int i; int i;
TuiWinContent content = (TuiWinContent) winInfo->generic.content; TuiWinContent content = (TuiWinContent) winInfo->generic.content;
@ -662,15 +538,7 @@ tuiSetHasBreakAt (bp, winInfo, hasBreak)
** Set or clear the hasBreak flag in all displayed source windows. ** Set or clear the hasBreak flag in all displayed source windows.
*/ */
void void
#ifdef __STDC__ tuiAllSetHasBreakAt (struct breakpoint *bp, int hasBreak)
tuiAllSetHasBreakAt (
struct breakpoint *bp,
int hasBreak)
#else
tuiAllSetHasBreakAt (bp, hasBreak)
struct breakpoint *bp;
int hasBreak;
#endif
{ {
int i; int i;
@ -688,13 +556,7 @@ tuiAllSetHasBreakAt (bp, hasBreak)
** with params in a va_list ** with params in a va_list
*/ */
void void
#ifdef __STDC__ tui_vAllSetHasBreakAt (va_list args)
tui_vAllSetHasBreakAt (
va_list args)
#else
tui_vAllSetHasBreakAt (args)
va_list args;
#endif
{ {
struct breakpoint *bp = va_arg (args, struct breakpoint *); struct breakpoint *bp = va_arg (args, struct breakpoint *);
int hasBreak = va_arg (args, int); int hasBreak = va_arg (args, int);
@ -717,13 +579,7 @@ tui_vAllSetHasBreakAt (args)
** disassembly window. ** disassembly window.
*/ */
TuiStatus TuiStatus
#ifdef __STDC__ tuiSetExecInfoContent (TuiWinInfoPtr winInfo)
tuiSetExecInfoContent (
TuiWinInfoPtr winInfo)
#else
tuiSetExecInfoContent (winInfo)
TuiWinInfoPtr winInfo;
#endif
{ {
TuiStatus ret = TUI_SUCCESS; TuiStatus ret = TUI_SUCCESS;
@ -804,13 +660,7 @@ tuiSetExecInfoContent (winInfo)
** tuiShowExecInfoContent(). ** tuiShowExecInfoContent().
*/ */
void void
#ifdef __STDC__ tuiShowExecInfoContent (TuiWinInfoPtr winInfo)
tuiShowExecInfoContent (
TuiWinInfoPtr winInfo)
#else
tuiShowExecInfoContent (winInfo)
TuiWinInfoPtr winInfo;
#endif
{ {
TuiGenWinInfoPtr execInfo = winInfo->detail.sourceInfo.executionInfo; TuiGenWinInfoPtr execInfo = winInfo->detail.sourceInfo.executionInfo;
int curLine; int curLine;
@ -834,11 +684,7 @@ tuiShowExecInfoContent (winInfo)
** tuiShowAllExecInfosContent() ** tuiShowAllExecInfosContent()
*/ */
void void
#ifdef __STDC__
tuiShowAllExecInfosContent (void) tuiShowAllExecInfosContent (void)
#else
tuiShowAllExecInfosContent ()
#endif
{ {
int i; int i;
@ -853,13 +699,7 @@ tuiShowAllExecInfosContent ()
** tuiEraseExecInfoContent(). ** tuiEraseExecInfoContent().
*/ */
void void
#ifdef __STDC__ tuiEraseExecInfoContent (TuiWinInfoPtr winInfo)
tuiEraseExecInfoContent (
TuiWinInfoPtr winInfo)
#else
tuiEraseExecInfoContent (winInfo)
TuiWinInfoPtr winInfo;
#endif
{ {
TuiGenWinInfoPtr execInfo = winInfo->detail.sourceInfo.executionInfo; TuiGenWinInfoPtr execInfo = winInfo->detail.sourceInfo.executionInfo;
@ -874,11 +714,7 @@ tuiEraseExecInfoContent (winInfo)
** tuiEraseAllExecInfosContent() ** tuiEraseAllExecInfosContent()
*/ */
void void
#ifdef __STDC__
tuiEraseAllExecInfosContent (void) tuiEraseAllExecInfosContent (void)
#else
tuiEraseAllExecInfosContent ()
#endif
{ {
int i; int i;
@ -893,13 +729,7 @@ tuiEraseAllExecInfosContent ()
** tuiClearExecInfoContent(). ** tuiClearExecInfoContent().
*/ */
void void
#ifdef __STDC__ tuiClearExecInfoContent (TuiWinInfoPtr winInfo)
tuiClearExecInfoContent (
TuiWinInfoPtr winInfo)
#else
tuiClearExecInfoContent (winInfo)
TuiWinInfoPtr winInfo;
#endif
{ {
winInfo->detail.sourceInfo.executionInfo->contentInUse = FALSE; winInfo->detail.sourceInfo.executionInfo->contentInUse = FALSE;
tuiEraseExecInfoContent (winInfo); tuiEraseExecInfoContent (winInfo);
@ -912,11 +742,7 @@ tuiClearExecInfoContent (winInfo)
** tuiClearAllExecInfosContent() ** tuiClearAllExecInfosContent()
*/ */
void void
#ifdef __STDC__
tuiClearAllExecInfosContent (void) tuiClearAllExecInfosContent (void)
#else
tuiClearAllExecInfosContent ()
#endif
{ {
int i; int i;
@ -932,13 +758,7 @@ tuiClearAllExecInfosContent ()
** Function to update the execution info window ** Function to update the execution info window
*/ */
void void
#ifdef __STDC__ tuiUpdateExecInfo (TuiWinInfoPtr winInfo)
tuiUpdateExecInfo (
TuiWinInfoPtr winInfo)
#else
tuiUpdateExecInfo (winInfo)
TuiWinInfoPtr winInfo;
#endif
{ {
tuiSetExecInfoContent (winInfo); tuiSetExecInfoContent (winInfo);
tuiShowExecInfoContent (winInfo); tuiShowExecInfoContent (winInfo);
@ -949,11 +769,7 @@ tuiUpdateExecInfo (winInfo)
** tuiUpdateAllExecInfos() ** tuiUpdateAllExecInfos()
*/ */
void void
#ifdef __STDC__
tuiUpdateAllExecInfos (void) tuiUpdateAllExecInfos (void)
#else
tuiUpdateAllExecInfos ()
#endif
{ {
int i; int i;
@ -972,11 +788,7 @@ tuiUpdateAllExecInfos ()
** is called then the target terminates execution ** is called then the target terminates execution
*/ */
void void
#ifdef __STDC__
tuiUpdateOnEnd (void) tuiUpdateOnEnd (void)
#else
tuiUpdateOnEnd ()
#endif
{ {
int i; int i;
TuiGenWinInfoPtr locator; TuiGenWinInfoPtr locator;
@ -1013,13 +825,7 @@ tuiUpdateOnEnd ()
TuiStatus TuiStatus
#ifdef __STDC__ tuiAllocSourceBuffer (TuiWinInfoPtr winInfo)
tuiAllocSourceBuffer (
TuiWinInfoPtr winInfo)
#else
tuiAllocSourceBuffer (winInfo)
TuiWinInfoPtr winInfo;
#endif
{ {
register char *srcLine, *srcLineBuf; register char *srcLine, *srcLineBuf;
register int i, lineWidth, c, maxLines; register int i, lineWidth, c, maxLines;
@ -1071,17 +877,8 @@ tuiAllocSourceBuffer (winInfo)
** in the current source window. ** in the current source window.
*/ */
int int
#ifdef __STDC__ tuiLineIsDisplayed (Opaque lineNoOrAddr, TuiWinInfoPtr winInfo,
tuiLineIsDisplayed ( int checkThreshold)
Opaque lineNoOrAddr,
TuiWinInfoPtr winInfo,
int checkThreshold)
#else
tuiLineIsDisplayed (lineNoOrAddr, winInfo, checkThreshold)
Opaque lineNoOrAddr;
TuiWinInfoPtr winInfo;
int checkThreshold;
#endif
{ {
int isDisplayed = FALSE; int isDisplayed = FALSE;
int i, threshold; int i, threshold;

120
gdb/tui/tuiStack.c
View file

@ -47,11 +47,7 @@ static void _tuiUpdateLocation_command (char *, int);
** tuiClearLocatorDisplay() ** tuiClearLocatorDisplay()
*/ */
void void
#ifdef __STDC__
tuiClearLocatorDisplay (void) tuiClearLocatorDisplay (void)
#else
tuiClearLocatorDisplay ()
#endif
{ {
TuiGenWinInfoPtr locator = locatorWinInfoPtr (); TuiGenWinInfoPtr locator = locatorWinInfoPtr ();
int i; int i;
@ -80,11 +76,7 @@ tuiClearLocatorDisplay ()
** tuiShowLocatorContent() ** tuiShowLocatorContent()
*/ */
void void
#ifdef __STDC__
tuiShowLocatorContent (void) tuiShowLocatorContent (void)
#else
tuiShowLocatorContent ()
#endif
{ {
char *string; char *string;
TuiGenWinInfoPtr locator; TuiGenWinInfoPtr locator;
@ -117,21 +109,8 @@ tuiShowLocatorContent ()
** Function to update the locator, with the provided arguments. ** Function to update the locator, with the provided arguments.
*/ */
void void
#ifdef __STDC__ tuiSetLocatorInfo (char *fname, char *procname, int lineNo,
tuiSetLocatorInfo ( Opaque addr, TuiLocatorElementPtr element)
char *fname,
char *procname,
int lineNo,
Opaque addr,
TuiLocatorElementPtr element)
#else
tuiSetLocatorInfo (fname, procname, lineNo, addr, element)
char *fname;
char *procname;
int lineNo;
Opaque addr;
TuiLocatorElementPtr element;
#endif
{ {
#ifdef COMMENT #ifdef COMMENT
/* first free the old info */ /* first free the old info */
@ -166,13 +145,7 @@ tuiSetLocatorInfo (fname, procname, lineNo, addr, element)
** Update only the filename portion of the locator. ** Update only the filename portion of the locator.
*/ */
void void
#ifdef __STDC__ tuiUpdateLocatorFilename (char *fileName)
tuiUpdateLocatorFilename (
char *fileName)
#else
tuiUpdateLocatorFilename (fileName)
char *fileName;
#endif
{ {
TuiGenWinInfoPtr locator = locatorWinInfoPtr (); TuiGenWinInfoPtr locator = locatorWinInfoPtr ();
@ -194,13 +167,7 @@ tuiUpdateLocatorFilename (fileName)
** Update only the filename portion of the locator with args in a va_list. ** Update only the filename portion of the locator with args in a va_list.
*/ */
void void
#ifdef __STDC__ tui_vUpdateLocatorFilename (va_list args)
tui_vUpdateLocatorFilename (
va_list args)
#else
tui_vUpdateLocatorFilename (args)
va_list args;
#endif
{ {
char *fileName; char *fileName;
@ -217,13 +184,7 @@ tui_vUpdateLocatorFilename (args)
** (elz) ** (elz)
*/ */
void void
#ifdef __STDC__ tuiSwitchFilename (char *fileName)
tuiSwitchFilename (
char *fileName)
#else
tuiSwitchFilename (fileName)
char *fileName;
#endif
{ {
TuiGenWinInfoPtr locator = locatorWinInfoPtr (); TuiGenWinInfoPtr locator = locatorWinInfoPtr ();
@ -249,15 +210,7 @@ tuiSwitchFilename (fileName)
** (elz) ** (elz)
*/ */
void void
#ifdef __STDC__ tuiGetLocatorFilename (TuiGenWinInfoPtr locator, char **filename)
tuiGetLocatorFilename (
TuiGenWinInfoPtr locator,
char **filename)
#else
tuiGetLocatorFilename (locator, filename)
TuiGenWinInfoPtr locator;
char **filename;
#endif
{ {
/* the current filename could be non known, in which case the xmalloc would /* the current filename could be non known, in which case the xmalloc would
@ -281,15 +234,8 @@ tuiGetLocatorFilename (locator, filename)
** Function to update the locator, with the information extracted from frameInfo ** Function to update the locator, with the information extracted from frameInfo
*/ */
void void
#ifdef __STDC__ tuiUpdateLocatorInfoFromFrame (struct frame_info *frameInfo,
tuiUpdateLocatorInfoFromFrame ( TuiLocatorElementPtr element)
struct frame_info *frameInfo,
TuiLocatorElementPtr element)
#else
tuiUpdateLocatorInfoFromFrame (frameInfo, element)
struct frame_info *frameInfo;
TuiLocatorElementPtr element;
#endif
{ {
struct symtab_and_line symtabAndLine; struct symtab_and_line symtabAndLine;
@ -320,13 +266,7 @@ tuiUpdateLocatorInfoFromFrame (frameInfo, element)
** Function to set the content of the locator ** Function to set the content of the locator
*/ */
void void
#ifdef __STDC__ tuiSetLocatorContent (struct frame_info *frameInfo)
tuiSetLocatorContent (
struct frame_info *frameInfo)
#else
tuiSetLocatorContent (frameInfo)
struct frame_info *frameInfo;
#endif
{ {
TuiGenWinInfoPtr locator = locatorWinInfoPtr (); TuiGenWinInfoPtr locator = locatorWinInfoPtr ();
TuiWinElementPtr element; TuiWinElementPtr element;
@ -360,13 +300,7 @@ tuiSetLocatorContent (frameInfo)
** Function to update the locator display ** Function to update the locator display
*/ */
void void
#ifdef __STDC__ tuiUpdateLocatorDisplay (struct frame_info *frameInfo)
tuiUpdateLocatorDisplay (
struct frame_info *frameInfo)
#else
tuiUpdateLocatorDisplay (frameInfo)
struct frame_info *frameInfo;
#endif
{ {
tuiClearLocatorDisplay (); tuiClearLocatorDisplay ();
tuiSetLocatorContent (frameInfo); tuiSetLocatorContent (frameInfo);
@ -381,13 +315,7 @@ tuiUpdateLocatorDisplay (frameInfo)
** Function to print the frame inforrmation for the TUI. ** Function to print the frame inforrmation for the TUI.
*/ */
void void
#ifdef __STDC__ tuiShowFrameInfo (struct frame_info *fi)
tuiShowFrameInfo (
struct frame_info *fi)
#else
tuiShowFrameInfo (fi)
struct frame_info *fi;
#endif
{ {
TuiWinInfoPtr winInfo; TuiWinInfoPtr winInfo;
register int i; register int i;
@ -470,13 +398,7 @@ tuiShowFrameInfo (fi)
** Function to print the frame inforrmation for the TUI with args in a va_list. ** Function to print the frame inforrmation for the TUI with args in a va_list.
*/ */
void void
#ifdef __STDC__ tui_vShowFrameInfo (va_list args)
tui_vShowFrameInfo (
va_list args)
#else
tui_vShowFrameInfo (args)
va_list args;
#endif
{ {
struct frame_info *fi; struct frame_info *fi;
@ -512,13 +434,7 @@ _initialize_tuiStack (void)
** _getFuncNameFromFrame(). ** _getFuncNameFromFrame().
*/ */
static char * static char *
#ifdef __STDC__ _getFuncNameFromFrame (struct frame_info *frameInfo)
_getFuncNameFromFrame (
struct frame_info *frameInfo)
#else
_getFuncNameFromFrame (frameInfo)
struct frame_info *frameInfo;
#endif
{ {
char *funcName = (char *) NULL; char *funcName = (char *) NULL;
@ -535,15 +451,7 @@ _getFuncNameFromFrame (frameInfo)
** Command to update the display with the current execution point ** Command to update the display with the current execution point
*/ */
static void static void
#ifdef __STDC__ _tuiUpdateLocation_command (char *arg, int fromTTY)
_tuiUpdateLocation_command (
char *arg,
int fromTTY)
#else
_tuiUpdateLocation_command (arg, fromTTY)
char *arg;
int fromTTY;
#endif
{ {
#ifndef TRY #ifndef TRY
extern void frame_command (char *, int); extern void frame_command (char *, int);

296
gdb/tui/tuiWin.c
View file

@ -133,13 +133,7 @@ Usage: w <#lines>\n");
** Clear the logical focus from winInfo ** Clear the logical focus from winInfo
*/ */
void void
#ifdef __STDC__ tuiClearWinFocusFrom (TuiWinInfoPtr winInfo)
tuiClearWinFocusFrom (
TuiWinInfoPtr winInfo)
#else
tuiClearWinFocusFrom (winInfo)
TuiWinInfoPtr winInfo;
#endif
{ {
if (m_winPtrNotNull (winInfo)) if (m_winPtrNotNull (winInfo))
{ {
@ -157,11 +151,7 @@ tuiClearWinFocusFrom (winInfo)
** Clear the window that has focus. ** Clear the window that has focus.
*/ */
void void
#ifdef __STDC__
tuiClearWinFocus (void) tuiClearWinFocus (void)
#else
tuiClearWinFocus ()
#endif
{ {
tuiClearWinFocusFrom (tuiWinWithFocus ()); tuiClearWinFocusFrom (tuiWinWithFocus ());
@ -174,13 +164,7 @@ tuiClearWinFocus ()
** Set the logical focus to winInfo ** Set the logical focus to winInfo
*/ */
void void
#ifdef __STDC__ tuiSetWinFocusTo (TuiWinInfoPtr winInfo)
tuiSetWinFocusTo (
TuiWinInfoPtr winInfo)
#else
tuiSetWinFocusTo (winInfo)
TuiWinInfoPtr winInfo;
#endif
{ {
if (m_winPtrNotNull (winInfo)) if (m_winPtrNotNull (winInfo))
{ {
@ -199,13 +183,7 @@ tuiSetWinFocusTo (winInfo)
char * char *
#ifdef __STDC__ tuiStrDup (char *str)
tuiStrDup (
char *str)
#else
tuiStrDup (str)
char *str;
#endif
{ {
char *newStr = (char *) NULL; char *newStr = (char *) NULL;
@ -223,15 +201,7 @@ tuiStrDup (str)
** tuiScrollForward(). ** tuiScrollForward().
*/ */
void void
#ifdef __STDC__ tuiScrollForward (TuiWinInfoPtr winToScroll, int numToScroll)
tuiScrollForward (
TuiWinInfoPtr winToScroll,
int numToScroll)
#else
tuiScrollForward (winToScroll, numToScroll)
TuiWinInfoPtr winToScroll;
int numToScroll;
#endif
{ {
if (winToScroll != cmdWin) if (winToScroll != cmdWin)
{ {
@ -261,15 +231,7 @@ tuiScrollForward (winToScroll, numToScroll)
** tuiScrollBackward(). ** tuiScrollBackward().
*/ */
void void
#ifdef __STDC__ tuiScrollBackward (TuiWinInfoPtr winToScroll, int numToScroll)
tuiScrollBackward (
TuiWinInfoPtr winToScroll,
int numToScroll)
#else
tuiScrollBackward (winToScroll, numToScroll)
TuiWinInfoPtr winToScroll;
int numToScroll;
#endif
{ {
if (winToScroll != cmdWin) if (winToScroll != cmdWin)
{ {
@ -298,15 +260,7 @@ tuiScrollBackward (winToScroll, numToScroll)
** tuiScrollLeft(). ** tuiScrollLeft().
*/ */
void void
#ifdef __STDC__ tuiScrollLeft (TuiWinInfoPtr winToScroll, int numToScroll)
tuiScrollLeft (
TuiWinInfoPtr winToScroll,
int numToScroll)
#else
tuiScrollLeft (winToScroll, numToScroll)
TuiWinInfoPtr winToScroll;
int numToScroll;
#endif
{ {
if (winToScroll != cmdWin) if (winToScroll != cmdWin)
{ {
@ -331,15 +285,7 @@ tuiScrollLeft (winToScroll, numToScroll)
** tuiScrollRight(). ** tuiScrollRight().
*/ */
void void
#ifdef __STDC__ tuiScrollRight (TuiWinInfoPtr winToScroll, int numToScroll)
tuiScrollRight (
TuiWinInfoPtr winToScroll,
int numToScroll)
#else
tuiScrollRight (winToScroll, numToScroll)
TuiWinInfoPtr winToScroll;
int numToScroll;
#endif
{ {
if (winToScroll != cmdWin) if (winToScroll != cmdWin)
{ {
@ -365,13 +311,7 @@ tuiScrollRight (winToScroll, numToScroll)
** Scroll a window. Arguments are passed through a va_list. ** Scroll a window. Arguments are passed through a va_list.
*/ */
void void
#ifdef __STDC__ tui_vScroll (va_list args)
tui_vScroll (
va_list args)
#else
tui_vScroll (args)
va_list args;
#endif
{ {
TuiScrollDirection direction = va_arg (args, TuiScrollDirection); TuiScrollDirection direction = va_arg (args, TuiScrollDirection);
TuiWinInfoPtr winToScroll = va_arg (args, TuiWinInfoPtr); TuiWinInfoPtr winToScroll = va_arg (args, TuiWinInfoPtr);
@ -403,11 +343,7 @@ tui_vScroll (args)
** tuiRefreshAll(). ** tuiRefreshAll().
*/ */
void void
#ifdef __STDC__
tuiRefreshAll (void) tuiRefreshAll (void)
#else
tuiRefreshAll ()
#endif
{ {
TuiWinType type; TuiWinType type;
@ -449,11 +385,7 @@ tuiRefreshAll ()
** function gets called from within the readline sinwinch handler. ** function gets called from within the readline sinwinch handler.
*/ */
void void
#ifdef __STDC__
tuiResizeAll (void) tuiResizeAll (void)
#else
tuiResizeAll ()
#endif
{ {
int heightDiff, widthDiff; int heightDiff, widthDiff;
extern int screenheight, screenwidth; /* in readline */ extern int screenheight, screenwidth; /* in readline */
@ -616,13 +548,7 @@ tuiResizeAll ()
** because it is set as the old_sigwinch() (TUI only) ** because it is set as the old_sigwinch() (TUI only)
*/ */
void void
#ifdef __STDC__ tuiSigwinchHandler (int signal)
tuiSigwinchHandler (
int signal)
#else
tuiSigwinchHandler (signal)
int signal;
#endif
{ {
/* /*
** Say that a resize was done so that the readline can do it ** Say that a resize was done so that the readline can do it
@ -644,15 +570,7 @@ tuiSigwinchHandler (signal)
** _tuiScrollForward_command(). ** _tuiScrollForward_command().
*/ */
static void static void
#ifdef __STDC__ _tuiScrollForward_command (char *arg, int fromTTY)
_tuiScrollForward_command (
char *arg,
int fromTTY)
#else
_tuiScrollForward_command (arg, fromTTY)
char *arg;
int fromTTY;
#endif
{ {
int numToScroll = 1; int numToScroll = 1;
TuiWinInfoPtr winToScroll; TuiWinInfoPtr winToScroll;
@ -674,15 +592,7 @@ _tuiScrollForward_command (arg, fromTTY)
** _tuiScrollBackward_command(). ** _tuiScrollBackward_command().
*/ */
static void static void
#ifdef __STDC__ _tuiScrollBackward_command (char *arg, int fromTTY)
_tuiScrollBackward_command (
char *arg,
int fromTTY)
#else
_tuiScrollBackward_command (arg, fromTTY)
char *arg;
int fromTTY;
#endif
{ {
int numToScroll = 1; int numToScroll = 1;
TuiWinInfoPtr winToScroll; TuiWinInfoPtr winToScroll;
@ -704,15 +614,7 @@ _tuiScrollBackward_command (arg, fromTTY)
** _tuiScrollLeft_command(). ** _tuiScrollLeft_command().
*/ */
static void static void
#ifdef __STDC__ _tuiScrollLeft_command (char *arg, int fromTTY)
_tuiScrollLeft_command (
char *arg,
int fromTTY)
#else
_tuiScrollLeft_command (arg, fromTTY)
char *arg;
int fromTTY;
#endif
{ {
int numToScroll; int numToScroll;
TuiWinInfoPtr winToScroll; TuiWinInfoPtr winToScroll;
@ -731,15 +633,7 @@ _tuiScrollLeft_command (arg, fromTTY)
** _tuiScrollRight_command(). ** _tuiScrollRight_command().
*/ */
static void static void
#ifdef __STDC__ _tuiScrollRight_command (char *arg, int fromTTY)
_tuiScrollRight_command (
char *arg,
int fromTTY)
#else
_tuiScrollRight_command (arg, fromTTY)
char *arg;
int fromTTY;
#endif
{ {
int numToScroll; int numToScroll;
TuiWinInfoPtr winToScroll; TuiWinInfoPtr winToScroll;
@ -759,15 +653,7 @@ _tuiScrollRight_command (arg, fromTTY)
** Set focus to the window named by 'arg' ** Set focus to the window named by 'arg'
*/ */
static void static void
#ifdef __STDC__ _tuiSetFocus (char *arg, int fromTTY)
_tuiSetFocus (
char *arg,
int fromTTY)
#else
_tuiSetFocus (arg, fromTTY)
char *arg;
int fromTTY;
#endif
{ {
if (arg != (char *) NULL) if (arg != (char *) NULL)
{ {
@ -811,13 +697,7 @@ The window name specified must be valid and visible.\n");
** _tui_vSetFocus() ** _tui_vSetFocus()
*/ */
static void static void
#ifdef __STDC__ _tui_vSetFocus (va_list args)
_tui_vSetFocus (
va_list args)
#else
_tui_vSetFocus (args)
va_list args;
#endif
{ {
char *arg = va_arg (args, char *); char *arg = va_arg (args, char *);
int fromTTY = va_arg (args, int); int fromTTY = va_arg (args, int);
@ -832,15 +712,7 @@ _tui_vSetFocus (args)
** _tuiSetFocus_command() ** _tuiSetFocus_command()
*/ */
static void static void
#ifdef __STDC__ _tuiSetFocus_command (char *arg, int fromTTY)
_tuiSetFocus_command (
char *arg,
int fromTTY)
#else
_tuiSetFocus_command (arg, fromTTY)
char *arg;
int fromTTY;
#endif
{ {
tuiDo ((TuiOpaqueFuncPtr) _tui_vSetFocus, arg, fromTTY); tuiDo ((TuiOpaqueFuncPtr) _tui_vSetFocus, arg, fromTTY);
@ -852,15 +724,7 @@ _tuiSetFocus_command (arg, fromTTY)
** _tuiAllWindowsInfo(). ** _tuiAllWindowsInfo().
*/ */
static void static void
#ifdef __STDC__ _tuiAllWindowsInfo (char *arg, int fromTTY)
_tuiAllWindowsInfo (
char *arg,
int fromTTY)
#else
_tuiAllWindowsInfo (arg, fromTTY)
char *arg;
int fromTTY;
#endif
{ {
TuiWinType type; TuiWinType type;
TuiWinInfoPtr winWithFocus = tuiWinWithFocus (); TuiWinInfoPtr winWithFocus = tuiWinWithFocus ();
@ -886,15 +750,7 @@ _tuiAllWindowsInfo (arg, fromTTY)
** _tuiRefreshAll_command(). ** _tuiRefreshAll_command().
*/ */
static void static void
#ifdef __STDC__ _tuiRefreshAll_command (char *arg, int fromTTY)
_tuiRefreshAll_command (
char *arg,
int fromTTY)
#else
_tuiRefreshAll_command (arg, fromTTY)
char *arg;
int fromTTY;
#endif
{ {
tuiDo ((TuiOpaqueFuncPtr) tuiRefreshAll); tuiDo ((TuiOpaqueFuncPtr) tuiRefreshAll);
} }
@ -905,15 +761,7 @@ _tuiRefreshAll_command (arg, fromTTY)
** Set the height of the specified window. ** Set the height of the specified window.
*/ */
static void static void
#ifdef __STDC__ _tuiSetTabWidth_command (char *arg, int fromTTY)
_tuiSetTabWidth_command (
char *arg,
int fromTTY)
#else
_tuiSetTabWidth_command (arg, fromTTY)
char *arg;
int fromTTY;
#endif
{ {
if (arg != (char *) NULL) if (arg != (char *) NULL)
{ {
@ -935,15 +783,7 @@ _tuiSetTabWidth_command (arg, fromTTY)
** Set the height of the specified window. ** Set the height of the specified window.
*/ */
static void static void
#ifdef __STDC__ _tuiSetWinHeight (char *arg, int fromTTY)
_tuiSetWinHeight (
char *arg,
int fromTTY)
#else
_tuiSetWinHeight (arg, fromTTY)
char *arg;
int fromTTY;
#endif
{ {
if (arg != (char *) NULL) if (arg != (char *) NULL)
{ {
@ -1032,13 +872,7 @@ The window name specified must be valid and visible.\n");
** Set the height of the specified window, with va_list. ** Set the height of the specified window, with va_list.
*/ */
static void static void
#ifdef __STDC__ _tui_vSetWinHeight (va_list args)
_tui_vSetWinHeight (
va_list args)
#else
_tui_vSetWinHeight (args)
va_list args;
#endif
{ {
char *arg = va_arg (args, char *); char *arg = va_arg (args, char *);
int fromTTY = va_arg (args, int); int fromTTY = va_arg (args, int);
@ -1054,15 +888,7 @@ _tui_vSetWinHeight (args)
** Set the height of the specified window, with va_list. ** Set the height of the specified window, with va_list.
*/ */
static void static void
#ifdef __STDC__ _tuiSetWinHeight_command (char *arg, int fromTTY)
_tuiSetWinHeight_command (
char *arg,
int fromTTY)
#else
_tuiSetWinHeight_command (arg, fromTTY)
char *arg;
int fromTTY;
#endif
{ {
tuiDo ((TuiOpaqueFuncPtr) _tui_vSetWinHeight, arg, fromTTY); tuiDo ((TuiOpaqueFuncPtr) _tui_vSetWinHeight, arg, fromTTY);
@ -1076,15 +902,7 @@ _tuiSetWinHeight_command (arg, fromTTY)
** increase or decrease the command window by the specified amount. ** increase or decrease the command window by the specified amount.
*/ */
static void static void
#ifdef __STDC__ _tuiXDBsetWinHeight (char *arg, int fromTTY)
_tuiXDBsetWinHeight (
char *arg,
int fromTTY)
#else
_tuiXDBsetWinHeight (arg, fromTTY)
char *arg;
int fromTTY;
#endif
{ {
if (arg != (char *) NULL) if (arg != (char *) NULL)
{ {
@ -1116,13 +934,7 @@ _tuiXDBsetWinHeight (arg, fromTTY)
** Set the height of the specified window, with va_list. ** Set the height of the specified window, with va_list.
*/ */
static void static void
#ifdef __STDC__ _tui_vXDBsetWinHeight (va_list args)
_tui_vXDBsetWinHeight (
va_list args)
#else
_tui_vXDBsetWinHeight (args)
va_list args;
#endif
{ {
char *arg = va_arg (args, char *); char *arg = va_arg (args, char *);
int fromTTY = va_arg (args, int); int fromTTY = va_arg (args, int);
@ -1138,15 +950,7 @@ _tui_vXDBsetWinHeight (args)
** Set the height of the specified window, with va_list. ** Set the height of the specified window, with va_list.
*/ */
static void static void
#ifdef __STDC__ _tuiXDBsetWinHeight_command (char *arg, int fromTTY)
_tuiXDBsetWinHeight_command (
char *arg,
int fromTTY)
#else
_tuiXDBsetWinHeight_command (arg, fromTTY)
char *arg;
int fromTTY;
#endif
{ {
tuiDo ((TuiOpaqueFuncPtr) _tui_vXDBsetWinHeight, arg, fromTTY); tuiDo ((TuiOpaqueFuncPtr) _tui_vXDBsetWinHeight, arg, fromTTY);
@ -1159,15 +963,7 @@ _tuiXDBsetWinHeight_command (arg, fromTTY)
** Function to adjust all window heights around the primary ** Function to adjust all window heights around the primary
*/ */
static TuiStatus static TuiStatus
#ifdef __STDC__ _tuiAdjustWinHeights (TuiWinInfoPtr primaryWinInfo, int newHeight)
_tuiAdjustWinHeights (
TuiWinInfoPtr primaryWinInfo,
int newHeight)
#else
_tuiAdjustWinHeights (primaryWinInfo, newHeight)
TuiWinInfoPtr primaryWinInfo;
int newHeight;
#endif
{ {
TuiStatus status = TUI_FAILURE; TuiStatus status = TUI_FAILURE;
@ -1321,15 +1117,7 @@ _tuiAdjustWinHeights (primaryWinInfo, newHeight)
** with the targer) invisible, and set the new height and location. ** with the targer) invisible, and set the new height and location.
*/ */
static void static void
#ifdef __STDC__ _makeInvisibleAndSetNewHeight (TuiWinInfoPtr winInfo, int height)
_makeInvisibleAndSetNewHeight (
TuiWinInfoPtr winInfo,
int height)
#else
_makeInvisibleAndSetNewHeight (winInfo, height)
TuiWinInfoPtr winInfo;
int height;
#endif
{ {
int i; int i;
struct symtab *s; struct symtab *s;
@ -1393,13 +1181,7 @@ _makeInvisibleAndSetNewHeight (winInfo, height)
** had to be destroyed to be made invisible. ** had to be destroyed to be made invisible.
*/ */
static void static void
#ifdef __STDC__ _makeVisibleWithNewHeight (TuiWinInfoPtr winInfo)
_makeVisibleWithNewHeight (
TuiWinInfoPtr winInfo)
#else
_makeVisibleWithNewHeight (winInfo)
TuiWinInfoPtr winInfo;
#endif
{ {
int i; int i;
struct symtab *s; struct symtab *s;
@ -1468,15 +1250,7 @@ _makeVisibleWithNewHeight (winInfo)
static int static int
#ifdef __STDC__ _newHeightOk (TuiWinInfoPtr primaryWinInfo, int newHeight)
_newHeightOk (
TuiWinInfoPtr primaryWinInfo,
int newHeight)
#else
_newHeightOk (primaryWinInfo, newHeight)
TuiWinInfoPtr primaryWinInfo;
int newHeight;
#endif
{ {
int ok = (newHeight < termHeight ()); int ok = (newHeight < termHeight ());
@ -1592,17 +1366,7 @@ _newHeightOk (primaryWinInfo, newHeight)
** _parseScrollingArgs(). ** _parseScrollingArgs().
*/ */
static void static void
#ifdef __STDC__ _parseScrollingArgs (char *arg, TuiWinInfoPtr * winToScroll, int *numToScroll)
_parseScrollingArgs (
char *arg,
TuiWinInfoPtr * winToScroll,
int *numToScroll)
#else
_parseScrollingArgs (arg, winToScroll, numToScroll)
char *arg;
TuiWinInfoPtr *winToScroll;
int *numToScroll;
#endif
{ {
if (numToScroll) if (numToScroll)
*numToScroll = 0; *numToScroll = 0;