Updare French translation for binutils and German translation for opcodes.

[deliverable/binutils-gdb.git] / gdb / tui / tui-out.c

diff --git a/gdb/tui/tui-out.c b/gdb/tui/tui-out.c
index 0b8ad000b91ee9f5ba4b5c55c66f4046dbcc87cb..d415a60feaa80dc3155bcc3496bc82693666e29e 100644 (file)
--- a/gdb/tui/tui-out.c
+++ b/gdb/tui/tui-out.c
@@ -1,7 +1,6 @@
 /* Output generating routines for GDB CLI.
 
-   Copyright (C) 1999, 2000, 2001, 2002, 2003, 2005, 2007, 2008, 2009, 2010
-   Free Software Foundation, Inc.
+   Copyright (C) 1999-2015 Free Software Foundation, Inc.
 
    Contributed by Cygnus Solutions.
    Written by Fernando Nasser for Cygnus.
@@ -25,9 +24,6 @@
 #include "ui-out.h"
 #include "cli-out.h"
 #include "tui.h"
-#include "gdb_string.h"
-#include "gdb_assert.h"
-
 struct tui_ui_out_data
   {
     struct cli_ui_out_data base;
@@ -52,7 +48,8 @@ tui_field_int (struct ui_out *uiout,
               const char *fldname, 
               int value)
 {
-  tui_out_data *data = ui_out_data (uiout);
+  tui_out_data *data = (tui_out_data *) ui_out_data (uiout);
+
   if (data->base.suppress_output)
     return;
 
@@ -79,11 +76,12 @@ tui_field_string (struct ui_out *uiout,
                  const char *fldname,
                  const char *string)
 {
-  tui_out_data *data = ui_out_data (uiout);
+  tui_out_data *data = (tui_out_data *) ui_out_data (uiout);
+
   if (data->base.suppress_output)
     return;
 
-  if (fldname && data->line > 0 && strcmp (fldname, "file") == 0)
+  if (fldname && data->line > 0 && strcmp (fldname, "fullname") == 0)
     {
       data->start_of_line ++;
       if (data->line > 0)
@@ -109,7 +107,8 @@ tui_field_fmt (struct ui_out *uiout, int fldno,
               const char *format,
               va_list args)
 {
-  tui_out_data *data = ui_out_data (uiout);
+  tui_out_data *data = (tui_out_data *) ui_out_data (uiout);
+
   if (data->base.suppress_output)
     return;
 
@@ -123,7 +122,8 @@ tui_field_fmt (struct ui_out *uiout, int fldno,
 static void
 tui_text (struct ui_out *uiout, const char *string)
 {
-  tui_out_data *data = ui_out_data (uiout);
+  tui_out_data *data = (tui_out_data *) ui_out_data (uiout);
+
   if (data->base.suppress_output)
     return;
   data->start_of_line ++;
@@ -147,7 +147,7 @@ tui_out_new (struct ui_file *stream)
 {
   int flags = 0;
 
-  tui_out_data *data = XMALLOC (tui_out_data);
+  tui_out_data *data = XNEW (tui_out_data);
 
   /* Initialize base "class".  */
   cli_out_data_ctor (&data->base, stream);
@@ -166,7 +166,7 @@ extern void _initialize_tui_out (void);
 void
 _initialize_tui_out (void)
 {
-/* Inherit the CLI version.  */
+  /* Inherit the CLI version.  */
   tui_ui_out_impl = cli_ui_out_impl;
 
   /* Override a few methods.  */