Merge GDB 7.5.1

gdb/mi/mi-out.c

Index: gdb/mi/mi-out.c
diff --git a/gdb/mi/mi-out.c b/gdb/mi/mi-out.c
index f8f62257a930dfcb0d7049828439c3f5713fa41b..b39e05a3f659c6098589846fbad2775b8cc5c367 100644
--- a/gdb/mi/mi-out.c
+++ b/gdb/mi/mi-out.c
@@ -100,7 +100,7 @@ static void mi_open (struct ui_out *uiout, const char *name,
 		     enum ui_out_type type);
 static void mi_close (struct ui_out *uiout, enum ui_out_type type);
 
-/* Mark beginning of a table */
+/* Mark beginning of a table.  */
 
 void
 mi_table_begin (struct ui_out *uiout,
@@ -109,14 +109,12 @@ mi_table_begin (struct ui_out *uiout,
 		const char *tblid)
 {
   mi_open (uiout, tblid, ui_out_type_tuple);
-  mi_field_int (uiout, -1/*fldno*/, -1/*width*/, -1/*alin*/,
-		"nr_rows", nr_rows);
-  mi_field_int (uiout, -1/*fldno*/, -1/*width*/, -1/*alin*/,
-		"nr_cols", nr_cols);
+  mi_field_int (uiout, -1, -1, -1, "nr_rows", nr_rows);
+  mi_field_int (uiout, -1, -1, -1, "nr_cols", nr_cols);
   mi_open (uiout, "hdr", ui_out_type_list);
 }
 
-/* Mark beginning of a table body */
+/* Mark beginning of a table body.  */
 
 void
 mi_table_body (struct ui_out *uiout)
@@ -130,7 +128,7 @@ mi_table_body (struct ui_out *uiout)
   mi_open (uiout, "body", ui_out_type_list);
 }
 
-/* Mark end of a table */
+/* Mark end of a table.  */
 
 void
 mi_table_end (struct ui_out *uiout)
@@ -142,17 +140,17 @@ mi_table_end (struct ui_out *uiout)
   mi_close (uiout, ui_out_type_tuple);
 }
 
