summaryrefslogtreecommitdiff
path: root/gdb/tui
diff options
context:
space:
mode:
Diffstat (limited to 'gdb/tui')
-rw-r--r--gdb/tui/tui-file.c2
-rw-r--r--gdb/tui/tui.c10
-rw-r--r--gdb/tui/tui.h54
-rw-r--r--gdb/tui/tuiCommand.h10
-rw-r--r--gdb/tui/tuiData.c4
-rw-r--r--gdb/tui/tuiData.h111
-rw-r--r--gdb/tui/tuiDataWin.h22
-rw-r--r--gdb/tui/tuiDisassem.c6
-rw-r--r--gdb/tui/tuiDisassem.h10
-rw-r--r--gdb/tui/tuiGeneralWin.c2
-rw-r--r--gdb/tui/tuiGeneralWin.h28
-rw-r--r--gdb/tui/tuiIO.c4
-rw-r--r--gdb/tui/tuiIO.h16
-rw-r--r--gdb/tui/tuiLayout.c34
-rw-r--r--gdb/tui/tuiLayout.h17
-rw-r--r--gdb/tui/tuiRegs.c44
-rw-r--r--gdb/tui/tuiRegs.h20
-rw-r--r--gdb/tui/tuiSource.c2
-rw-r--r--gdb/tui/tuiSource.h10
-rw-r--r--gdb/tui/tuiSourceWin.h61
-rw-r--r--gdb/tui/tuiStack.c6
-rw-r--r--gdb/tui/tuiStack.h25
-rw-r--r--gdb/tui/tuiWin.c30
-rw-r--r--gdb/tui/tuiWin.h22
24 files changed, 269 insertions, 281 deletions
diff --git a/gdb/tui/tui-file.c b/gdb/tui/tui-file.c
index 9bb28441ed6..1702db39d46 100644
--- a/gdb/tui/tui-file.c
+++ b/gdb/tui/tui-file.c
@@ -62,7 +62,7 @@ static ui_file_isatty_ftype tui_file_isatty;
static ui_file_rewind_ftype tui_file_rewind;
static ui_file_put_ftype tui_file_put;
static ui_file_delete_ftype tui_file_delete;
-static struct ui_file *tui_file_new PARAMS ((void));
+static struct ui_file *tui_file_new (void);
static int tui_file_magic;
static struct ui_file *
diff --git a/gdb/tui/tui.c b/gdb/tui/tui.c
index a560fdff231..67c31147e53 100644
--- a/gdb/tui/tui.c
+++ b/gdb/tui/tui.c
@@ -44,10 +44,10 @@ extern char *tgoto ();
/*****************************
** Local static forward decls
******************************/
-static void _tuiReset PARAMS ((void));
-static void _toggle_command PARAMS ((char *, int));
-static void _tui_vToggle_command PARAMS ((va_list));
-static Opaque _tui_vDo PARAMS ((TuiOpaqueFuncPtr, va_list));
+static void _tuiReset (void);
+static void _toggle_command (char *, int);
+static void _tui_vToggle_command (va_list);
+static Opaque _tui_vDo (TuiOpaqueFuncPtr, va_list);
@@ -67,7 +67,7 @@ tuiInit (argv0)
#endif
{
extern void init_page_info ();
- extern void initialize_tui_files PARAMS ((void));
+extern void initialize_tui_files (void);
initialize_tui_files ();
initializeStaticData ();
diff --git a/gdb/tui/tui.h b/gdb/tui/tui.h
index 179f231212c..2278052633e 100644
--- a/gdb/tui/tui.h
+++ b/gdb/tui/tui.h
@@ -38,11 +38,11 @@ Opaque (*OpaqueFuncPtr) PARAMS ((va_list));
*/
typedef OpaqueFuncPtr TuiOpaqueFuncPtr;
- extern Opaque vcatch_errors PARAMS ((OpaqueFuncPtr,...));
- extern Opaque va_catch_errors PARAMS ((OpaqueFuncPtr, va_list));
+extern Opaque vcatch_errors (OpaqueFuncPtr, ...);
+extern Opaque va_catch_errors (OpaqueFuncPtr, va_list);
- extern void strcat_to_buf PARAMS ((char *, int, char *));
- extern void strcat_to_buf_with_fmt PARAMS ((char *, int, char *,...));
+extern void strcat_to_buf (char *, int, char *);
+extern void strcat_to_buf_with_fmt (char *, int, char *, ...);
/* Types of error returns */
typedef enum
@@ -97,37 +97,37 @@ TuiGenWinInfo, *TuiGenWinInfoPtr;
/* GENERAL TUI FUNCTIONS */
/* tui.c */
- extern void tuiInit PARAMS ((char *argv0));
- extern void tuiInitWindows PARAMS ((void));
- extern void tuiResetScreen PARAMS ((void));
- extern void tuiCleanUp PARAMS ((void));
- extern void tuiError PARAMS ((char *, int));
- extern void tui_vError PARAMS ((va_list));
- extern void tuiFree PARAMS ((char *));
- extern Opaque tuiDo PARAMS ((TuiOpaqueFuncPtr,...));
- extern Opaque tuiDoAndReturnToTop PARAMS ((TuiOpaqueFuncPtr,...));
- extern Opaque tuiGetLowDisassemblyAddress PARAMS ((Opaque, Opaque));
- extern Opaque tui_vGetLowDisassemblyAddress PARAMS ((va_list));
- extern void tui_vSelectSourceSymtab PARAMS ((va_list));
+extern void tuiInit (char *argv0);
+extern void tuiInitWindows (void);
+extern void tuiResetScreen (void);
+extern void tuiCleanUp (void);
+extern void tuiError (char *, int);
+extern void tui_vError (va_list);
+extern void tuiFree (char *);
+extern Opaque tuiDo (TuiOpaqueFuncPtr, ...);
+extern Opaque tuiDoAndReturnToTop (TuiOpaqueFuncPtr, ...);
+extern Opaque tuiGetLowDisassemblyAddress (Opaque, Opaque);
+extern Opaque tui_vGetLowDisassemblyAddress (va_list);
+extern void tui_vSelectSourceSymtab (va_list);
/* tuiDataWin.c */
- extern void tui_vCheckDataValues PARAMS ((va_list));
+extern void tui_vCheckDataValues (va_list);
/* tuiIO.c */
- extern void tui_vStartNewLines PARAMS ((va_list));
+extern void tui_vStartNewLines (va_list);
/* tuiLayout.c */
- extern void tui_vAddWinToLayout PARAMS ((va_list));
- extern TuiStatus tui_vSetLayoutTo PARAMS ((va_list));
+extern void tui_vAddWinToLayout (va_list);
+extern TuiStatus tui_vSetLayoutTo (va_list);
/* tuiSourceWin.c */
- extern void tuiDisplayMainFunction PARAMS ((void));
- extern void tuiUpdateAllExecInfos PARAMS ((void));
- extern void tuiUpdateOnEnd PARAMS ((void));
- extern void tui_vAllSetHasBreakAt PARAMS ((va_list));
- extern void tui_vUpdateSourceWindowsWithAddr PARAMS ((va_list));
+extern void tuiDisplayMainFunction (void);
+extern void tuiUpdateAllExecInfos (void);
+extern void tuiUpdateOnEnd (void);
+extern void tui_vAllSetHasBreakAt (va_list);
+extern void tui_vUpdateSourceWindowsWithAddr (va_list);
/* tuiStack.c */
- extern void tui_vShowFrameInfo PARAMS ((va_list));
- extern void tui_vUpdateLocatorFilename PARAMS ((va_list));
+extern void tui_vShowFrameInfo (va_list);
+extern void tui_vUpdateLocatorFilename (va_list);
#endif /* TUI_H */
diff --git a/gdb/tui/tuiCommand.h b/gdb/tui/tuiCommand.h
index 68b12e02b46..7d6a99f7f9e 100644
--- a/gdb/tui/tuiCommand.h
+++ b/gdb/tui/tuiCommand.h
@@ -15,11 +15,11 @@
** PUBLIC FUNCTION EXTERNAL DECLS **
******************************************/
-extern unsigned int tuiDispatchCtrlChar PARAMS ((unsigned int));
-extern int tuiIncrCommandCharCountBy PARAMS ((int));
-extern int tuiDecrCommandCharCountBy PARAMS ((int));
-extern int tuiSetCommandCharCountTo PARAMS ((int));
-extern int tuiClearCommandCharCount PARAMS ((void));
+extern unsigned int tuiDispatchCtrlChar (unsigned int);
+extern int tuiIncrCommandCharCountBy (int);
+extern int tuiDecrCommandCharCountBy (int);
+extern int tuiSetCommandCharCountTo (int);
+extern int tuiClearCommandCharCount (void);
#endif
/*_TUI_COMMAND_H*/
diff --git a/gdb/tui/tuiData.c b/gdb/tui/tuiData.c
index a4e38f3971d..50fa4a75c11 100644
--- a/gdb/tui/tuiData.c
+++ b/gdb/tui/tuiData.c
@@ -50,8 +50,8 @@ static int _winResized = FALSE;
/*********************************
** Static function forward decls
**********************************/
-static void freeContent PARAMS ((TuiWinContent, int, TuiWinType));
-static void freeContentElements PARAMS ((TuiWinContent, int, TuiWinType));
+static void freeContent (TuiWinContent, int, TuiWinType);
+static void freeContentElements (TuiWinContent, int, TuiWinType);
diff --git a/gdb/tui/tuiData.h b/gdb/tui/tuiData.h
index dc9c69179cd..a87835dad8f 100644
--- a/gdb/tui/tuiData.h
+++ b/gdb/tui/tuiData.h
@@ -269,64 +269,59 @@ extern int tui_version;
#define cmdWin winList[CMD_WIN]
/* Data Manipulation Functions */
-extern void initializeStaticData PARAMS ((void));
-extern TuiGenWinInfoPtr allocGenericWinInfo PARAMS ((void));
-extern TuiWinInfoPtr allocWinInfo PARAMS ((TuiWinType));
-extern void initGenericPart PARAMS ((TuiGenWinInfoPtr));
-extern void initWinInfo PARAMS ((TuiWinInfoPtr));
-extern TuiWinContent allocContent PARAMS ((int, TuiWinType));
-extern int addContentElements
- PARAMS ((TuiGenWinInfoPtr, int));
-extern void initContentElement
- PARAMS ((TuiWinElementPtr, TuiWinType));
-extern void freeWindow PARAMS ((TuiWinInfoPtr));
-extern void freeAllWindows PARAMS ((void));
-extern void freeWinContent PARAMS ((TuiGenWinInfoPtr));
-extern void freeDataContent PARAMS ((TuiWinContent, int));
-extern void freeAllSourceWinsContent PARAMS ((void));
-extern void tuiDelWindow PARAMS ((TuiWinInfoPtr));
-extern void tuiDelDataWindows PARAMS ((TuiWinContent, int));
-extern TuiWinInfoPtr winByName PARAMS ((char *));
-extern TuiWinInfoPtr partialWinByName PARAMS ((char *));
-extern char *winName PARAMS ((TuiGenWinInfoPtr));
-extern char *displayableWinContentOf
- PARAMS ((TuiGenWinInfoPtr, TuiWinElementPtr));
-extern char *displayableWinContentAt
- PARAMS ((TuiGenWinInfoPtr, int));
-extern int winElementHeight
- PARAMS ((TuiGenWinInfoPtr, TuiWinElementPtr));
-extern TuiLayoutType currentLayout PARAMS ((void));
-extern void setCurrentLayoutTo PARAMS ((TuiLayoutType));
-extern int termHeight PARAMS ((void));
-extern void setTermHeight PARAMS ((int));
-extern int termWidth PARAMS ((void));
-extern void setTermWidth PARAMS ((int));
-extern int historyLimit PARAMS ((void));
-extern void setHistoryLimit PARAMS ((int));
-extern void setGenWinOrigin PARAMS ((TuiGenWinInfoPtr, int, int));
-extern TuiGenWinInfoPtr locatorWinInfoPtr PARAMS ((void));
-extern TuiGenWinInfoPtr sourceExecInfoWinPtr PARAMS ((void));
-extern TuiGenWinInfoPtr disassemExecInfoWinPtr PARAMS ((void));
-extern char *nullStr PARAMS ((void));
-extern char *blankStr PARAMS ((void));
-extern char *locationStr PARAMS ((void));
-extern char *breakStr PARAMS ((void));
-extern char *breakLocationStr PARAMS ((void));
-extern TuiListPtr sourceWindows PARAMS ((void));
-extern void clearSourceWindows PARAMS ((void));
-extern void clearSourceWindowsDetail PARAMS ((void));
-extern void clearWinDetail PARAMS ((TuiWinInfoPtr winInfo));
-extern void tuiAddToSourceWindows PARAMS ((TuiWinInfoPtr));
-extern int tuiDefaultTabLen PARAMS ((void));
-extern void tuiSetDefaultTabLen PARAMS ((int));
-extern TuiWinInfoPtr tuiWinWithFocus PARAMS ((void));
-extern void tuiSetWinWithFocus PARAMS ((TuiWinInfoPtr));
-extern TuiLayoutDefPtr tuiLayoutDef PARAMS ((void));
-extern int tuiWinResized PARAMS ((void));
-extern void tuiSetWinResizedTo PARAMS ((int));
-
-extern TuiWinInfoPtr tuiNextWin PARAMS ((TuiWinInfoPtr));
-extern TuiWinInfoPtr tuiPrevWin PARAMS ((TuiWinInfoPtr));
+extern void initializeStaticData (void);
+extern TuiGenWinInfoPtr allocGenericWinInfo (void);
+extern TuiWinInfoPtr allocWinInfo (TuiWinType);
+extern void initGenericPart (TuiGenWinInfoPtr);
+extern void initWinInfo (TuiWinInfoPtr);
+extern TuiWinContent allocContent (int, TuiWinType);
+extern int addContentElements (TuiGenWinInfoPtr, int);
+extern void initContentElement (TuiWinElementPtr, TuiWinType);
+extern void freeWindow (TuiWinInfoPtr);
+extern void freeAllWindows (void);
+extern void freeWinContent (TuiGenWinInfoPtr);
+extern void freeDataContent (TuiWinContent, int);
+extern void freeAllSourceWinsContent (void);
+extern void tuiDelWindow (TuiWinInfoPtr);
+extern void tuiDelDataWindows (TuiWinContent, int);
+extern TuiWinInfoPtr winByName (char *);
+extern TuiWinInfoPtr partialWinByName (char *);
+extern char *winName (TuiGenWinInfoPtr);
+extern char *displayableWinContentOf (TuiGenWinInfoPtr, TuiWinElementPtr);
+extern char *displayableWinContentAt (TuiGenWinInfoPtr, int);
+extern int winElementHeight (TuiGenWinInfoPtr, TuiWinElementPtr);
+extern TuiLayoutType currentLayout (void);
+extern void setCurrentLayoutTo (TuiLayoutType);
+extern int termHeight (void);
+extern void setTermHeight (int);
+extern int termWidth (void);
+extern void setTermWidth (int);
+extern int historyLimit (void);
+extern void setHistoryLimit (int);
+extern void setGenWinOrigin (TuiGenWinInfoPtr, int, int);
+extern TuiGenWinInfoPtr locatorWinInfoPtr (void);
+extern TuiGenWinInfoPtr sourceExecInfoWinPtr (void);
+extern TuiGenWinInfoPtr disassemExecInfoWinPtr (void);
+extern char *nullStr (void);
+extern char *blankStr (void);
+extern char *locationStr (void);
+extern char *breakStr (void);
+extern char *breakLocationStr (void);
+extern TuiListPtr sourceWindows (void);
+extern void clearSourceWindows (void);
+extern void clearSourceWindowsDetail (void);
+extern void clearWinDetail (TuiWinInfoPtr winInfo);
+extern void tuiAddToSourceWindows (TuiWinInfoPtr);
+extern int tuiDefaultTabLen (void);
+extern void tuiSetDefaultTabLen (int);
+extern TuiWinInfoPtr tuiWinWithFocus (void);
+extern void tuiSetWinWithFocus (TuiWinInfoPtr);
+extern TuiLayoutDefPtr tuiLayoutDef (void);
+extern int tuiWinResized (void);
+extern void tuiSetWinResizedTo (int);
+
+extern TuiWinInfoPtr tuiNextWin (TuiWinInfoPtr);
+extern TuiWinInfoPtr tuiPrevWin (TuiWinInfoPtr);
#endif /* TUI_DATA_H */
diff --git a/gdb/tui/tuiDataWin.h b/gdb/tui/tuiDataWin.h
index 91ba9ec1b2a..2468736bf0b 100644
--- a/gdb/tui/tuiDataWin.h
+++ b/gdb/tui/tuiDataWin.h
@@ -14,17 +14,17 @@
/*****************************************
** PUBLIC FUNCTION EXTERNAL DECLS **
******************************************/
-extern void tuiEraseDataContent PARAMS ((char *));
-extern void tuiDisplayAllData PARAMS ((void));
-extern void tuiCheckDataValues PARAMS ((struct frame_info *));
-extern void tui_vCheckDataValues PARAMS ((va_list));
-extern void tuiDisplayDataFromLine PARAMS ((int));
-extern int tuiFirstDataItemDisplayed PARAMS ((void));
-extern int tuiFirstDataElementNoInLine PARAMS ((int));
-extern void tuiDeleteDataContentWindows PARAMS ((void));
-extern void tuiRefreshDataWin PARAMS ((void));
-extern void tuiDisplayDataFrom PARAMS ((int, int));
-extern void tuiVerticalDataScroll PARAMS ((TuiScrollDirection, int));
+extern void tuiEraseDataContent (char *);
+extern void tuiDisplayAllData (void);
+extern void tuiCheckDataValues (struct frame_info *);
+extern void tui_vCheckDataValues (va_list);
+extern void tuiDisplayDataFromLine (int);
+extern int tuiFirstDataItemDisplayed (void);
+extern int tuiFirstDataElementNoInLine (int);
+extern void tuiDeleteDataContentWindows (void);
+extern void tuiRefreshDataWin (void);
+extern void tuiDisplayDataFrom (int, int);
+extern void tuiVerticalDataScroll (TuiScrollDirection, int);
#endif
/*_TUI_DATAWIN_H*/
diff --git a/gdb/tui/tuiDisassem.c b/gdb/tui/tuiDisassem.c
index a6df69432f5..0f106a7fb33 100644
--- a/gdb/tui/tuiDisassem.c
+++ b/gdb/tui/tuiDisassem.c
@@ -20,7 +20,7 @@
** STATIC LOCAL FUNCTIONS FORWARD DECLS **
******************************************/
-static struct breakpoint *_hasBreak PARAMS ((CORE_ADDR));
+static struct breakpoint *_hasBreak (CORE_ADDR);
/*****************************************
@@ -56,8 +56,8 @@ tuiSetDisassemContent (s, startAddr)
CORE_ADDR newpc, pc;
disassemble_info asmInfo;
TuiGenWinInfoPtr locator = locatorWinInfoPtr ();
- extern void strcat_address PARAMS ((CORE_ADDR, char *, int));
- extern void strcat_address_numeric PARAMS ((CORE_ADDR, int, char *, int));
+extern void strcat_address (CORE_ADDR, char *, int);
+extern void strcat_address_numeric (CORE_ADDR, int, char *, int);
int curLen = 0;
int tab_len = tuiDefaultTabLen ();
diff --git a/gdb/tui/tuiDisassem.h b/gdb/tui/tuiDisassem.h
index 404b2f44fa2..3e9566066e1 100644
--- a/gdb/tui/tuiDisassem.h
+++ b/gdb/tui/tuiDisassem.h
@@ -13,11 +13,11 @@
/*****************************************
** PUBLIC FUNCTION EXTERNAL DECLS **
******************************************/
-extern TuiStatus tuiSetDisassemContent PARAMS ((struct symtab *, Opaque));
-extern void tuiShowDisassem PARAMS ((Opaque));
-extern void tuiShowDisassemAndUpdateSource PARAMS ((Opaque));
-extern void tuiVerticalDisassemScroll PARAMS ((TuiScrollDirection, int));
-extern Opaque tuiGetBeginAsmAddress PARAMS ((void));
+extern TuiStatus tuiSetDisassemContent (struct symtab *, Opaque);
+extern void tuiShowDisassem (Opaque);
+extern void tuiShowDisassemAndUpdateSource (Opaque);
+extern void tuiVerticalDisassemScroll (TuiScrollDirection, int);
+extern Opaque tuiGetBeginAsmAddress (void);
#endif
/*_TUI_DISASSEM_H*/
diff --git a/gdb/tui/tuiGeneralWin.c b/gdb/tui/tuiGeneralWin.c
index 382d7b3eafc..061ecc1564f 100644
--- a/gdb/tui/tuiGeneralWin.c
+++ b/gdb/tui/tuiGeneralWin.c
@@ -12,7 +12,7 @@
/*
** local support functions
*/
-static void _winResize PARAMS ((void));
+static void _winResize (void);
/***********************
diff --git a/gdb/tui/tuiGeneralWin.h b/gdb/tui/tuiGeneralWin.h
index 2c843ef9269..3bd0f163924 100644
--- a/gdb/tui/tuiGeneralWin.h
+++ b/gdb/tui/tuiGeneralWin.h
@@ -4,20 +4,20 @@
/*
** Functions
*/
-extern void tuiClearWin PARAMS ((TuiGenWinInfoPtr));
-extern void unhighlightWin PARAMS ((TuiWinInfoPtr));
-extern void makeVisible PARAMS ((TuiGenWinInfoPtr, int));
-extern void makeAllVisible PARAMS ((int));
-extern void scrollWinForward PARAMS ((TuiGenWinInfoPtr, int));
-extern void scrollWinBackward PARAMS ((TuiGenWinInfoPtr, int));
-extern void makeWindow PARAMS ((TuiGenWinInfoPtr, int));
-extern TuiWinInfoPtr copyWin PARAMS ((TuiWinInfoPtr));
-extern void boxWin PARAMS ((TuiGenWinInfoPtr, int));
-extern void highlightWin PARAMS ((TuiWinInfoPtr));
-extern void checkAndDisplayHighlightIfNeeded PARAMS ((TuiWinInfoPtr));
-extern void refreshAll PARAMS ((TuiWinInfoPtr *));
-extern void tuiDelwin PARAMS ((WINDOW * window));
-extern void tuiRefreshWin PARAMS ((TuiGenWinInfoPtr));
+extern void tuiClearWin (TuiGenWinInfoPtr);
+extern void unhighlightWin (TuiWinInfoPtr);
+extern void makeVisible (TuiGenWinInfoPtr, int);
+extern void makeAllVisible (int);
+extern void scrollWinForward (TuiGenWinInfoPtr, int);
+extern void scrollWinBackward (TuiGenWinInfoPtr, int);
+extern void makeWindow (TuiGenWinInfoPtr, int);
+extern TuiWinInfoPtr copyWin (TuiWinInfoPtr);
+extern void boxWin (TuiGenWinInfoPtr, int);
+extern void highlightWin (TuiWinInfoPtr);
+extern void checkAndDisplayHighlightIfNeeded (TuiWinInfoPtr);
+extern void refreshAll (TuiWinInfoPtr *);
+extern void tuiDelwin (WINDOW * window);
+extern void tuiRefreshWin (TuiGenWinInfoPtr);
/*
** Macros
diff --git a/gdb/tui/tuiIO.c b/gdb/tui/tuiIO.c
index 60a296526f8..1256a50cd1d 100644
--- a/gdb/tui/tuiIO.c
+++ b/gdb/tui/tuiIO.c
@@ -29,8 +29,8 @@ int insert_mode = 0;
/********************************************
** LOCAL STATIC FORWARD DECLS **
********************************************/
-static void _updateCommandInfo PARAMS ((int));
-static unsigned int _tuiHandleResizeDuringIO PARAMS ((unsigned int));
+static void _updateCommandInfo (int);
+static unsigned int _tuiHandleResizeDuringIO (unsigned int);
/*********************************************************************************
diff --git a/gdb/tui/tuiIO.h b/gdb/tui/tuiIO.h
index a1fe6a098ef..11af44e03ea 100644
--- a/gdb/tui/tuiIO.h
+++ b/gdb/tui/tuiIO.h
@@ -8,14 +8,14 @@
#include <stdio.h>
extern void tuiPuts_unfiltered (const char *, struct ui_file *);
-extern unsigned int tuiGetc PARAMS ((void));
-extern unsigned int tuiBufferGetc PARAMS ((void));
-extern int tuiRead PARAMS ((int, char *, int));
-extern void tuiStartNewLines PARAMS ((int));
-extern void tui_vStartNewLines PARAMS ((va_list));
-extern unsigned int tui_vwgetch PARAMS ((va_list));
-extern void tuiTermSetup PARAMS ((int));
-extern void tuiTermUnsetup PARAMS ((int, int));
+extern unsigned int tuiGetc (void);
+extern unsigned int tuiBufferGetc (void);
+extern int tuiRead (int, char *, int);
+extern void tuiStartNewLines (int);
+extern void tui_vStartNewLines (va_list);
+extern unsigned int tui_vwgetch (va_list);
+extern void tuiTermSetup (int);
+extern void tuiTermUnsetup (int, int);
diff --git a/gdb/tui/tuiLayout.c b/gdb/tui/tuiLayout.c
index 23cd7d6a1b2..337665ea111 100644
--- a/gdb/tui/tuiLayout.c
+++ b/gdb/tui/tuiLayout.c
@@ -28,25 +28,25 @@ static void _showSourceOrDisassemAndCommand PARAMS
((TuiLayoutType));
static void _makeSourceOrDisassemWindow PARAMS
((TuiWinInfoPtr *, TuiWinType, int, int));
-static void _makeCommandWindow PARAMS ((TuiWinInfoPtr *, int, int));
-static void _makeSourceWindow PARAMS ((TuiWinInfoPtr *, int, int));
+static void _makeCommandWindow (TuiWinInfoPtr *, int, int);
+static void _makeSourceWindow (TuiWinInfoPtr *, int, int);
static void _makeDisassemWindow PARAMS
((TuiWinInfoPtr *, int, int));
-static void _makeDataWindow PARAMS ((TuiWinInfoPtr *, int, int));
-static void _showSourceCommand PARAMS ((void));
-static void _showDisassemCommand PARAMS ((void));
-static void _showSourceDisassemCommand PARAMS ((void));
-static void _showData PARAMS ((TuiLayoutType));
-static TuiLayoutType _nextLayout PARAMS ((void));
-static TuiLayoutType _prevLayout PARAMS ((void));
-static void _tuiLayout_command PARAMS ((char *, int));
-static void _tuiToggleLayout_command PARAMS ((char *, int));
-static void _tui_vToggleLayout_command PARAMS ((va_list));
-static void _tuiToggleSplitLayout_command PARAMS ((char *, int));
-static void _tui_vToggleSplitLayout_command PARAMS ((va_list));
-static Opaque _extractDisplayStartAddr PARAMS ((void));
-static void _tuiHandleXDBLayout PARAMS ((TuiLayoutDefPtr));
-static TuiStatus _tuiSetLayoutTo PARAMS ((char *));
+static void _makeDataWindow (TuiWinInfoPtr *, int, int);
+static void _showSourceCommand (void);
+static void _showDisassemCommand (void);
+static void _showSourceDisassemCommand (void);
+static void _showData (TuiLayoutType);
+static TuiLayoutType _nextLayout (void);
+static TuiLayoutType _prevLayout (void);
+static void _tuiLayout_command (char *, int);
+static void _tuiToggleLayout_command (char *, int);
+static void _tui_vToggleLayout_command (va_list);
+static void _tuiToggleSplitLayout_command (char *, int);
+static void _tui_vToggleSplitLayout_command (va_list);
+static Opaque _extractDisplayStartAddr (void);
+static void _tuiHandleXDBLayout (TuiLayoutDefPtr);
+static TuiStatus _tuiSetLayoutTo (char *);
/***************************************
diff --git a/gdb/tui/tuiLayout.h b/gdb/tui/tuiLayout.h
index 81d69158098..1c6774dee05 100644
--- a/gdb/tui/tuiLayout.h
+++ b/gdb/tui/tuiLayout.h
@@ -1,15 +1,12 @@
#ifndef TUI_LAYOUT_H
#define TUI_LAYOUT_H
-extern void showLayout PARAMS ((TuiLayoutType));
-extern void tuiAddWinToLayout PARAMS ((TuiWinType));
-extern void tui_vAddWinToLayout PARAMS ((va_list));
-extern int tuiDefaultWinHeight
- PARAMS ((TuiWinType, TuiLayoutType));
-extern int tuiDefaultWinViewportHeight
- PARAMS ((TuiWinType, TuiLayoutType));
-extern TuiStatus tuiSetLayout
- PARAMS ((TuiLayoutType, TuiRegisterDisplayType));
-extern TuiStatus tui_vSetLayoutTo PARAMS ((va_list));
+extern void showLayout (TuiLayoutType);
+extern void tuiAddWinToLayout (TuiWinType);
+extern void tui_vAddWinToLayout (va_list);
+extern int tuiDefaultWinHeight (TuiWinType, TuiLayoutType);
+extern int tuiDefaultWinViewportHeight (TuiWinType, TuiLayoutType);
+extern TuiStatus tuiSetLayout (TuiLayoutType, TuiRegisterDisplayType);
+extern TuiStatus tui_vSetLayoutTo (va_list);
#endif /*TUI_LAYOUT_H */
diff --git a/gdb/tui/tuiRegs.c b/gdb/tui/tuiRegs.c
index 30dd906da9c..1efadd065c9 100644
--- a/gdb/tui/tuiRegs.c
+++ b/gdb/tui/tuiRegs.c
@@ -50,34 +50,28 @@
** STATIC LOCAL FUNCTIONS FORWARD DECLS **
******************************************/
static TuiStatus _tuiSetRegsContent
- PARAMS ((int, int, struct frame_info *,
- TuiRegisterDisplayType, int));
-static char *_tuiRegisterName PARAMS ((int));
-static TuiStatus _tuiGetRegisterRawValue
- PARAMS ((int, char *, struct frame_info *));
+ (int, int, struct frame_info *, TuiRegisterDisplayType, int);
+static char *_tuiRegisterName (int);
+static TuiStatus _tuiGetRegisterRawValue (int, char *, struct frame_info *);
static void _tuiSetRegisterElement
- PARAMS ((int, struct frame_info *,
- TuiDataElementPtr, int));
-static void _tuiDisplayRegister
- PARAMS ((int, TuiGenWinInfoPtr, enum precision_type));
+ (int, struct frame_info *, TuiDataElementPtr, int);
+static void _tuiDisplayRegister (int, TuiGenWinInfoPtr, enum precision_type);
static void _tuiRegisterFormat
- PARAMS ((char *, int, int, TuiDataElementPtr,
- enum precision_type));
-static TuiStatus _tuiSetGeneralRegsContent PARAMS ((int));
-static TuiStatus _tuiSetSpecialRegsContent PARAMS ((int));
-static TuiStatus _tuiSetGeneralAndSpecialRegsContent PARAMS ((int));
-static TuiStatus _tuiSetFloatRegsContent PARAMS ((TuiRegisterDisplayType, int));
+ (char *, int, int, TuiDataElementPtr, enum precision_type);
+static TuiStatus _tuiSetGeneralRegsContent (int);
+static TuiStatus _tuiSetSpecialRegsContent (int);
+static TuiStatus _tuiSetGeneralAndSpecialRegsContent (int);
+static TuiStatus _tuiSetFloatRegsContent (TuiRegisterDisplayType, int);
static int _tuiRegValueHasChanged
- PARAMS ((TuiDataElementPtr, struct frame_info *,
- char *));
-static void _tuiShowFloat_command PARAMS ((char *, int));
-static void _tuiShowGeneral_command PARAMS ((char *, int));
-static void _tuiShowSpecial_command PARAMS ((char *, int));
-static void _tui_vShowRegisters_commandSupport PARAMS ((va_list));
-static void _tuiToggleFloatRegs_command PARAMS ((char *, int));
-static void _tuiScrollRegsForward_command PARAMS ((char *, int));
-static void _tuiScrollRegsBackward_command PARAMS ((char *, int));
-static void _tui_vShowRegisters_commandSupport PARAMS ((va_list));
+ (TuiDataElementPtr, struct frame_info *, char *);
+static void _tuiShowFloat_command (char *, int);
+static void _tuiShowGeneral_command (char *, int);
+static void _tuiShowSpecial_command (char *, int);
+static void _tui_vShowRegisters_commandSupport (va_list);
+static void _tuiToggleFloatRegs_command (char *, int);
+static void _tuiScrollRegsForward_command (char *, int);
+static void _tuiScrollRegsBackward_command (char *, int);
+static void _tui_vShowRegisters_commandSupport (va_list);
diff --git a/gdb/tui/tuiRegs.h b/gdb/tui/tuiRegs.h
index a9f077d1860..65d163bc23c 100644
--- a/gdb/tui/tuiRegs.h
+++ b/gdb/tui/tuiRegs.h
@@ -13,16 +13,16 @@
/*****************************************
** PUBLIC FUNCTION EXTERNAL DECLS **
******************************************/
-extern void tuiCheckRegisterValues PARAMS ((struct frame_info *));
-extern void tuiShowRegisters PARAMS ((TuiRegisterDisplayType));
-extern void tuiDisplayRegistersFrom PARAMS ((int));
-extern int tuiDisplayRegistersFromLine PARAMS ((int, int));
-extern int tuiLastRegsLineNo PARAMS ((void));
-extern int tuiFirstRegElementInLine PARAMS ((int));
-extern int tuiLastRegElementInLine PARAMS ((int));
-extern int tuiLineFromRegElementNo PARAMS ((int));
-extern void tuiToggleFloatRegs PARAMS ((void));
-extern int tuiCalculateRegsColumnCount PARAMS ((TuiRegisterDisplayType));
+extern void tuiCheckRegisterValues (struct frame_info *);
+extern void tuiShowRegisters (TuiRegisterDisplayType);
+extern void tuiDisplayRegistersFrom (int);
+extern int tuiDisplayRegistersFromLine (int, int);
+extern int tuiLastRegsLineNo (void);
+extern int tuiFirstRegElementInLine (int);
+extern int tuiLastRegElementInLine (int);
+extern int tuiLineFromRegElementNo (int);
+extern void tuiToggleFloatRegs (void);
+extern int tuiCalculateRegsColumnCount (TuiRegisterDisplayType);
#endif
diff --git a/gdb/tui/tuiSource.c b/gdb/tui/tuiSource.c
index 356b0140a3b..83cc06742dc 100644
--- a/gdb/tui/tuiSource.c
+++ b/gdb/tui/tuiSource.c
@@ -28,7 +28,7 @@ extern struct symtab *current_source_symtab;
** STATIC LOCAL FUNCTIONS FORWARD DECLS **
******************************************/
-static struct breakpoint *_hasBreak PARAMS ((char *, int));
+static struct breakpoint *_hasBreak (char *, int);
/*****************************************
diff --git a/gdb/tui/tuiSource.h b/gdb/tui/tuiSource.h
index 8545c1fa3c9..3f590e5b9c8 100644
--- a/gdb/tui/tuiSource.h
+++ b/gdb/tui/tuiSource.h
@@ -11,11 +11,11 @@
#include "breakpoint.h"
#endif
-extern TuiStatus tuiSetSourceContent PARAMS ((struct symtab *, int, int));
-extern void tuiShowSource PARAMS ((struct symtab *, Opaque, int));
-extern void tuiShowSourceAsIs PARAMS ((struct symtab *, Opaque, int));
-extern int tuiSourceIsDisplayed PARAMS ((char *));
-extern void tuiVerticalSourceScroll PARAMS ((TuiScrollDirection, int));
+extern TuiStatus tuiSetSourceContent (struct symtab *, int, int);
+extern void tuiShowSource (struct symtab *, Opaque, int);
+extern void tuiShowSourceAsIs (struct symtab *, Opaque, int);
+extern int tuiSourceIsDisplayed (char *);
+extern void tuiVerticalSourceScroll (TuiScrollDirection, int);
/*******************
diff --git a/gdb/tui/tuiSourceWin.h b/gdb/tui/tuiSourceWin.h
index 2da01910a5e..fb6cd81ba40 100644
--- a/gdb/tui/tuiSourceWin.h
+++ b/gdb/tui/tuiSourceWin.h
@@ -5,42 +5,43 @@
*/
-extern void tuiDisplayMainFunction PARAMS ((void));
+extern void tuiDisplayMainFunction (void);
extern void tuiUpdateSourceWindow PARAMS
((TuiWinInfoPtr, struct symtab *, Opaque, int));
extern void tuiUpdateSourceWindowAsIs PARAMS
((TuiWinInfoPtr, struct symtab *, Opaque, int));
-extern void tuiUpdateSourceWindowsWithAddr PARAMS ((Opaque));
-extern void tui_vUpdateSourceWindowsWithAddr PARAMS ((va_list));
-extern void tuiUpdateSourceWindowsWithLine PARAMS ((struct symtab *, int));
-extern void tui_vUpdateSourceWindowsWithLine PARAMS ((va_list));
-extern void tuiUpdateSourceWindowsFromLocator PARAMS ((void));
-extern void tuiClearSourceContent PARAMS ((TuiWinInfoPtr, int));
-extern void tuiClearAllSourceWinsContent PARAMS ((int));
-extern void tuiEraseSourceContent PARAMS ((TuiWinInfoPtr, int));
-extern void tuiEraseAllSourceWinsContent PARAMS ((int));
-extern void tuiSetSourceContentNil PARAMS ((TuiWinInfoPtr, char *));
-extern void tuiShowSourceContent PARAMS ((TuiWinInfoPtr));
-extern void tuiShowAllSourceWinsContent PARAMS ((void));
-extern void tuiHorizontalSourceScroll PARAMS ((TuiWinInfoPtr, TuiScrollDirection, int));
-extern void tuiUpdateOnEnd PARAMS ((void));
+extern void tuiUpdateSourceWindowsWithAddr (Opaque);
+extern void tui_vUpdateSourceWindowsWithAddr (va_list);
+extern void tuiUpdateSourceWindowsWithLine (struct symtab *, int);
+extern void tui_vUpdateSourceWindowsWithLine (va_list);
+extern void tuiUpdateSourceWindowsFromLocator (void);
+extern void tuiClearSourceContent (TuiWinInfoPtr, int);
+extern void tuiClearAllSourceWinsContent (int);
+extern void tuiEraseSourceContent (TuiWinInfoPtr, int);
+extern void tuiEraseAllSourceWinsContent (int);
+extern void tuiSetSourceContentNil (TuiWinInfoPtr, char *);
+extern void tuiShowSourceContent (TuiWinInfoPtr);
+extern void tuiShowAllSourceWinsContent (void);
+extern void tuiHorizontalSourceScroll (TuiWinInfoPtr, TuiScrollDirection,
+ int);
+extern void tuiUpdateOnEnd (void);
-extern TuiStatus tuiSetExecInfoContent PARAMS ((TuiWinInfoPtr));
-extern void tuiShowExecInfoContent PARAMS ((TuiWinInfoPtr));
-extern void tuiShowAllExecInfosContent PARAMS ((void));
-extern void tuiEraseExecInfoContent PARAMS ((TuiWinInfoPtr));
-extern void tuiEraseAllExecInfosContent PARAMS ((void));
-extern void tuiClearExecInfoContent PARAMS ((TuiWinInfoPtr));
-extern void tuiClearAllExecInfosContent PARAMS ((void));
-extern void tuiUpdateExecInfo PARAMS ((TuiWinInfoPtr));
-extern void tuiUpdateAllExecInfos PARAMS ((void));
+extern TuiStatus tuiSetExecInfoContent (TuiWinInfoPtr);
+extern void tuiShowExecInfoContent (TuiWinInfoPtr);
+extern void tuiShowAllExecInfosContent (void);
+extern void tuiEraseExecInfoContent (TuiWinInfoPtr);
+extern void tuiEraseAllExecInfosContent (void);
+extern void tuiClearExecInfoContent (TuiWinInfoPtr);
+extern void tuiClearAllExecInfosContent (void);
+extern void tuiUpdateExecInfo (TuiWinInfoPtr);
+extern void tuiUpdateAllExecInfos (void);
-extern void tuiSetIsExecPointAt PARAMS ((Opaque, TuiWinInfoPtr));
-extern void tuiSetHasBreakAt PARAMS ((struct breakpoint *, TuiWinInfoPtr, int));
-extern void tuiAllSetHasBreakAt PARAMS ((struct breakpoint *, int));
-extern void tui_vAllSetHasBreakAt PARAMS ((va_list));
-extern TuiStatus tuiAllocSourceBuffer PARAMS ((TuiWinInfoPtr));
-extern int tuiLineIsDisplayed PARAMS ((Opaque, TuiWinInfoPtr, int));
+extern void tuiSetIsExecPointAt (Opaque, TuiWinInfoPtr);
+extern void tuiSetHasBreakAt (struct breakpoint *, TuiWinInfoPtr, int);
+extern void tuiAllSetHasBreakAt (struct breakpoint *, int);
+extern void tui_vAllSetHasBreakAt (va_list);
+extern TuiStatus tuiAllocSourceBuffer (TuiWinInfoPtr);
+extern int tuiLineIsDisplayed (Opaque, TuiWinInfoPtr, int);
/*
diff --git a/gdb/tui/tuiStack.c b/gdb/tui/tuiStack.c
index c9c95d2766d..c0f51eff75e 100644
--- a/gdb/tui/tuiStack.c
+++ b/gdb/tui/tuiStack.c
@@ -17,8 +17,8 @@
** STATIC LOCAL FUNCTIONS FORWARD DECLS **
******************************************/
-static char *_getFuncNameFromFrame PARAMS ((struct frame_info *));
-static void _tuiUpdateLocation_command PARAMS ((char *, int));
+static char *_getFuncNameFromFrame (struct frame_info *);
+static void _tuiUpdateLocation_command (char *, int);
@@ -529,7 +529,7 @@ _tuiUpdateLocation_command (arg, fromTTY)
#endif
{
#ifndef TRY
- extern void frame_command PARAMS ((char *, int));
+extern void frame_command (char *, int);
frame_command ("0", FALSE);
#else
struct frame_info *curFrame;
diff --git a/gdb/tui/tuiStack.h b/gdb/tui/tuiStack.h
index 4d7f2f0a5b4..d0bc6134344 100644
--- a/gdb/tui/tuiStack.h
+++ b/gdb/tui/tuiStack.h
@@ -4,19 +4,20 @@
** This header file supports
*/
-extern void tuiSetLocatorInfo PARAMS ((char *, char *, int, Opaque, TuiLocatorElementPtr));
-extern void tuiUpdateLocatorFilename PARAMS ((char *));
-extern void tui_vUpdateLocatorFilename PARAMS ((va_list));
+extern void tuiSetLocatorInfo (char *, char *, int, Opaque,
+ TuiLocatorElementPtr);
+extern void tuiUpdateLocatorFilename (char *);
+extern void tui_vUpdateLocatorFilename (va_list);
extern void tuiUpdateLocatorInfoFromFrame
- PARAMS ((struct frame_info *, TuiLocatorElementPtr));
-extern void tuiUpdateLocatorDisplay PARAMS ((struct frame_info *));
-extern void tuiSetLocatorContent PARAMS ((struct frame_info *));
-extern void tuiShowLocatorContent PARAMS ((void));
-extern void tuiClearLocatorContent PARAMS ((void));
-extern void tuiSwitchFilename PARAMS ((char *));
-extern void tuiShowFrameInfo PARAMS ((struct frame_info *));
-extern void tui_vShowFrameInfo PARAMS ((va_list));
-extern void tuiGetLocatorFilename PARAMS ((TuiGenWinInfoPtr, char **));
+ (struct frame_info *, TuiLocatorElementPtr);
+extern void tuiUpdateLocatorDisplay (struct frame_info *);
+extern void tuiSetLocatorContent (struct frame_info *);
+extern void tuiShowLocatorContent (void);
+extern void tuiClearLocatorContent (void);
+extern void tuiSwitchFilename (char *);
+extern void tuiShowFrameInfo (struct frame_info *);
+extern void tui_vShowFrameInfo (va_list);
+extern void tuiGetLocatorFilename (TuiGenWinInfoPtr, char **);
#endif
diff --git a/gdb/tui/tuiWin.c b/gdb/tui/tuiWin.c
index 9e09911cd89..669576e0e6a 100644
--- a/gdb/tui/tuiWin.c
+++ b/gdb/tui/tuiWin.c
@@ -29,21 +29,21 @@ extern void init_page_info ();
/*******************************
** Static Local Decls
********************************/
-static void _makeVisibleWithNewHeight PARAMS ((TuiWinInfoPtr));
-static void _makeInvisibleAndSetNewHeight PARAMS ((TuiWinInfoPtr, int));
-static TuiStatus _tuiAdjustWinHeights PARAMS ((TuiWinInfoPtr, int));
-static int _newHeightOk PARAMS ((TuiWinInfoPtr, int));
-static void _tuiSetTabWidth_command PARAMS ((char *, int));
-static void _tuiRefreshAll_command PARAMS ((char *, int));
-static void _tuiSetWinHeight_command PARAMS ((char *, int));
-static void _tuiXDBsetWinHeight_command PARAMS ((char *, int));
-static void _tuiAllWindowsInfo PARAMS ((char *, int));
-static void _tuiSetFocus_command PARAMS ((char *, int));
-static void _tuiScrollForward_command PARAMS ((char *, int));
-static void _tuiScrollBackward_command PARAMS ((char *, int));
-static void _tuiScrollLeft_command PARAMS ((char *, int));
-static void _tuiScrollRight_command PARAMS ((char *, int));
-static void _parseScrollingArgs PARAMS ((char *, TuiWinInfoPtr *, int *));
+static void _makeVisibleWithNewHeight (TuiWinInfoPtr);
+static void _makeInvisibleAndSetNewHeight (TuiWinInfoPtr, int);
+static TuiStatus _tuiAdjustWinHeights (TuiWinInfoPtr, int);
+static int _newHeightOk (TuiWinInfoPtr, int);
+static void _tuiSetTabWidth_command (char *, int);
+static void _tuiRefreshAll_command (char *, int);
+static void _tuiSetWinHeight_command (char *, int);
+static void _tuiXDBsetWinHeight_command (char *, int);
+static void _tuiAllWindowsInfo (char *, int);
+static void _tuiSetFocus_command (char *, int);
+static void _tuiScrollForward_command (char *, int);
+static void _tuiScrollBackward_command (char *, int);
+static void _tuiScrollLeft_command (char *, int);
+static void _tuiScrollRight_command (char *, int);
+static void _parseScrollingArgs (char *, TuiWinInfoPtr *, int *);
/***************************************
diff --git a/gdb/tui/tuiWin.h b/gdb/tui/tuiWin.h
index 70bf68b2218..d5ab572f3d6 100644
--- a/gdb/tui/tuiWin.h
+++ b/gdb/tui/tuiWin.h
@@ -13,17 +13,17 @@
/*****************************************
** PUBLIC FUNCTION EXTERNAL DECLS **
******************************************/
-extern void tuiScrollForward PARAMS ((TuiWinInfoPtr, int));
-extern void tuiScrollBackward PARAMS ((TuiWinInfoPtr, int));
-extern void tuiScrollLeft PARAMS ((TuiWinInfoPtr, int));
-extern void tuiScrollRight PARAMS ((TuiWinInfoPtr, int));
-extern void tui_vScroll PARAMS ((va_list));
-extern void tuiSetWinFocusTo PARAMS ((TuiWinInfoPtr));
-extern void tuiClearWinFocusFrom PARAMS ((TuiWinInfoPtr));
-extern void tuiClearWinFocus PARAMS ((void));
-extern void tuiResizeAll PARAMS ((void));
-extern void tuiRefreshAll PARAMS ((void));
-extern void tuiSigwinchHandler PARAMS ((int));
+extern void tuiScrollForward (TuiWinInfoPtr, int);
+extern void tuiScrollBackward (TuiWinInfoPtr, int);
+extern void tuiScrollLeft (TuiWinInfoPtr, int);
+extern void tuiScrollRight (TuiWinInfoPtr, int);
+extern void tui_vScroll (va_list);
+extern void tuiSetWinFocusTo (TuiWinInfoPtr);
+extern void tuiClearWinFocusFrom (TuiWinInfoPtr);
+extern void tuiClearWinFocus (void);
+extern void tuiResizeAll (void);
+extern void tuiRefreshAll (void);
+extern void tuiSigwinchHandler (int);
#endif
/*_TUI_WIN_H*/
View Lorry Controller Status