2004-02-07 Andrew Cagney <cagney@redhat.com>

	* tui/tui.h: Do not include <stdarg.h>, <string.h>, and
	"ansidecl.h".  Do not undef "reg" and "chtype".  Fix case of
	fields and variables.
	* tui/tui-wingeneral.h (m_beVisible): Delete macro.
	(m_beInvisible): Delete macro.
	* tui/tui-data.h: Fix case case fields and variables.
	(m_genWinPtrIsNull): Delete macro.
	(tui_win_list): Rename winList.
	(TUI_SRC_WIN): Rename srcWin.
	(TUI_DISASM_WIN): Rename disassemWin.
	(TUI_DATA_WIN): Rename dataWin.
	(TUI_CMD_WIN): Rename cmdWin.
	(m_genWinPtrNotNull): Delete macro.
	(m_winPtrIsNull): Delete macro.
	(m_winPtrNotNull): Delete macro.
	(tui_win_is_source_type): Replace m_winIsSourceType
	(tui_win_is_auxillary): Replace m_winIsAuzillary.
	(tui_win_has_locator): Replace m_hasLocator.
	(tui_set_win_highlight): Replace m_setWinHighlightOn and
	m_setWinHighlightOff.
	* tui/tui-data.c: Update references.
	(tui_win_is_source_type, tui_set_win_highlight): New functions.
	(tui_win_has_locator, tui_win_is_auxillary): New functions.
	* tui/tui-command.c, tui/tui-disasm.c: Update references.
	* tui/tui-io.c, tui/tui-layout.c, tui/tui-regs.c: Ditto.
	* tui/tui-regs.h, tui/tui-source.c, tui/tui-stack.c: Ditto.
	* tui/tui-win.c, tui/tui-windata.c, tui/tui-wingeneral.c: Ditto.
	* tui/tui-winsource.c, tui/tui.c: Ditto.

1 files changed, 46 insertions, 46 deletions

diff --git a/gdb/tui/tui-source.c b/gdb/tui/tui-source.c
index 530ee43..7045f71 100644
--- a/gdb/tui/tui-source.c
+++ b/gdb/tui/tui-source.c
@@ -46,7 +46,7 @@
 
 /* Function to display source in the source window.  */
 enum tui_status
