This is the mail archive of the
gdb-patches@sources.redhat.com
mailing list for the GDB project.
[PATCH]: Some cleanup and fix warnings in tuiRegs.c
- From: Stephane Carrez <stcarrez at nerim dot fr>
- To: gdb-patches at sources dot redhat dot com
- Date: Sun, 25 Aug 2002 13:13:18 +0200
- Subject: [PATCH]: Some cleanup and fix warnings in tuiRegs.c
Hi!
Committed this patch to cleanup and fix warnings.
Stephane
2002-08-25 Stephane Carrez <stcarrez@nerim.fr>
* tuiRegs.c (tuiDisplayRegistersFrom): Remove unused locals.
(_tuiRegisterFormat, _tuiSetSpecialRegsContent): Likewise.
(_tuiSetGeneralAndSpecialRegsContent): Likewise.
(_tuiSetFloatRegsContent): Likewise.
(_tuiRegisterName): Return a const char*.
* tuiData.h (_TuiDataElement): Use const char* for name.
Index: tuiData.h
===================================================================
RCS file: /cvs/src/src/gdb/tui/tuiData.h,v
retrieving revision 1.7
diff -u -p -r1.7 tuiData.h
--- tuiData.h 23 Jul 2001 21:16:20 -0000 1.7
+++ tuiData.h 25 Aug 2002 09:05:07 -0000
@@ -170,7 +170,7 @@ TuiSourceElement, *TuiSourceElementPtr;
/* Elements in the data display window content */
typedef struct _TuiDataElement
{
- char *name;
+ const char *name;
int itemNo; /* the register number, or data display number */
TuiDataType type;
Opaque value;
Index: tuiRegs.c
===================================================================
RCS file: /cvs/src/src/gdb/tui/tuiRegs.c,v
retrieving revision 1.13
diff -u -p -r1.13 tuiRegs.c
--- tuiRegs.c 24 Aug 2002 09:43:30 -0000 1.13
+++ tuiRegs.c 25 Aug 2002 09:05:07 -0000
@@ -46,6 +46,7 @@
#include "gdbtypes.h"
#include "gdbcmd.h"
#include "frame.h"
+#include "regcache.h"
#include "inferior.h"
#include "target.h"
#include "tuiLayout.h"
@@ -86,7 +87,7 @@
******************************************/
static TuiStatus _tuiSetRegsContent
(int, int, struct frame_info *, TuiRegisterDisplayType, int);
-static char *_tuiRegisterName (int);
+static const char *_tuiRegisterName (int);
static TuiStatus _tuiGetRegisterRawValue (int, char *, struct frame_info *);
static void _tuiSetRegisterElement
(int, struct frame_info *, TuiDataElementPtr, int);
@@ -311,7 +312,7 @@ tuiDisplayRegistersFrom (int startElemen
dataWin->detail.dataDisplayInfo.regsContentCount > 0)
{
register int i = startElementNo;
- int j, valueCharsWide, charsWide, itemWinWidth, curY, labelWidth;
+ int j, valueCharsWide, itemWinWidth, curY, labelWidth;
enum precision_type precision;
precision = (dataWin->detail.dataDisplayInfo.regsDisplayType
@@ -435,8 +436,6 @@ tuiDisplayRegElementAtLine (int startEle
int
tuiDisplayRegistersFromLine (int lineNo, int forceDisplay)
{
- int elementNo;
-
if (dataWin->detail.dataDisplayInfo.regsContentCount > 0)
{
int line, elementNo;
@@ -595,7 +594,7 @@ registers.\n",
** _tuiRegisterName().
** Return the register name.
*/
-static char *
+static const char *
_tuiRegisterName (int regNum)
{
return REGISTER_NAME (regNum);
@@ -622,7 +621,7 @@ _tuiRegisterFormat (char *buf, int bufLe
{
struct ui_file *stream;
struct ui_file *old_stdout;
- char *name;
+ const char *name;
struct cleanup *cleanups;
char *p;
int pos;
@@ -701,15 +700,9 @@ static TuiStatus
_tuiSetSpecialRegsContent (int refreshValuesOnly)
{
TuiStatus ret = TUI_FAILURE;
- int i, endRegNum;
+ int endRegNum;
endRegNum = FP0_REGNUM - 1;
-#if 0
- endRegNum = (-1);
- for (i = START_SPECIAL_REGS; (i < NUM_REGS && endRegNum < 0); i++)
- if (TYPE_CODE (REGISTER_VIRTUAL_TYPE (i)) == TYPE_CODE_FLT)
- endRegNum = i - 1;
-#endif
ret = _tuiSetRegsContent (START_SPECIAL_REGS,
endRegNum,
selected_frame,
@@ -728,15 +721,9 @@ static TuiStatus
_tuiSetGeneralAndSpecialRegsContent (int refreshValuesOnly)
{
TuiStatus ret = TUI_FAILURE;
- int i, endRegNum = (-1);
+ int endRegNum = (-1);
endRegNum = FP0_REGNUM - 1;
-#if 0
- endRegNum = (-1);
- for (i = 0; (i < NUM_REGS && endRegNum < 0); i++)
- if (TYPE_CODE (REGISTER_VIRTUAL_TYPE (i)) == TYPE_CODE_FLT)
- endRegNum = i - 1;
-#endif
ret = _tuiSetRegsContent (
0, endRegNum, selected_frame, TUI_SPECIAL_REGS, refreshValuesOnly);
@@ -751,15 +738,9 @@ static TuiStatus
_tuiSetFloatRegsContent (TuiRegisterDisplayType dpyType, int refreshValuesOnly)
{
TuiStatus ret = TUI_FAILURE;
- int i, startRegNum;
+ int startRegNum;
startRegNum = FP0_REGNUM;
-#if 0
- startRegNum = (-1);
- for (i = NUM_REGS - 1; (i >= 0 && startRegNum < 0); i--)
- if (TYPE_CODE (REGISTER_VIRTUAL_TYPE (i)) != TYPE_CODE_FLT)
- startRegNum = i + 1;
-#endif
ret = _tuiSetRegsContent (startRegNum,
NUM_REGS - 1,
selected_frame,