-/* Specify table header */
+/* Specify table header.  */
 
 void
 mi_table_header (struct ui_out *uiout, int width, enum ui_align alignment,
-		 const char *col_name,
-		 const char *colhdr)
+		 const char *col_name, const char *colhdr)
 {
   mi_out_data *data = ui_out_data (uiout);
 
   if (data->suppress_output)
     return;
+
   mi_open (uiout, NULL, ui_out_type_tuple);
   mi_field_int (uiout, 0, 0, 0, "width", width);
   mi_field_int (uiout, 0, 0, 0, "alignment", alignment);
@@ -161,38 +159,36 @@ mi_table_header (struct ui_out *uiout, int width, enum ui_align alignment,
   mi_close (uiout, ui_out_type_tuple);
 }
 
-/* Mark beginning of a list */
+/* Mark beginning of a list.  */
 
 void
-mi_begin (struct ui_out *uiout,
-	  enum ui_out_type type,
-	  int level,
+mi_begin (struct ui_out *uiout, enum ui_out_type type, int level,
 	  const char *id)
 {
   mi_out_data *data = ui_out_data (uiout);
 
   if (data->suppress_output)
     return;
+
   mi_open (uiout, id, type);
 }
 
-/* Mark end of a list */
+/* Mark end of a list.  */
 
 void
-mi_end (struct ui_out *uiout,
-	enum ui_out_type type,
-	int level)
+mi_end (struct ui_out *uiout, enum ui_out_type type, int level)
 {
   mi_out_data *data = ui_out_data (uiout);
 
   if (data->suppress_output)
     return;
+
   mi_close (uiout, type);
 }
 
-/* output an int field */
+/* Output an int field.  */
 
-void
+static void
 mi_field_int (struct ui_out *uiout, int fldno, int width,
               enum ui_align alignment, const char *fldname, int value)
 {
@@ -206,7 +202,7 @@ mi_field_int (struct ui_out *uiout, int fldno, int width,
   mi_field_string (uiout, fldno, width, alignment, fldname, buffer);
 }
 
-/* used to ommit a field */
+/* Used to omit a field.  */
 
 void
 mi_field_skip (struct ui_out *uiout, int fldno, int width,
@@ -214,21 +210,18 @@ mi_field_skip (struct ui_out *uiout, int fldno, int width,
 {
 }
 
-/* other specific mi_field_* end up here so alignment and field
-   separators are both handled by mi_field_string */
+/* Other specific mi_field_* end up here so alignment and field
+   separators are both handled by mi_field_string. */
 
 void
-mi_field_string (struct ui_out *uiout,
-		 int fldno,
-		 int width,
-		 enum ui_align align,
-		 const char *fldname,
-		 const char *string)
+mi_field_string (struct ui_out *uiout, int fldno, int width,
+		 enum ui_align align, const char *fldname, const char *string)
 {
   mi_out_data *data = ui_out_data (uiout);
 
   if (data->suppress_output)
     return;
+
   field_separator (uiout);
   if (fldname)
     fprintf_unfiltered (data->buffer, "%s=", fldname);
@@ -238,19 +231,18 @@ mi_field_string (struct ui_out *uiout,
   fprintf_unfiltered (data->buffer, "\"");
 }
 
-/* This is the only field function that does not align */
+/* This is the only field function that does not align.  */
 
 void
-mi_field_fmt (struct ui_out *uiout, int fldno,
-	      int width, enum ui_align align,
-	      const char *fldname,
-	      const char *format,
-	      va_list args)
+mi_field_fmt (struct ui_out *uiout, int fldno, int width,
+	      enum ui_align align, const char *fldname,
+	      const char *format, va_list args)
 {
   mi_out_data *data = ui_out_data (uiout);
 
   if (data->suppress_output)
     return;
+
   field_separator (uiout);
   if (fldname)
     fprintf_unfiltered (data->buffer, "%s=\"", fldname);
@@ -272,8 +264,7 @@ mi_text (struct ui_out *uiout, const char *string)
 
 void
 mi_message (struct ui_out *uiout, int verbosity,
-	    const char *format,
-	    va_list args)
+	    const char *format, va_list args)
 {
 }
 
@@ -326,9 +317,7 @@ field_separator (struct ui_out *uiout)
 }
 
 static void
-mi_open (struct ui_out *uiout,
-	 const char *name,
-	 enum ui_out_type type)
+mi_open (struct ui_out *uiout, const char *name, enum ui_out_type type)
 {
   mi_out_data *data = ui_out_data (uiout);
 
@@ -350,8 +339,7 @@ mi_open (struct ui_out *uiout,
 }
 
 static void
-mi_close (struct ui_out *uiout,
-	  enum ui_out_type type)
+mi_close (struct ui_out *uiout, enum ui_out_type type)
 {
   mi_out_data *data = ui_out_data (uiout);
 
@@ -369,7 +357,7 @@ mi_close (struct ui_out *uiout,
   data->suppress_field_separator = 0;
 }
 
-/* add a string to the buffer */
+/* Add a string to the buffer.  */
 
 void
 mi_out_buffered (struct ui_out *uiout, char *string)
@@ -379,7 +367,7 @@ mi_out_buffered (struct ui_out *uiout, char *string)
   fprintf_unfiltered (data->buffer, "%s", string);
 }
 
-/* clear the buffer */
+/* Clear the buffer.  */
 
 void
 mi_out_rewind (struct ui_out *uiout)
@@ -389,7 +377,7 @@ mi_out_rewind (struct ui_out *uiout)
   ui_file_rewind (data->buffer);
 }
 
-/* dump the buffer onto the specified stream */
+/* Dump the buffer onto the specified stream.  */
 
 static void
 do_write (void *data, const char *buffer, long length_buffer)
@@ -398,8 +386,7 @@ do_write (void *data, const char *buffer, long length_buffer)
 }
 
 void
-mi_out_put (struct ui_out *uiout,
-	    struct ui_file *stream)
+mi_out_put (struct ui_out *uiout, struct ui_file *stream)
 {
   mi_out_data *data = ui_out_data (uiout);
 
@@ -407,7 +394,7 @@ mi_out_put (struct ui_out *uiout,
   ui_file_rewind (data->buffer);
 }
 
-/* Current MI version.  */
+/* Return the current MI version.  */
 
 int
 mi_version (struct ui_out *uiout)
@@ -417,7 +404,7 @@ mi_version (struct ui_out *uiout)
   return data->mi_version;
 }
 
-/* initalize private members at startup */
+/* Initialize private members at startup.  */
 
 struct ui_out *
 mi_out_new (int mi_version)
@@ -433,10 +420,3 @@ mi_out_new (int mi_version)
   data->buffer = mem_fileopen ();
   return ui_out_new (&mi_ui_out_impl, data, flags);
 }
-
-/* standard gdb initialization hook */
-void
-_initialize_mi_out (void)
-{
-  /* nothing happens here */
-}