-tui_set_source_content (struct symtab *s, int lineNo, int noerror)
+tui_set_source_content (struct symtab *s, int line_no, int noerror)
 {
   enum tui_status ret = TUI_FAILURE;
 
@@ -56,19 +56,19 @@ tui_set_source_content (struct symtab *s, int lineNo, int noerror)
       register int i, desc, c, lineWidth, nlines;
       register char *srcLine = 0;
 
-      if ((ret = tui_alloc_source_buffer (srcWin)) == TUI_SUCCESS)
+      if ((ret = tui_alloc_source_buffer (TUI_SRC_WIN)) == TUI_SUCCESS)
 	{
-	  lineWidth = srcWin->generic.width - 1;
+	  lineWidth = TUI_SRC_WIN->generic.width - 1;
 	  /* Take hilite (window border) into account, when calculating
 	     the number of lines  */
-	  nlines = (lineNo + (srcWin->generic.height - 2)) - lineNo;
+	  nlines = (line_no + (TUI_SRC_WIN->generic.height - 2)) - line_no;
 	  desc = open_source_file (s);
 	  if (desc < 0)
 	    {
 	      if (!noerror)
 		{
 		  char *name = alloca (strlen (s->filename) + 100);
-		  sprintf (name, "%s:%d", s->filename, lineNo);
+		  sprintf (name, "%s:%d", s->filename, line_no);
 		  print_sys_errmsg (name, errno);
 		}
 	      ret = TUI_FAILURE;
@@ -78,14 +78,14 @@ tui_set_source_content (struct symtab *s, int lineNo, int noerror)
 	      if (s->line_charpos == 0)
 		find_source_lines (s, desc);
 
-	      if (lineNo < 1 || lineNo > s->nlines)
+	      if (line_no < 1 || line_no > s->nlines)
 		{
 		  close (desc);
 		  printf_unfiltered (
 			  "Line number %d out of range; %s has %d lines.\n",
-				      lineNo, s->filename, s->nlines);
+				      line_no, s->filename, s->nlines);
 		}
-	      else if (lseek (desc, s->line_charpos[lineNo - 1], 0) < 0)
+	      else if (lseek (desc, s->line_charpos[line_no - 1], 0) < 0)
 		{
 		  close (desc);
 		  perror_with_name (s->filename);
@@ -94,11 +94,11 @@ tui_set_source_content (struct symtab *s, int lineNo, int noerror)
 		{
 		  register int offset, curLineNo, curLine, curLen, threshold;
 		  struct tui_gen_win_info * locator = tui_locator_win_info_ptr ();
-                  struct tui_source_info * src = &srcWin->detail.sourceInfo;
+                  struct tui_source_info * src = &TUI_SRC_WIN->detail.source_info;
 
-                  if (srcWin->generic.title)
-                    xfree (srcWin->generic.title);
-                  srcWin->generic.title = xstrdup (s->filename);
+                  if (TUI_SRC_WIN->generic.title)
+                    xfree (TUI_SRC_WIN->generic.title);
+                  TUI_SRC_WIN->generic.title = xstrdup (s->filename);
 
                   if (src->filename)
                     xfree (src->filename);
@@ -106,27 +106,27 @@ tui_set_source_content (struct symtab *s, int lineNo, int noerror)
 
 		  /* Determine the threshold for the length of the line
                      and the offset to start the display.  */
-		  offset = src->horizontalOffset;
+		  offset = src->horizontal_offset;
 		  threshold = (lineWidth - 1) + offset;
 		  stream = fdopen (desc, FOPEN_RT);
 		  clearerr (stream);
 		  curLine = 0;
-		  curLineNo = src->startLineOrAddr.lineNo = lineNo;
+		  curLineNo = src->start_line_or_addr.line_no = line_no;
 		  if (offset > 0)
 		    srcLine = (char *) xmalloc (
 					   (threshold + 1) * sizeof (char));
 		  while (curLine < nlines)
 		    {
 		      struct tui_win_element * element = (struct tui_win_element *)
-		      srcWin->generic.content[curLine];
+		      TUI_SRC_WIN->generic.content[curLine];
 
 		      /* get the first character in the line */
 		      c = fgetc (stream);
 
 		      if (offset == 0)
 			srcLine = ((struct tui_win_element *)
-				   srcWin->generic.content[
-					curLine])->whichElement.source.line;
+				   TUI_SRC_WIN->generic.content[
+					curLine])->which_element.source.line;
 		      /* Init the line with the line number */
 		      sprintf (srcLine, "%-6d", curLineNo);
 		      curLen = strlen (srcLine);
@@ -142,14 +142,14 @@ tui_set_source_content (struct symtab *s, int lineNo, int noerror)
 
 		      /* Set whether element is the execution point and
 		         whether there is a break point on it.  */
-		      element->whichElement.source.lineOrAddr.lineNo =
+		      element->which_element.source.line_or_addr.line_no =
 			curLineNo;
-		      element->whichElement.source.isExecPoint =
+		      element->which_element.source.is_exec_point =
 			(strcmp (((struct tui_win_element *)
-			locator->content[0])->whichElement.locator.fileName,
+			locator->content[0])->which_element.locator.file_name,
 				 s->filename) == 0
 			 && curLineNo == ((struct tui_win_element *)
-			 locator->content[0])->whichElement.locator.lineNo);
+			 locator->content[0])->which_element.locator.line_no);
 		      if (c != EOF)
 			{
 			  i = strlen (srcLine) - 1;
@@ -203,20 +203,20 @@ tui_set_source_content (struct symtab *s, int lineNo, int noerror)
 			}
 		      /* Now copy the line taking the offset into account */
 		      if (strlen (srcLine) > offset)
-			strcpy (((struct tui_win_element *) srcWin->generic.content[
-					curLine])->whichElement.source.line,
+			strcpy (((struct tui_win_element *) TUI_SRC_WIN->generic.content[
+					curLine])->which_element.source.line,
 				&srcLine[offset]);
 		      else
 			((struct tui_win_element *)
-			 srcWin->generic.content[
-			  curLine])->whichElement.source.line[0] = (char) 0;
+			 TUI_SRC_WIN->generic.content[
+			  curLine])->which_element.source.line[0] = (char) 0;
 		      curLine++;
 		      curLineNo++;
 		    }
 		  if (offset > 0)
 		    xfree (srcLine);
 		  fclose (stream);
-		  srcWin->generic.contentSize = nlines;
+		  TUI_SRC_WIN->generic.content_size = nlines;
 		  ret = TUI_SUCCESS;
 		}
 	    }
@@ -244,7 +244,7 @@ tui_set_source_content_nil (struct tui_win_info * winInfo, char *warning_string)
 
   /* set to empty each line in the window, except for the one
      which contains the message */
