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, 129 insertions, 129 deletions

diff --git a/gdb/tui/tui-winsource.c b/gdb/tui/tui-winsource.c
index 0a94399..1a8775e 100644
--- a/gdb/tui/tui-winsource.c
+++ b/gdb/tui/tui-winsource.c
@@ -75,11 +75,11 @@ tui_display_main (void)
 /* Function to display source in the source window.  This function
    initializes the horizontal scroll to 0.  */
 void
-tui_update_source_window (struct tui_win_info * winInfo, struct symtab *s,
+tui_update_source_window (struct tui_win_info * win_info, struct symtab *s,
 			  union tui_line_or_address lineOrAddr, int noerror)
 {
-  winInfo->detail.sourceInfo.horizontalOffset = 0;
-  tui_update_source_window_as_is (winInfo, s, lineOrAddr, noerror);
+  win_info->detail.source_info.horizontal_offset = 0;
+  tui_update_source_window_as_is (win_info, s, lineOrAddr, noerror);
 
   return;
 }
@@ -88,41 +88,41 @@ tui_update_source_window (struct tui_win_info * winInfo, struct symtab *s,
 /* Function to display source in the source/asm window.  This function
    shows the source as specified by the horizontal offset.  */
 void
-tui_update_source_window_as_is (struct tui_win_info * winInfo, struct symtab *s,
+tui_update_source_window_as_is (struct tui_win_info * win_info, struct symtab *s,
 				union tui_line_or_address lineOrAddr, int noerror)
 {
   enum tui_status ret;
 
-  if (winInfo->generic.type == SRC_WIN)
-    ret = tui_set_source_content (s, lineOrAddr.lineNo, noerror);
+  if (win_info->generic.type == SRC_WIN)
+    ret = tui_set_source_content (s, lineOrAddr.line_no, noerror);
   else
     ret = tui_set_disassem_content (lineOrAddr.addr);
 
   if (ret == TUI_FAILURE)
     {
-      tui_clear_source_content (winInfo, EMPTY_SOURCE_PROMPT);
-      tui_clear_exec_info_content (winInfo);
+      tui_clear_source_content (win_info, EMPTY_SOURCE_PROMPT);
+      tui_clear_exec_info_content (win_info);
     }
   else
     {
-      tui_update_breakpoint_info (winInfo, 0);
-      tui_show_source_content (winInfo);
-      tui_update_exec_info (winInfo);
-      if (winInfo->generic.type == SRC_WIN)
+      tui_update_breakpoint_info (win_info, 0);
+      tui_show_source_content (win_info);
+      tui_update_exec_info (win_info);
+      if (win_info->generic.type == SRC_WIN)
 	{
 	  struct symtab_and_line sal;
 	  
-	  sal.line = lineOrAddr.lineNo +
-	    (winInfo->generic.contentSize - 2);
+	  sal.line = lineOrAddr.line_no +
+	    (win_info->generic.content_size - 2);
 	  sal.symtab = s;
 	  set_current_source_symtab_and_line (&sal);
 	  /*
 	     ** If the focus was in the asm win, put it in the src
 	     ** win if we don't have a split layout
 	   */
-	  if (tui_win_with_focus () == disassemWin &&
+	  if (tui_win_with_focus () == TUI_DISASM_WIN &&
 	      tui_current_layout () != SRC_DISASSEM_COMMAND)
-	    tui_set_win_focus_to (srcWin);
+	    tui_set_win_focus_to (TUI_SRC_WIN);
 	}
     }
 
@@ -152,7 +152,7 @@ tui_update_source_windows_with_addr (CORE_ADDR addr)
 	  break;
 	default:
 	  sal = find_pc_line (addr, 0);
-	  l.lineNo = sal.line;
+	  l.line_no = sal.line;
 	  tui_show_symtab_source (sal.symtab, l, FALSE);
 	  break;
 	}
@@ -163,10 +163,10 @@ tui_update_source_windows_with_addr (CORE_ADDR addr)
 
       for (i = 0; i < (tui_source_windows ())->count; i++)
 	{
-	  struct tui_win_info * winInfo = (struct tui_win_info *) (tui_source_windows ())->list[i];
+	  struct tui_win_info * win_info = (struct tui_win_info *) (tui_source_windows ())->list[i];
 
-	  tui_clear_source_content (winInfo, EMPTY_SOURCE_PROMPT);
-	  tui_clear_exec_info_content (winInfo);
+	  tui_clear_source_content (win_info, EMPTY_SOURCE_PROMPT);
+	  tui_clear_exec_info_content (win_info);
 	}
     }
 
@@ -189,7 +189,7 @@ tui_update_source_windows_with_line (struct symtab *s, int line)
       tui_update_source_windows_with_addr (pc);
       break;
     default:
-      l.lineNo = line;
+      l.line_no = line;
       tui_show_symtab_source (s, l, FALSE);
       if (tui_current_layout () == SRC_DISASSEM_COMMAND)
 	{
@@ -203,20 +203,20 @@ tui_update_source_windows_with_line (struct symtab *s, int line)
 }
 
 void
-tui_clear_source_content (struct tui_win_info * winInfo, int displayPrompt)
+tui_clear_source_content (struct tui_win_info * win_info, int displayPrompt)
 {
-  if (m_winPtrNotNull (winInfo))
+  if (win_info != NULL)
     {
       register int i;
 
-      winInfo->generic.contentInUse = FALSE;
-      tui_erase_source_content (winInfo, displayPrompt);
-      for (i = 0; i < winInfo->generic.contentSize; i++)
+      win_info->generic.content_in_use = FALSE;
+      tui_erase_source_content (win_info, displayPrompt);
+      for (i = 0; i < win_info->generic.content_size; i++)
 	{
 	  struct tui_win_element * element =
-	  (struct tui_win_element *) winInfo->generic.content[i];
-	  element->whichElement.source.hasBreak = FALSE;
-	  element->whichElement.source.isExecPoint = FALSE;
+	  (struct tui_win_element *) win_info->generic.content[i];
+	  element->which_element.source.has_break = FALSE;
+	  element->which_element.source.is_exec_point = FALSE;
 	}
     }
 
@@ -225,20 +225,20 @@ tui_clear_source_content (struct tui_win_info * winInfo, int displayPrompt)
 
 
 void
-tui_erase_source_content (struct tui_win_info * winInfo, int displayPrompt)
+tui_erase_source_content (struct tui_win_info * win_info, int displayPrompt)
 {
   int xPos;
-  int halfWidth = (winInfo->generic.width - 2) / 2;
+  int halfWidth = (win_info->generic.width - 2) / 2;
 
-  if (winInfo->generic.handle != (WINDOW *) NULL)
+  if (win_info->generic.handle != (WINDOW *) NULL)
     {
-      werase (winInfo->generic.handle);
-      tui_check_and_display_highlight_if_needed (winInfo);
+      werase (win_info->generic.handle);
+      tui_check_and_display_highlight_if_needed (win_info);
       if (displayPrompt == EMPTY_SOURCE_PROMPT)
 	{
 	  char *noSrcStr;
 
-	  if (winInfo->generic.type == SRC_WIN)
+	  if (win_info->generic.type == SRC_WIN)
 	    noSrcStr = NO_SRC_STRING;
 	  else
 	    noSrcStr = NO_DISASSEM_STRING;
@@ -246,8 +246,8 @@ tui_erase_source_content (struct tui_win_info * winInfo, int displayPrompt)
 	    xPos = 1;
 	  else
 	    xPos = halfWidth - strlen (noSrcStr);
-	  mvwaddstr (winInfo->generic.handle,
-		     (winInfo->generic.height / 2),
+	  mvwaddstr (win_info->generic.handle,
+		     (win_info->generic.height / 2),
 		     xPos,
 		     noSrcStr);
 
@@ -256,9 +256,9 @@ tui_erase_source_content (struct tui_win_info * winInfo, int displayPrompt)
 	     to refresh, do display
 	     the correct stuff, and not the old image */
 
-	  tui_set_source_content_nil (winInfo, noSrcStr);
+	  tui_set_source_content_nil (win_info, noSrcStr);
 	}
-      tui_refresh_win (&winInfo->generic);
+      tui_refresh_win (&win_info->generic);
     }
   return;
 }				/* tuiEraseSourceContent */
@@ -266,55 +266,55 @@ tui_erase_source_content (struct tui_win_info * winInfo, int displayPrompt)
 
 /* Redraw the complete line of a source or disassembly window.  */
 static void
-tui_show_source_line (struct tui_win_info * winInfo, int lineno)
+tui_show_source_line (struct tui_win_info * win_info, int lineno)
 {
   struct tui_win_element * line;
   int x, y;
 
-  line = (struct tui_win_element *) winInfo->generic.content[lineno - 1];
-  if (line->whichElement.source.isExecPoint)
-    wattron (winInfo->generic.handle, A_STANDOUT);
+  line = (struct tui_win_element *) win_info->generic.content[lineno - 1];
+  if (line->which_element.source.is_exec_point)
+    wattron (win_info->generic.handle, A_STANDOUT);
 
-  mvwaddstr (winInfo->generic.handle, lineno, 1,
-             line->whichElement.source.line);
-  if (line->whichElement.source.isExecPoint)
-    wattroff (winInfo->generic.handle, A_STANDOUT);
+  mvwaddstr (win_info->generic.handle, lineno, 1,
+             line->which_element.source.line);
+  if (line->which_element.source.is_exec_point)
+    wattroff (win_info->generic.handle, A_STANDOUT);
 
   /* Clear to end of line but stop before the border.  */
-  getyx (winInfo->generic.handle, y, x);
-  while (x + 1 < winInfo->generic.width)
+  getyx (win_info->generic.handle, y, x);
+  while (x + 1 < win_info->generic.width)
     {
-      waddch (winInfo->generic.handle, ' ');
-      getyx (winInfo->generic.handle, y, x);
+      waddch (win_info->generic.handle, ' ');
+      getyx (win_info->generic.handle, y, x);
     }
 }
 
 void
-tui_show_source_content (struct tui_win_info * winInfo)
+tui_show_source_content (struct tui_win_info * win_info)
 {
-  if (winInfo->generic.contentSize > 0)
+  if (win_info->generic.content_size > 0)
     {
       int lineno;
 
-      for (lineno = 1; lineno <= winInfo->generic.contentSize; lineno++)
-        tui_show_source_line (winInfo, lineno);
+      for (lineno = 1; lineno <= win_info->generic.content_size; lineno++)
+        tui_show_source_line (win_info, lineno);
     }
   else
-    tui_erase_source_content (winInfo, TRUE);
+    tui_erase_source_content (win_info, TRUE);
 
-  tui_check_and_display_highlight_if_needed (winInfo);
-  tui_refresh_win (&winInfo->generic);
-  winInfo->generic.contentInUse = TRUE;
+  tui_check_and_display_highlight_if_needed (win_info);
+  tui_refresh_win (&win_info->generic);
+  win_info->generic.content_in_use = TRUE;
 }
 
 
 /* Scroll the source forward or backward horizontally.  */
 void
-tui_horizontal_source_scroll (struct tui_win_info * winInfo,
+tui_horizontal_source_scroll (struct tui_win_info * win_info,
 			      enum tui_scroll_direction direction,
 			      int numToScroll)
 {
-  if (winInfo->generic.content != NULL)
+  if (win_info->generic.content != NULL)
     {
       int offset;
       struct symtab *s;
@@ -326,17 +326,17 @@ tui_horizontal_source_scroll (struct tui_win_info * winInfo,
 	s = cursal.symtab;
 
       if (direction == LEFT_SCROLL)
-	offset = winInfo->detail.sourceInfo.horizontalOffset + numToScroll;
+	offset = win_info->detail.source_info.horizontal_offset + numToScroll;
       else
 	{
 	  if ((offset =
-	     winInfo->detail.sourceInfo.horizontalOffset - numToScroll) < 0)
+	     win_info->detail.source_info.horizontal_offset - numToScroll) < 0)
 	    offset = 0;
 	}
-      winInfo->detail.sourceInfo.horizontalOffset = offset;
-      tui_update_source_window_as_is (winInfo, s,
+      win_info->detail.source_info.horizontal_offset = offset;
+      tui_update_source_window_as_is (win_info, s,
 				      ((struct tui_win_element *)
-				       winInfo->generic.content[0])->whichElement.source.lineOrAddr,
+				       win_info->generic.content[0])->which_element.source.line_or_addr,
 				      FALSE);
     }
 
@@ -344,33 +344,33 @@ tui_horizontal_source_scroll (struct tui_win_info * winInfo,
 }				/* tuiHorizontalSourceScroll */
 
 
-/* Set or clear the hasBreak flag in the line whose line is lineNo.  */
+/* Set or clear the has_break flag in the line whose line is line_no.  */
 void
-tui_set_is_exec_point_at (union tui_line_or_address l, struct tui_win_info * winInfo)
+tui_set_is_exec_point_at (union tui_line_or_address l, struct tui_win_info * win_info)
 {
   int changed = 0;
   int i;
-  tui_win_content content = (tui_win_content) winInfo->generic.content;
+  tui_win_content content = (tui_win_content) win_info->generic.content;
 
   i = 0;
-  while (i < winInfo->generic.contentSize)
+  while (i < win_info->generic.content_size)
     {
       int newState;
 
-      if (content[i]->whichElement.source.lineOrAddr.addr == l.addr)
+      if (content[i]->which_element.source.line_or_addr.addr == l.addr)
         newState = TRUE;
       else
 	newState = FALSE;
-      if (newState != content[i]->whichElement.source.isExecPoint)
+      if (newState != content[i]->which_element.source.is_exec_point)
         {
           changed++;
-          content[i]->whichElement.source.isExecPoint = newState;
-          tui_show_source_line (winInfo, i + 1);
+          content[i]->which_element.source.is_exec_point = newState;
+          tui_show_source_line (win_info, i + 1);
         }
       i++;
     }
   if (changed)
-    tui_refresh_win (&winInfo->generic);
+    tui_refresh_win (&win_info->generic);
 }
 
 /* Update the execution windows to show the active breakpoints.
@@ -395,7 +395,7 @@ tui_update_all_breakpoint_info ()
 
 
 /* Scan the source window and the breakpoints to update the
-   hasBreak information for each line.
+   has_break information for each line.
    Returns 1 if something changed and the execution window
    must be refreshed.  */
 int
@@ -403,17 +403,17 @@ tui_update_breakpoint_info (struct tui_win_info * win, int current_only)
 {
   int i;
   int need_refresh = 0;
-  struct tui_source_info * src = &win->detail.sourceInfo;
+  struct tui_source_info * src = &win->detail.source_info;
 
-  for (i = 0; i < win->generic.contentSize; i++)
+  for (i = 0; i < win->generic.content_size; i++)
     {
       struct breakpoint *bp;
       extern struct breakpoint *breakpoint_chain;
       int mode;
       struct tui_source_element* line;
 
-      line = &((struct tui_win_element *) win->generic.content[i])->whichElement.source;
-      if (current_only && !line->isExecPoint)
+      line = &((struct tui_win_element *) win->generic.content[i])->which_element.source;
+      if (current_only && !line->is_exec_point)
          continue;
 
       /* Scan each breakpoint to see if the current line has something to
@@ -424,12 +424,12 @@ tui_update_breakpoint_info (struct tui_win_info * win, int current_only)
            bp != (struct breakpoint *) NULL;
            bp = bp->next)
         {
-          if ((win == srcWin
+          if ((win == TUI_SRC_WIN
                && bp->source_file
                && (strcmp (src->filename, bp->source_file) == 0)
-               && bp->line_number == line->lineOrAddr.lineNo)
-              || (win == disassemWin
-                  && bp->loc->address == line->lineOrAddr.addr))
+               && bp->line_number == line->line_or_addr.line_no)
+              || (win == TUI_DISASM_WIN
+                  && bp->loc->address == line->line_or_addr.addr))
             {
               if (bp->enable_state == bp_disabled)
                 mode |= TUI_BP_DISABLED;
@@ -443,9 +443,9 @@ tui_update_breakpoint_info (struct tui_win_info * win, int current_only)
                 mode |= TUI_BP_HARDWARE;
             }
         }
-      if (line->hasBreak != mode)
+      if (line->has_break != mode)
         {
-          line->hasBreak = mode;
+          line->has_break = mode;
           need_refresh = 1;
         }
     }
@@ -460,55 +460,55 @@ tui_update_breakpoint_info (struct tui_win_info * win, int current_only)
    **      disassembly window.
  */
 enum tui_status
-tuiSetExecInfoContent (struct tui_win_info * winInfo)
+tuiSetExecInfoContent (struct tui_win_info * win_info)
 {
   enum tui_status ret = TUI_SUCCESS;
 
-  if (winInfo->detail.sourceInfo.executionInfo != (struct tui_gen_win_info *) NULL)
+  if (win_info->detail.source_info.execution_info != (struct tui_gen_win_info *) NULL)
     {
-      struct tui_gen_win_info * execInfoPtr = winInfo->detail.sourceInfo.executionInfo;
+      struct tui_gen_win_info * execInfoPtr = win_info->detail.source_info.execution_info;
 
       if (execInfoPtr->content == NULL)
 	execInfoPtr->content =
-	  (void **) tui_alloc_content (winInfo->generic.height,
+	  (void **) tui_alloc_content (win_info->generic.height,
 					 execInfoPtr->type);
       if (execInfoPtr->content != NULL)
 	{
 	  int i;
 
-          tui_update_breakpoint_info (winInfo, 1);
-	  for (i = 0; i < winInfo->generic.contentSize; i++)
+          tui_update_breakpoint_info (win_info, 1);
+	  for (i = 0; i < win_info->generic.content_size; i++)
 	    {
 	      struct tui_win_element * element;
 	      struct tui_win_element * srcElement;
               int mode;
 
 	      element = (struct tui_win_element *) execInfoPtr->content[i];
-	      srcElement = (struct tui_win_element *) winInfo->generic.content[i];
+	      srcElement = (struct tui_win_element *) win_info->generic.content[i];
 
-              memset(element->whichElement.simpleString, ' ',
-                     sizeof(element->whichElement.simpleString));
-              element->whichElement.simpleString[TUI_EXECINFO_SIZE - 1] = 0;
+              memset(element->which_element.simple_string, ' ',
+                     sizeof(element->which_element.simple_string));
+              element->which_element.simple_string[TUI_EXECINFO_SIZE - 1] = 0;
 
 	      /* Now update the exec info content based upon the state
                  of each line as indicated by the source content.  */
-              mode = srcElement->whichElement.source.hasBreak;
+              mode = srcElement->which_element.source.has_break;
               if (mode & TUI_BP_HIT)
-                element->whichElement.simpleString[TUI_BP_HIT_POS] =
+                element->which_element.simple_string[TUI_BP_HIT_POS] =
                   (mode & TUI_BP_HARDWARE) ? 'H' : 'B';
               else if (mode & (TUI_BP_ENABLED | TUI_BP_DISABLED))
-                element->whichElement.simpleString[TUI_BP_HIT_POS] =
+                element->which_element.simple_string[TUI_BP_HIT_POS] =
                   (mode & TUI_BP_HARDWARE) ? 'h' : 'b';
 
               if (mode & TUI_BP_ENABLED)
-                element->whichElement.simpleString[TUI_BP_BREAK_POS] = '+';
+                element->which_element.simple_string[TUI_BP_BREAK_POS] = '+';
               else if (mode & TUI_BP_DISABLED)
-                element->whichElement.simpleString[TUI_BP_BREAK_POS] = '-';
+                element->which_element.simple_string[TUI_BP_BREAK_POS] = '-';
 
-              if (srcElement->whichElement.source.isExecPoint)
-                element->whichElement.simpleString[TUI_EXEC_POS] = '>';
+              if (srcElement->which_element.source.is_exec_point)
+                element->which_element.simple_string[TUI_EXEC_POS] = '>';
 	    }
-	  execInfoPtr->contentSize = winInfo->generic.contentSize;
+	  execInfoPtr->content_size = win_info->generic.content_size;
 	}
       else
 	ret = TUI_FAILURE;
@@ -522,30 +522,30 @@ tuiSetExecInfoContent (struct tui_win_info * winInfo)
    ** tuiShowExecInfoContent().
  */
 void
-tuiShowExecInfoContent (struct tui_win_info * winInfo)
+tuiShowExecInfoContent (struct tui_win_info * win_info)
 {
-  struct tui_gen_win_info * execInfo = winInfo->detail.sourceInfo.executionInfo;
+  struct tui_gen_win_info * execInfo = win_info->detail.source_info.execution_info;
   int curLine;
 
   werase (execInfo->handle);
   tui_refresh_win (execInfo);
-  for (curLine = 1; (curLine <= execInfo->contentSize); curLine++)
+  for (curLine = 1; (curLine <= execInfo->content_size); curLine++)
     mvwaddstr (execInfo->handle,
 	       curLine,
 	       0,
 	       ((struct tui_win_element *)
-		execInfo->content[curLine - 1])->whichElement.simpleString);
+		execInfo->content[curLine - 1])->which_element.simple_string);
   tui_refresh_win (execInfo);
-  execInfo->contentInUse = TRUE;
+  execInfo->content_in_use = TRUE;
 
   return;
 }
 
 
 void
-tui_erase_exec_info_content (struct tui_win_info * winInfo)
+tui_erase_exec_info_content (struct tui_win_info * win_info)
 {
-  struct tui_gen_win_info * execInfo = winInfo->detail.sourceInfo.executionInfo;
+  struct tui_gen_win_info * execInfo = win_info->detail.source_info.execution_info;
 
   werase (execInfo->handle);
   tui_refresh_win (execInfo);
@@ -554,37 +554,37 @@ tui_erase_exec_info_content (struct tui_win_info * winInfo)
 }
 
 void
-tui_clear_exec_info_content (struct tui_win_info * winInfo)
+tui_clear_exec_info_content (struct tui_win_info * win_info)
 {
-  winInfo->detail.sourceInfo.executionInfo->contentInUse = FALSE;
-  tui_erase_exec_info_content (winInfo);
+  win_info->detail.source_info.execution_info->content_in_use = FALSE;
+  tui_erase_exec_info_content (win_info);
 
   return;
 }
 
 /* Function to update the execution info window.  */
 void
-tui_update_exec_info (struct tui_win_info * winInfo)
+tui_update_exec_info (struct tui_win_info * win_info)
 {
-  tuiSetExecInfoContent (winInfo);
-  tuiShowExecInfoContent (winInfo);
+  tuiSetExecInfoContent (win_info);
+  tuiShowExecInfoContent (win_info);
 }				/* tuiUpdateExecInfo */
 
 enum tui_status
-tui_alloc_source_buffer (struct tui_win_info *winInfo)
+tui_alloc_source_buffer (struct tui_win_info *win_info)
 {
   register char *srcLineBuf;
   register int i, lineWidth, maxLines;
   enum tui_status ret = TUI_FAILURE;
 
-  maxLines = winInfo->generic.height;	/* less the highlight box */
-  lineWidth = winInfo->generic.width - 1;
+  maxLines = win_info->generic.height;	/* less the highlight box */
+  lineWidth = win_info->generic.width - 1;
   /*
      ** Allocate the buffer for the source lines.  Do this only once since they
      ** will be re-used for all source displays.  The only other time this will
      ** be done is when a window's size changes.
    */
-  if (winInfo->generic.content == NULL)
+  if (win_info->generic.content == NULL)
     {
       srcLineBuf = (char *) xmalloc ((maxLines * lineWidth) * sizeof (char));
       if (srcLineBuf == (char *) NULL)
@@ -594,7 +594,7 @@ tui_alloc_source_buffer (struct tui_win_info *winInfo)
       else
 	{
 	  /* allocate the content list */
-	  if ((winInfo->generic.content =
+	  if ((win_info->generic.content =
 	  (void **) tui_alloc_content (maxLines, SRC_WIN)) == NULL)
 	    {
 	      xfree (srcLineBuf);
@@ -606,7 +606,7 @@ tui_alloc_source_buffer (struct tui_win_info *winInfo)
 	}
       for (i = 0; i < maxLines; i++)
 	((struct tui_win_element *)
-	 winInfo->generic.content[i])->whichElement.source.line =
+	 win_info->generic.content[i])->which_element.source.line =
 	  srcLineBuf + (lineWidth * i);
       ret = TUI_SUCCESS;
     }
@@ -620,7 +620,7 @@ tui_alloc_source_buffer (struct tui_win_info *winInfo)
 /* Answer whether the a particular line number or address is displayed
    in the current source window.  */
 int
-tui_line_is_displayed (int line, struct tui_win_info * winInfo,
+tui_line_is_displayed (int line, struct tui_win_info * win_info,
 		       int checkThreshold)
 {
   int isDisplayed = FALSE;
@@ -631,10 +631,10 @@ tui_line_is_displayed (int line, struct tui_win_info * winInfo,
   else
     threshold = 0;
   i = 0;
-  while (i < winInfo->generic.contentSize - threshold && !isDisplayed)
+  while (i < win_info->generic.content_size - threshold && !isDisplayed)
     {
       isDisplayed = (((struct tui_win_element *)
-		      winInfo->generic.content[i])->whichElement.source.lineOrAddr.lineNo
+		      win_info->generic.content[i])->which_element.source.line_or_addr.line_no
 		     == (int) line);
       i++;
     }
@@ -646,7 +646,7 @@ tui_line_is_displayed (int line, struct tui_win_info * winInfo,
 /* Answer whether the a particular line number or address is displayed
    in the current source window.  */
 int
-tui_addr_is_displayed (CORE_ADDR addr, struct tui_win_info * winInfo,
+tui_addr_is_displayed (CORE_ADDR addr, struct tui_win_info * win_info,
 		    int checkThreshold)
 {
   int isDisplayed = FALSE;
@@ -657,10 +657,10 @@ tui_addr_is_displayed (CORE_ADDR addr, struct tui_win_info * winInfo,
   else
     threshold = 0;
   i = 0;
-  while (i < winInfo->generic.contentSize - threshold && !isDisplayed)
+  while (i < win_info->generic.content_size - threshold && !isDisplayed)
     {
       isDisplayed = (((struct tui_win_element *)
-		      winInfo->generic.content[i])->whichElement.source.lineOrAddr.addr
+		      win_info->generic.content[i])->which_element.source.line_or_addr.addr
 		     == addr);
       i++;
     }