2007-08-14 Michael Snyder <msnyder@access-company.com>

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

diff --git a/gdb/tui/tui-file.c b/gdb/tui/tui-file.c
index 1a72d01f856cdeaa02a96f25e8257561b8af904c..45ac281d99fdf5d8c5acefdb56918bc8bc438df4 100644 (file)
--- a/gdb/tui/tui-file.c
+++ b/gdb/tui/tui-file.c
@@ -1,5 +1,5 @@
 /* UI_FILE - a generic STDIO like output stream.
-   Copyright 1999, 2000, 2001 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2000, 2001, 2007 Free Software Foundation, Inc.
 
    This file is part of GDB.
 
@@ -15,20 +15,20 @@
 
    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., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
+   Foundation, Inc., 51 Franklin Street, Fifth Floor,
+   Boston, MA 02110-1301, USA.  */
 
 #include "defs.h"
 #include "ui-file.h"
 #include "tui/tui-file.h"
-#include "tui/tuiIO.h"
+#include "tui/tui-io.h"
 
 #include "tui.h"
 
-#include <string.h>
+#include "gdb_string.h"
 
 /* A ``struct ui_file'' that is compatible with all the legacy
-   code. */
+   code.  */
 
 /* new */
 enum streamtype
@@ -59,7 +59,7 @@ static int tui_file_magic;
 static struct ui_file *
 tui_file_new (void)
 {
-  struct tui_stream *tui = xmalloc (sizeof (struct tui_stream));
+  struct tui_stream *tui = XMALLOC (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);
@@ -77,9 +77,9 @@ 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))
+                   _("tui_file_delete: bad magic number"));
+  if ((tmpstream->ts_streamtype == astring) 
+      && (tmpstream->ts_strbuf != NULL))
     {
       xfree (tmpstream->ts_strbuf);
     }
@@ -111,8 +111,8 @@ tui_sfileopen (int n)
       tmpstream->ts_strbuf[0] = '\0';
     }
   else
-    /* Do not allocate the buffer now.  The first time something is printed
-       one will be allocated by tui_file_adjust_strbuf()  */
+    /* Do not allocate the buffer now.  The first time something is
+       printed one will be allocated by tui_file_adjust_strbuf().  */
     tmpstream->ts_strbuf = NULL;
   tmpstream->ts_buflen = n;
   return file;
@@ -124,7 +124,7 @@ 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");
+                   _("tui_file_isatty: bad magic number"));
   if (stream->ts_streamtype == afile)
     return (isatty (fileno (stream->ts_filestream)));
   else
@@ -137,7 +137,7 @@ 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");
+                   _("tui_file_rewind: bad magic number"));
   stream->ts_strbuf[0] = '\0';
 }
 
@@ -149,7 +149,7 @@ tui_file_put (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_put: bad magic number");
+                   _("tui_file_put: bad magic number"));
   if (stream->ts_streamtype == astring)
     write (dest, stream->ts_strbuf, strlen (stream->ts_strbuf));
 }
@@ -161,7 +161,7 @@ tui_file_put (struct ui_file *file,
    gdb_stderr are sent to the hook.  Everything else is sent on to
    fputs to allow file I/O to be handled appropriately.  */
 
-/* FIXME: Should be broken up and moved to a TUI specific file. */
+/* FIXME: Should be broken up and moved to a TUI specific file.  */
 
 void
 tui_file_fputs (const char *linebuffer, struct ui_file *file)
@@ -185,12 +185,13 @@ 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");
+                   _("tui_file_get_strbuf: bad magic number"));
   return (stream->ts_strbuf);
 }
 
-/* adjust the length of the buffer by the amount necessary
-   to accomodate appending a string of length N to the buffer contents */
+/* Adjust the length of the buffer by the amount necessary to
+   accomodate appending a string of length N to the buffer
+   contents.  */
 void
 tui_file_adjust_strbuf (int n, struct ui_file *file)
 {
@@ -198,14 +199,14 @@ tui_file_adjust_strbuf (int n, struct ui_file *file)
   int non_null_chars;
   if (stream->ts_magic != &tui_file_magic)
     internal_error (__FILE__, __LINE__,
-                   "tui_file_adjust_strbuf: bad magic number");
+                   _("tui_file_adjust_strbuf: bad magic number"));
 
   if (stream->ts_streamtype != astring)
     return;
 
   if (stream->ts_strbuf)
     {
-      /* There is already a buffer allocated */
+      /* There is already a buffer allocated.  */
       non_null_chars = strlen (stream->ts_strbuf);
 
       if (n > (stream->ts_buflen - non_null_chars - 1))
@@ -215,7 +216,7 @@ tui_file_adjust_strbuf (int n, struct ui_file *file)
        }
     }
   else
-    /* No buffer yet, so allocate one of the desired size */
+    /* No buffer yet, so allocate one of the desired size.  */
     stream->ts_strbuf = xmalloc ((n + 1) * sizeof (char));
 }
 
@@ -225,7 +226,7 @@ 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");
+                   _("tui_file_flush: bad magic number"));
 
   switch (stream->ts_streamtype)
     {