-  while (curr_line < winInfo->generic.contentSize)
+  while (curr_line < winInfo->generic.content_size)
     {
       /* set the information related to each displayed line
          to null: i.e. the line number is 0, there is no bp,
@@ -252,12 +252,12 @@ tui_set_source_content_nil (struct tui_win_info * winInfo, char *warning_string)
 
       struct tui_win_element * element =
       (struct tui_win_element *) winInfo->generic.content[curr_line];
-      element->whichElement.source.lineOrAddr.lineNo = 0;
-      element->whichElement.source.isExecPoint = FALSE;
-      element->whichElement.source.hasBreak = FALSE;
+      element->which_element.source.line_or_addr.line_no = 0;
+      element->which_element.source.is_exec_point = FALSE;
+      element->which_element.source.has_break = FALSE;
 
       /* set the contents of the line to blank */
-      element->whichElement.source.line[0] = (char) 0;
+      element->which_element.source.line[0] = (char) 0;
 
       /* if the current line is in the middle of the screen, then we want to
          display the 'no source available' message in it.
@@ -272,7 +272,7 @@ tui_set_source_content_nil (struct tui_win_info * winInfo, char *warning_string)
 	  int warning_length = strlen (warning_string);
 	  char *srcLine;
 
-	  srcLine = element->whichElement.source.line;
+	  srcLine = element->which_element.source.line;
 
 	  if (warning_length >= ((lineWidth - 1) / 2))
 	    xpos = 1;
@@ -302,8 +302,8 @@ tui_set_source_content_nil (struct tui_win_info * winInfo, char *warning_string)
 void
 tui_show_symtab_source (struct symtab *s, union tui_line_or_address line, int noerror)
 {
-  srcWin->detail.sourceInfo.horizontalOffset = 0;
-  tui_update_source_window_as_is (srcWin, s, line, noerror);
+  TUI_SRC_WIN->detail.source_info.horizontal_offset = 0;
+  tui_update_source_window_as_is (TUI_SRC_WIN, s, line, noerror);
 }
 
 
@@ -312,9 +312,9 @@ tui_show_symtab_source (struct symtab *s, union tui_line_or_address line, int no
 int
 tui_source_is_displayed (char *fname)
 {
-  return (srcWin->generic.contentInUse &&
+  return (TUI_SRC_WIN->generic.content_in_use &&
 	  (strcmp (((struct tui_win_element *) (tui_locator_win_info_ptr ())->
-		  content[0])->whichElement.locator.fileName, fname) == 0));
+		  content[0])->which_element.locator.file_name, fname) == 0));
 }
 
 
@@ -323,11 +323,11 @@ void
 tui_vertical_source_scroll (enum tui_scroll_direction scrollDirection,
 			    int numToScroll)
 {
-  if (srcWin->generic.content != NULL)
+  if (TUI_SRC_WIN->generic.content != NULL)
     {
       union tui_line_or_address l;
       struct symtab *s;
-      tui_win_content content = (tui_win_content) srcWin->generic.content;
+      tui_win_content content = (tui_win_content) TUI_SRC_WIN->generic.content;
       struct symtab_and_line cursal = get_current_source_symtab_and_line ();
 
       if (cursal.symtab == (struct symtab *) NULL)
@@ -337,21 +337,21 @@ tui_vertical_source_scroll (enum tui_scroll_direction scrollDirection,
 
       if (scrollDirection == FORWARD_SCROLL)
 	{
-	  l.lineNo = content[0]->whichElement.source.lineOrAddr.lineNo +
+	  l.line_no = content[0]->which_element.source.line_or_addr.line_no +
 	    numToScroll;
-	  if (l.lineNo > s->nlines)
-	    /*line = s->nlines - winInfo->generic.contentSize + 1; */
+	  if (l.line_no > s->nlines)
+	    /*line = s->nlines - winInfo->generic.content_size + 1; */
 	    /*elz: fix for dts 23398 */
-	    l.lineNo = content[0]->whichElement.source.lineOrAddr.lineNo;
+	    l.line_no = content[0]->which_element.source.line_or_addr.line_no;
 	}
       else
 	{
-	  l.lineNo = content[0]->whichElement.source.lineOrAddr.lineNo -
+	  l.line_no = content[0]->which_element.source.line_or_addr.line_no -
 	    numToScroll;
-	  if (l.lineNo <= 0)
-	    l.lineNo = 1;
+	  if (l.line_no <= 0)
+	    l.line_no = 1;
 	}
 
-      print_source_lines (s, l.lineNo, l.lineNo + 1, 0);
+      print_source_lines (s, l.line_no, l.line_no + 1, 0);
     }
 }