constify to_open

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

diff --git a/gdb/tui/tui-file.c b/gdb/tui/tui-file.c
index 84bc0be3597e2d3657cd468f0bbd28da4fd4538b..8e84fc53a1bfaea4b6aee116cefc708f1be4d586 100644 (file)
--- a/gdb/tui/tui-file.c
+++ b/gdb/tui/tui-file.c
@@ -1,11 +1,11 @@
 /* UI_FILE - a generic STDIO like output stream.
-   Copyright (C) 1999, 2000, 2001, 2007 Free Software Foundation, Inc.
+   Copyright (C) 1999-2014 Free Software Foundation, Inc.
 
    This file is part of GDB.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
+   the Free Software Foundation; either version 3 of the License, or
    (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
@@ -14,9 +14,7 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin Street, Fifth Floor,
-   Boston, MA 02110-1301, USA.  */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "defs.h"
 #include "ui-file.h"
@@ -25,7 +23,7 @@
 
 #include "tui.h"
 
-#include "gdb_string.h"
+#include <string.h>
 
 /* A ``struct ui_file'' that is compatible with all the legacy
    code.  */
@@ -59,8 +57,9 @@ static int tui_file_magic;
 static struct ui_file *
 tui_file_new (void)
 {
-  struct tui_stream *tui = XMALLOC (struct tui_stream);
+  struct tui_stream *tui = XNEW (struct tui_stream);
   struct ui_file *file = ui_file_new ();
+
   set_ui_file_data (file, tui, tui_file_delete);
   set_ui_file_flush (file, tui_file_flush);
   set_ui_file_fputs (file, tui_file_fputs);
@@ -75,11 +74,12 @@ static void
 tui_file_delete (struct ui_file *file)
 {
   struct tui_stream *tmpstream = ui_file_data (file);
+
   if (tmpstream->ts_magic != &tui_file_magic)
     internal_error (__FILE__, __LINE__,
                    _("tui_file_delete: bad magic number"));
-  if ((tmpstream->ts_streamtype == astring) &&
-      (tmpstream->ts_strbuf != NULL))
+  if ((tmpstream->ts_streamtype == astring) 
+      && (tmpstream->ts_strbuf != NULL))
     {
       xfree (tmpstream->ts_strbuf);
     }
@@ -91,6 +91,7 @@ tui_fileopen (FILE *stream)
 {
   struct ui_file *file = tui_file_new ();
   struct tui_stream *tmpstream = ui_file_data (file);
+
   tmpstream->ts_streamtype = afile;
   tmpstream->ts_filestream = stream;
   tmpstream->ts_strbuf = NULL;
@@ -103,6 +104,7 @@ tui_sfileopen (int n)
 {
   struct ui_file *file = tui_file_new ();
   struct tui_stream *tmpstream = ui_file_data (file);
+
   tmpstream->ts_streamtype = astring;
   tmpstream->ts_filestream = NULL;
   if (n > 0)
@@ -122,6 +124,7 @@ static int
 tui_file_isatty (struct ui_file *file)
 {
   struct tui_stream *stream = ui_file_data (file);
+
   if (stream->ts_magic != &tui_file_magic)
     internal_error (__FILE__, __LINE__,
                    _("tui_file_isatty: bad magic number"));
@@ -135,6 +138,7 @@ static void
 tui_file_rewind (struct ui_file *file)
 {
   struct tui_stream *stream = ui_file_data (file);
+
   if (stream->ts_magic != &tui_file_magic)
     internal_error (__FILE__, __LINE__,
                    _("tui_file_rewind: bad magic number"));
@@ -147,6 +151,7 @@ tui_file_put (struct ui_file *file,
              void *dest)
 {
   struct tui_stream *stream = ui_file_data (file);
+
   if (stream->ts_magic != &tui_file_magic)
     internal_error (__FILE__, __LINE__,
                    _("tui_file_put: bad magic number"));
@@ -183,6 +188,7 @@ char *
 tui_file_get_strbuf (struct ui_file *file)
 {
   struct tui_stream *stream = ui_file_data (file);
+
   if (stream->ts_magic != &tui_file_magic)
     internal_error (__FILE__, __LINE__,
                    _("tui_file_get_strbuf: bad magic number"));
@@ -197,6 +203,7 @@ tui_file_adjust_strbuf (int n, struct ui_file *file)
 {
   struct tui_stream *stream = ui_file_data (file);
   int non_null_chars;
+
   if (stream->ts_magic != &tui_file_magic)
     internal_error (__FILE__, __LINE__,
                    _("tui_file_adjust_strbuf: bad magic number"));
@@ -224,6 +231,7 @@ static void
 tui_file_flush (struct ui_file *file)
 {
   struct tui_stream *stream = ui_file_data (file);
+
   if (stream->ts_magic != &tui_file_magic)
     internal_error (__FILE__, __LINE__,
                    _("tui_file_flush: bad magic number"));