* merge.c (struct sec_merge_hash_entry): Add u.entsize and u.suffix

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

diff --git a/gdb/cli-out.c b/gdb/cli-out.c
index cfe6a21a9a24f61f7b3d15a0083b73dbdbf366be..8d68e036c376ff54c94415d32a0326021cd742fa 100644 (file)
--- a/gdb/cli-out.c
+++ b/gdb/cli-out.c
@@ -1,5 +1,5 @@
 /* Output generating routines for GDB CLI.
-   Copyright 1999-2000 Free Software Foundation, Inc.
+   Copyright 1999, 2000 Free Software Foundation, Inc.
    Contributed by Cygnus Solutions.
    Written by Fernando Nasser for Cygnus.
 
@@ -43,8 +43,9 @@ static void cli_table_body (struct ui_out *uiout);
 static void cli_table_end (struct ui_out *uiout);
 static void cli_table_header (struct ui_out *uiout, int width,
                              enum ui_align alig, char *colhdr);
-static void cli_list_begin (struct ui_out *uiout, int list_flag, char *lstid);
-static void cli_list_end (struct ui_out *uiout, int list_flag);
+static void cli_begin (struct ui_out *uiout, enum ui_out_type type,
+                      int level, const char *lstid);
+static void cli_end (struct ui_out *uiout, enum ui_out_type type, int level);
 static void cli_field_int (struct ui_out *uiout, int fldno, int width,
                           enum ui_align alig, char *fldname, int value);
 static void cli_field_skip (struct ui_out *uiout, int fldno, int width,
@@ -73,8 +74,8 @@ static struct ui_out_impl cli_ui_out_impl =
   cli_table_body,
   cli_table_end,
   cli_table_header,
-  cli_list_begin,
-  cli_list_end,
+  cli_begin,
+  cli_end,
   cli_field_int,
   cli_field_skip,
   cli_field_string,
@@ -102,18 +103,14 @@ static void out_field_fmt (struct ui_out *uiout, int fldno, char *fldname,
 /* Mark beginning of a table */
 
 void
-cli_table_begin (uiout, nbrofcols, tblid)
-     struct ui_out *uiout;
-     int nbrofcols;
-     char *tblid;
+cli_table_begin (struct ui_out *uiout, int nbrofcols, char *tblid)
 {
 }
 
 /* Mark beginning of a table body */
 
 void
-cli_table_body (uiout)
-     struct ui_out *uiout;
+cli_table_body (struct ui_out *uiout)
 {
   /* first, close the table header line */
   cli_text (uiout, "\n");
@@ -122,19 +119,15 @@ cli_table_body (uiout)
 /* Mark end of a table */
 
 void
-cli_table_end (uiout)
-     struct ui_out *uiout;
+cli_table_end (struct ui_out *uiout)
 {
 }
 
 /* Specify table header */
 
 void
-cli_table_header (uiout, width, alignment, colhdr)
-     struct ui_out *uiout;
-     int width;
-     enum ui_align alignment;
-     char *colhdr;
+cli_table_header (struct ui_out *uiout, int width, enum ui_align alignment,
+                 char *colhdr)
 {
   cli_field_string (uiout, 0, width, alignment, 0, colhdr);
 }
@@ -142,32 +135,27 @@ cli_table_header (uiout, width, alignment, colhdr)
 /* Mark beginning of a list */
 
 void
-cli_list_begin (uiout, list_flag, lstid)
-     struct ui_out *uiout;
-     int list_flag;
-     char *lstid;
+cli_begin (struct ui_out *uiout,
+          enum ui_out_type type,
+          int level,
+          const char *id)
 {
 }
 
 /* Mark end of a list */
 
 void
-cli_list_end (uiout, list_flag)
-     struct ui_out *uiout;
-     int list_flag;
+cli_end (struct ui_out *uiout,
+        enum ui_out_type type,
+        int level)
 {
 }
 
 /* output an int field */
 
 void
-cli_field_int (uiout, fldno, width, alignment, fldname, value)
-     struct ui_out *uiout;
-     int fldno;
-     int width;
-     enum ui_align alignment;
-     char *fldname;
-     int value;
+cli_field_int (struct ui_out *uiout, int fldno, int width,
+              enum ui_align alignment, char *fldname, int value)
 {
   char buffer[20];             /* FIXME: how many chars long a %d can become? */
 
@@ -178,12 +166,8 @@ cli_field_int (uiout, fldno, width, alignment, fldname, value)
 /* used to ommit a field */
 
 void
-cli_field_skip (uiout, fldno, width, alignment, fldname)
-     struct ui_out *uiout;
-     int fldno;
-     int width;
-     enum ui_align alignment;
-     char *fldname;
+cli_field_skip (struct ui_out *uiout, int fldno, int width,
+               enum ui_align alignment, char *fldname)
 {
   cli_field_string (uiout, fldno, width, alignment, fldname, "");
 }
@@ -251,18 +235,14 @@ cli_field_fmt (struct ui_out *uiout, int fldno,
 }
 
 void
-cli_spaces (uiout, numspaces)
-     struct ui_out *uiout;
-     int numspaces;
+cli_spaces (struct ui_out *uiout, int numspaces)
 {
   struct ui_out_data *data = ui_out_data (uiout);
   print_spaces_filtered (numspaces, data->stream);
 }
 
 void
-cli_text (uiout, string)
-     struct ui_out *uiout;
-     char *string;
+cli_text (struct ui_out *uiout, char *string)
 {
   struct ui_out_data *data = ui_out_data (uiout);
   fputs_filtered (string, data->stream);
@@ -277,16 +257,13 @@ cli_message (struct ui_out *uiout, int verbosity, char *format, va_list args)
 }
 
 void
-cli_wrap_hint (uiout, identstring)
-     struct ui_out *uiout;
-     char *identstring;
+cli_wrap_hint (struct ui_out *uiout, char *identstring)
 {
   wrap_here (identstring);
 }
 
 void
-cli_flush (uiout)
-     struct ui_out *uiout;
+cli_flush (struct ui_out *uiout)
 {
   struct ui_out_data *data = ui_out_data (uiout);
   gdb_flush (data->stream);
@@ -314,7 +291,7 @@ out_field_fmt (struct ui_out *uiout, int fldno, char *fldname,
 /* access to ui_out format private members */
 
 static void
-field_separator ()
+field_separator (void)
 {
   struct ui_out_data *data = ui_out_data (uiout);
   fputc_filtered (' ', data->stream);
@@ -334,7 +311,7 @@ cli_out_new (struct ui_file *stream)
 
 /* standard gdb initialization hook */
 void
-_initialize_cli_out ()
+_initialize_cli_out (void)
 {
   /* nothing needs to be done */
 }