gdb: default 'id' to nullptr in 'ui_out_emit_type'

Make 'id = nullptr' the default argument for the 'ui_out_emit_type'
ctor.

Co-Authored-By: Stephan Rohr <stephan.rohr@intel.com>
Approved-By: Tom de Vries <tdevries@suse.de>

diff --git a/gdb/ada-tasks.c b/gdb/ada-tasks.c
index 6a91bf1953cfffbf9c8067fe933c7bc74b2e9362..7dfa819a9374e3e4381c1ea91eab57e6f84633e2 100644 (file)
--- a/gdb/ada-tasks.c
+++ b/gdb/ada-tasks.c
@@ -1137,7 +1137,7 @@ print_ada_task_info (struct ui_out *uiout,
       if (taskno_arg && taskno != taskno_arg)
        continue;
 
-      ui_out_emit_tuple tuple_emitter (uiout, NULL);
+      ui_out_emit_tuple tuple_emitter (uiout);
 
       /* Print a star if this task is the current task (or the task
         currently selected).  */

diff --git a/gdb/auto-load.c b/gdb/auto-load.c
index 55204ba4a1f3e4471d027f7f3c3c2576c2b263bc..ccbd091e1c21ae74cd1f5d18f74a00f6f3b02ef3 100644 (file)
--- a/gdb/auto-load.c
+++ b/gdb/auto-load.c
@@ -1259,7 +1259,7 @@ print_script (struct loaded_script *script)
 {
   struct ui_out *uiout = current_uiout;
 
-  ui_out_emit_tuple tuple_emitter (uiout, NULL);
+  ui_out_emit_tuple tuple_emitter (uiout);
 
   uiout->field_string ("loaded", script->loaded ? "Yes" : "No");
   uiout->field_string ("script", script->name);

diff --git a/gdb/breakpoint.c b/gdb/breakpoint.c
index ca600a845e5eac77b46ef1470d4667de7e64dc86..6ca196133fd9c048ab6ca03320cf4fb190ddba4d 100644 (file)
--- a/gdb/breakpoint.c
+++ b/gdb/breakpoint.c
@@ -7009,7 +7009,7 @@ print_one_breakpoint (breakpoint *b, const bp_location **last_loc, int allflag)
          int n = 1;
          for (bp_location &loc : b->locations ())
            {
-             ui_out_emit_tuple loc_tuple_emitter (uiout, NULL);
+             ui_out_emit_tuple loc_tuple_emitter (uiout);
              print_one_breakpoint_location (b, &loc, n, last_loc,
                                             allflag, allflag);
              n++;

diff --git a/gdb/corelow.c b/gdb/corelow.c
index a87e082db870f6a0521577a7306f6e867a7119fc..cd36882a12c12f14afa8d6a096dec2fb866939c1 100644 (file)
--- a/gdb/corelow.c
+++ b/gdb/corelow.c
@@ -1940,7 +1940,7 @@ core_target::info_proc_mappings (struct gdbarch *gdbarch)
       ULONGEST file_ofs = tsp.the_bfd_section->filepos;
       const char *filename = bfd_get_filename (tsp.the_bfd_section->owner);
 
-      ui_out_emit_tuple tuple_emitter (current_uiout, nullptr);
+      ui_out_emit_tuple tuple_emitter (current_uiout);
       current_uiout->field_core_addr ("start", gdbarch, start);
       current_uiout->field_core_addr ("end", gdbarch, end);
       /* These next two aren't really addresses and so shouldn't be

diff --git a/gdb/disasm.c b/gdb/disasm.c
index a61bd203b6f1dea713f14404ed5b6e8891af84c4..01361fe4323468e4e4928bfe90c3dcab63e0886a 100644 (file)
--- a/gdb/disasm.c
+++ b/gdb/disasm.c
@@ -331,7 +331,7 @@ gdb_pretty_print_disassembler::pretty_print_insn (const struct disasm_insn *insn
   struct gdbarch *gdbarch = arch ();
 
   {
-    ui_out_emit_tuple tuple_emitter (m_uiout, NULL);
+    ui_out_emit_tuple tuple_emitter (m_uiout);
     pc = insn->addr;
 
     if (insn->number != 0)

diff --git a/gdb/frame-unwind.c b/gdb/frame-unwind.c
index a942ed8c207116237014f8d7df8b521ab4fa1744..91a3cbe7eeb0210659ed9f1c79669f9b56d28bf6 100644 (file)
--- a/gdb/frame-unwind.c
+++ b/gdb/frame-unwind.c
@@ -453,7 +453,7 @@ maintenance_info_frame_unwinders (const char *args, int from_tty)
 
   for (const auto &unwinder : table)
     {
-      ui_out_emit_list tuple_emitter (uiout, nullptr);
+      ui_out_emit_list tuple_emitter (uiout);
       uiout->field_string ("name", unwinder->name ());
       uiout->field_string ("type", frame_type_str (unwinder->type ()));
       uiout->field_string ("class", frame_unwinder_class_str (

diff --git a/gdb/gdb_bfd.c b/gdb/gdb_bfd.c
index 749d19789cf98f6df89927636527607426796095..5def8093138ca421e2fa1d389206e1010a2da09f 100644 (file)
--- a/gdb/gdb_bfd.c
+++ b/gdb/gdb_bfd.c
@@ -1237,7 +1237,7 @@ maintenance_info_bfds (const char *arg, int from_tty)
   for (auto abfd : all_bfds)
     {
       auto gdata = static_cast<gdb_bfd_data *> (bfd_usrdata (abfd));
-      ui_out_emit_tuple tuple_emitter (uiout, nullptr);
+      ui_out_emit_tuple tuple_emitter (uiout);
       uiout->field_signed ("refcount", gdata->refc);
       uiout->field_string ("addr", host_address_to_string (abfd));
       uiout->field_string ("filename", bfd_get_filename (abfd),

diff --git a/gdb/inferior.c b/gdb/inferior.c
index 1481f46cdd18210583383bead4c612b0cf87b833..229abdd1ef8b59457ca58ea41d49596d72883473 100644 (file)
--- a/gdb/inferior.c
+++ b/gdb/inferior.c
@@ -588,7 +588,7 @@ print_inferior (struct ui_out *uiout, const char *requested_inferiors)
       if (!number_is_in_list (requested_inferiors, inf->num))
        continue;
 
-      ui_out_emit_tuple tuple_emitter (uiout, NULL);
+      ui_out_emit_tuple tuple_emitter (uiout);
 
       if (inf == current_inf)
        uiout->field_string ("current", "*");

diff --git a/gdb/linux-fork.c b/gdb/linux-fork.c
index 92afa4dde6db4cb4f4ea1304d4451fe1c6b5e186..087c5bbe07284b5b1ff0a0007b0a942512090139 100644 (file)
--- a/gdb/linux-fork.c
+++ b/gdb/linux-fork.c
@@ -839,7 +839,7 @@ print_checkpoints (struct ui_out *uiout, inferior *req_inf, fork_info *req_fi)
          thread_info *t = any_thread_of_inferior (inf);
          bool is_current = fi.ptid.pid () == inf->pid;
 
-         ui_out_emit_tuple tuple_emitter (uiout, nullptr);
+         ui_out_emit_tuple tuple_emitter (uiout);
 
          if (is_current && cur_inf == inf)
            uiout->field_string ("current", "*");

diff --git a/gdb/linux-tdep.c b/gdb/linux-tdep.c
index 25d625db595e1725657cca31a54e6bf1ce8b87ff..23e43ba5c5f952d695a41efccab87cf7dc27b1fa 100644 (file)
--- a/gdb/linux-tdep.c
+++ b/gdb/linux-tdep.c
@@ -927,7 +927,7 @@ linux_info_proc (struct gdbarch *gdbarch, const char *args,
            {
              struct mapping m = read_mapping (line);
 
-             ui_out_emit_tuple tuple_emitter (current_uiout, nullptr);
+             ui_out_emit_tuple tuple_emitter (current_uiout);
              current_uiout->field_core_addr ("start", gdbarch, m.addr);
              current_uiout->field_core_addr ("end", gdbarch, m.endaddr);
              /* These next two aren't really addresses and so
@@ -1368,7 +1368,7 @@ linux_core_info_proc_mappings (struct gdbarch *gdbarch, struct bfd *cbfd,
            current_uiout->table_body ();
          }
 
-       ui_out_emit_tuple tuple_emitter (current_uiout, nullptr);
+       ui_out_emit_tuple tuple_emitter (current_uiout);
        current_uiout->field_core_addr ("start", gdbarch, start);
        current_uiout->field_core_addr ("end", gdbarch, end);
        /* These next two aren't really addresses and so shouldn't be

diff --git a/gdb/linux-thread-db.c b/gdb/linux-thread-db.c
index 5e506c4f497da2a6b69b90d114b4d15b94fa4435..dd67950f619f7b24ea3d8f2685d4d957ef3f64f1 100644 (file)
--- a/gdb/linux-thread-db.c
+++ b/gdb/linux-thread-db.c
@@ -1936,7 +1936,7 @@ info_auto_load_libthread_db (const char *args, int from_tty)
     /* Note I is incremented inside the cycle, not at its end.  */
     for (i = 0; i < array.size ();)
       {
-       ui_out_emit_tuple tuple_emitter (uiout, NULL);
+       ui_out_emit_tuple tuple_emitter (uiout);
 
        info = array[i];
        uiout->field_string ("filename", info->filename,

diff --git a/gdb/mi/mi-cmd-file.c b/gdb/mi/mi-cmd-file.c
index 8b2fb379ec85625fc4f2d0735c9fd5af343228d1..a515be0a487c2b81768afb9765a0d6cee0e87b71 100644 (file)
--- a/gdb/mi/mi-cmd-file.c
+++ b/gdb/mi/mi-cmd-file.c
@@ -168,7 +168,7 @@ mi_cmd_file_list_shared_libraries (const char *command,
       if (pattern != nullptr && !re_exec (so.name.c_str ()))
        continue;
 
-      ui_out_emit_tuple tuple_emitter (uiout, NULL);
+      ui_out_emit_tuple tuple_emitter (uiout);
       mi_output_solib_attribs (uiout, so);
     }
 }

diff --git a/gdb/mi/mi-cmd-info.c b/gdb/mi/mi-cmd-info.c
index a33e2edaab169bd1700194fb92555ead946fb6b0..d5ef3bb29743f9d1fa01ca5f38b0d69f07d083d8 100644 (file)
--- a/gdb/mi/mi-cmd-info.c
+++ b/gdb/mi/mi-cmd-info.c
@@ -55,7 +55,7 @@ mi_cmd_info_ada_exceptions (const char *command, const char *const *argv,
 
   for (const ada_exc_info &info : exceptions)
     {
-      ui_out_emit_tuple tuple_emitter (uiout, NULL);
+      ui_out_emit_tuple tuple_emitter (uiout);
       uiout->field_string ("name", info.name);
       uiout->field_core_addr ("address", gdbarch, info.addr);
     }

diff --git a/gdb/mi/mi-cmd-var.c b/gdb/mi/mi-cmd-var.c
index 1f7e0fdfe3d9b80669bb8a7460e2170e0a802bd3..f9c318db39e4017e15d380936003ca3cdeb0cf5e 100644 (file)
--- a/gdb/mi/mi-cmd-var.c
+++ b/gdb/mi/mi-cmd-var.c
@@ -679,7 +679,7 @@ varobj_update_one (struct varobj *var, enum print_values print_values,
     {
       int from, to;
 
-      ui_out_emit_tuple tuple_emitter (uiout, nullptr);
+      ui_out_emit_tuple tuple_emitter (uiout);
       uiout->field_string ("name", varobj_get_objname (r.varobj));
 
       switch (r.status)
@@ -737,7 +737,7 @@ varobj_update_one (struct varobj *var, enum print_values print_values,
 
          for (varobj *child : r.newobj)
            {
-             ui_out_emit_tuple inner_tuple_emitter (uiout, NULL);
+             ui_out_emit_tuple inner_tuple_emitter (uiout);
              print_varobj (child, print_values, 1 /* print_expression */);
            }
        }

diff --git a/gdb/mi/mi-interp.c b/gdb/mi/mi-interp.c
index 1a0d34106ed123c2ddf0c322ecb91333e7ea63c5..207b1fc97ff9d7d148e07f0b2c9893d639047f62 100644 (file)
--- a/gdb/mi/mi-interp.c
+++ b/gdb/mi/mi-interp.c
@@ -725,7 +725,7 @@ mi_output_solib_attribs_1 (ui_out *uiout, const solib &solib,
       uiout->field_fmt ("thread-group", "i%d", current_inferior ()->num);
 
   ui_out_emit_list list_emitter (uiout, "ranges");
-  ui_out_emit_tuple tuple_emitter (uiout, NULL);
+  ui_out_emit_tuple tuple_emitter (uiout);
   if (solib.addr_high != 0)
     {
       uiout->field_core_addr ("from", gdbarch, solib.addr_low);

diff --git a/gdb/mi/mi-main.c b/gdb/mi/mi-main.c
index a3c78f9f20a1e11939dd8bae547d2efdce3bed86..8b6da41ffeb2e4fe423b952c1e6023e2d23ed9b7 100644 (file)
--- a/gdb/mi/mi-main.c
+++ b/gdb/mi/mi-main.c
@@ -588,7 +588,7 @@ print_one_inferior (struct inferior *inferior, bool recurse,
   if (ids.empty () || (ids.find (inferior->pid) != ids.end ()))
     {
       gdb::unordered_set<int> cores;
-      ui_out_emit_tuple tuple_emitter (uiout, NULL);
+      ui_out_emit_tuple tuple_emitter (uiout);
 
       uiout->field_fmt ("id", "i%d", inferior->num);
       uiout->field_string ("type", "process");
@@ -684,7 +684,7 @@ list_available_thread_groups (const gdb::unordered_set<int> &ids, int recurse)
       if (!ids.empty () && ids.find (pid_i) == ids.end ())
        continue;
 
-      ui_out_emit_tuple tuple_emitter (uiout, NULL);
+      ui_out_emit_tuple tuple_emitter (uiout);
 
       uiout->field_string ("id", *pid);
       uiout->field_string ("type", "process");
@@ -706,7 +706,7 @@ list_available_thread_groups (const gdb::unordered_set<int> &ids, int recurse)
 
              for (const osdata_item &child : children)
                {
-                 ui_out_emit_tuple inner_tuple_emitter (uiout, NULL);
+                 ui_out_emit_tuple inner_tuple_emitter (uiout);
                  const std::string *tid = get_osdata_column (child, "tid");
                  const std::string *tcore = get_osdata_column (child, "core");
 
@@ -1058,7 +1058,7 @@ output_register (const frame_info_ptr &frame, int regnum, int format,
   if (skip_unavailable && !val->entirely_available ())
     return;
 
-  ui_out_emit_tuple tuple_emitter (uiout, NULL);
+  ui_out_emit_tuple tuple_emitter (uiout);
   uiout->field_signed ("number", regnum);
 
   if (format == 'N')
@@ -1311,7 +1311,7 @@ mi_cmd_data_read_memory (const char *command, const char *const *argv,
        int col_byte;
        struct value_print_options print_opts;
 
-       ui_out_emit_tuple tuple_emitter (uiout, NULL);
+       ui_out_emit_tuple tuple_emitter (uiout);
        uiout->field_core_addr ("addr", gdbarch, addr + row_byte);
        /* ui_out_field_core_addr_symbolic (uiout, "saddr", addr +
           row_byte); */
@@ -1410,7 +1410,7 @@ mi_cmd_data_read_memory_bytes (const char *command, const char *const *argv,
   ui_out_emit_list list_emitter (uiout, "memory");
   for (const memory_read_result &read_result : result)
     {
-      ui_out_emit_tuple tuple_emitter (uiout, NULL);
+      ui_out_emit_tuple tuple_emitter (uiout);
 
       uiout->field_core_addr ("begin", gdbarch, read_result.begin);
       uiout->field_core_addr ("offset", gdbarch, read_result.begin - addr);
@@ -2198,7 +2198,7 @@ mi_load_progress (const char *section_name,
        gdb_puts (mi->current_token, mi->raw_stdout);
       gdb_puts ("+download", mi->raw_stdout);
       {
-       ui_out_emit_tuple tuple_emitter (uiout.get (), NULL);
+       ui_out_emit_tuple tuple_emitter (uiout.get ());
        uiout->field_string ("section", section_name);
        uiout->field_signed ("section-size", total_section);
        uiout->field_signed ("total-size", grand_total);
@@ -2216,7 +2216,7 @@ mi_load_progress (const char *section_name,
        gdb_puts (mi->current_token, mi->raw_stdout);
       gdb_puts ("+download", mi->raw_stdout);
       {
-       ui_out_emit_tuple tuple_emitter (uiout.get (), NULL);
+       ui_out_emit_tuple tuple_emitter (uiout.get ());
        uiout->field_string ("section", section_name);
        uiout->field_signed ("section-sent", sent_so_far);
        uiout->field_signed ("section-size", total_section);
@@ -2647,7 +2647,7 @@ mi_cmd_trace_frame_collected (const char *command, const char *const *argv,
 
        tsv = find_trace_state_variable_by_number (tvar);
 
-       ui_out_emit_tuple tuple_emitter (uiout, NULL);
+       ui_out_emit_tuple tuple_emitter (uiout);
 
        if (tsv != NULL)
          {
@@ -2677,7 +2677,7 @@ mi_cmd_trace_frame_collected (const char *command, const char *const *argv,
       {
        gdbarch *gdbarch = current_inferior ()->arch ();
 
-       ui_out_emit_tuple tuple_emitter (uiout, NULL);
+       ui_out_emit_tuple tuple_emitter (uiout);
 
        uiout->field_core_addr ("address", gdbarch, r.start);
        uiout->field_signed ("length", r.length);

diff --git a/gdb/mi/mi-symbol-cmds.c b/gdb/mi/mi-symbol-cmds.c
index 67f570761da54e69eff2f3e3bb9873c84ea22d2c..58f2feef5533a59cd5aaa4e7aebe80e9cd090aa8 100644 (file)
--- a/gdb/mi/mi-symbol-cmds.c
+++ b/gdb/mi/mi-symbol-cmds.c
@@ -57,7 +57,7 @@ mi_cmd_symbol_list_lines (const char *command, const char *const *argv,
   if (s->linetable () != NULL && s->linetable ()->nitems > 0)
     for (i = 0; i < s->linetable ()->nitems; i++)
       {
-       ui_out_emit_tuple tuple_emitter (uiout, NULL);
+       ui_out_emit_tuple tuple_emitter (uiout);
        uiout->field_core_addr ("pc", gdbarch,
                                s->linetable ()->item[i].pc (objfile));
        uiout->field_signed ("line", s->linetable ()->item[i].line);
@@ -74,7 +74,7 @@ static void
 output_debug_symbol (ui_out *uiout, domain_search_flags kind,
                     struct symbol *sym, int block)
 {
-  ui_out_emit_tuple tuple_emitter (uiout, NULL);
+  ui_out_emit_tuple tuple_emitter (uiout);
 
   if (sym->line () != 0)
     uiout->field_unsigned ("line", sym->line ());
@@ -98,7 +98,7 @@ static void
 output_nondebug_symbol (ui_out *uiout, const bound_minimal_symbol &msymbol)
 {
   struct gdbarch *gdbarch = msymbol.objfile->arch ();
-  ui_out_emit_tuple tuple_emitter (uiout, NULL);
+  ui_out_emit_tuple tuple_emitter (uiout);
 
   uiout->field_core_addr ("address", gdbarch,
                          msymbol.value_address ());
@@ -134,7 +134,7 @@ mi_symbol_info (domain_search_flags kind, const char *name_regexp,
       while (i < symbols.size () && symbols[i].msymbol.minsym == nullptr)
        {
          symtab *symtab = symbols[i].symbol->symtab ();
-         ui_out_emit_tuple symtab_tuple_emitter (uiout, nullptr);
+         ui_out_emit_tuple symtab_tuple_emitter (uiout);
 
          uiout->field_string ("filename",
                               symtab_to_filename_for_display (symtab));
@@ -261,7 +261,7 @@ output_module_symbols_in_single_module_and_file
   symtab *first_symbtab = first_result_symbol->symtab ();
 
   /* Formatted output.  */
-  ui_out_emit_tuple current_file (uiout, nullptr);
+  ui_out_emit_tuple current_file (uiout);
   uiout->field_string ("filename",
                       symtab_to_filename_for_display (first_symbtab));
   uiout->field_string ("fullname", symtab_to_fullname (first_symbtab));
@@ -295,7 +295,7 @@ output_module_symbols_in_single_module
   const symbol *first_module_symbol = iter->first.symbol;
 
   /* Create output formatting.  */
-  ui_out_emit_tuple module_tuple (uiout, nullptr);
+  ui_out_emit_tuple module_tuple (uiout);
   uiout->field_string ("module", first_module_symbol->print_name ());
   ui_out_emit_list files_list (uiout, "files");
 

diff --git a/gdb/progspace.c b/gdb/progspace.c
index 1407b058dfdf2b828d98c98c1a6b693c7e60d887..988bb2370301d5bbc8ce1e1ad90e48a37bbb4190 100644 (file)
--- a/gdb/progspace.c
+++ b/gdb/progspace.c
@@ -363,7 +363,7 @@ print_program_space (struct ui_out *uiout, int requested)
       if (requested != -1 && requested != pspace->num)
        continue;
 
-      ui_out_emit_tuple tuple_emitter (uiout, NULL);
+      ui_out_emit_tuple tuple_emitter (uiout);
 
       if (pspace == current_program_space)
        uiout->field_string ("current", "*");

diff --git a/gdb/regcache.c b/gdb/regcache.c
index e94a94c48eb1c0b1debbd42bb5a5a909fdb2b6dd..773e8ac37d0a9d5b378f93be2294d6df029867e4 100644 (file)
--- a/gdb/regcache.c
+++ b/gdb/regcache.c
@@ -1542,7 +1542,7 @@ register_dump::dump (ui_out *out, const char *name)
 
   for (regnum = 0; regnum < descr->nr_cooked_registers; regnum++)
     {
-      ui_out_emit_tuple tuple_emitter (out, nullptr);
+      ui_out_emit_tuple tuple_emitter (out);
 
       /* Name.  */
       const char *p = gdbarch_register_name (m_gdbarch, regnum);

diff --git a/gdb/reggroups.c b/gdb/reggroups.c
index 9619aac2b8c6625eedf807293fb86494c3344665..b0d3fd82185e05ac259b3f94107ed2bf63995c30 100644 (file)
--- a/gdb/reggroups.c
+++ b/gdb/reggroups.c
@@ -188,7 +188,7 @@ reggroups_dump (gdbarch *gdbarch, ui_out *out)
 
   for (const struct reggroup *group : gdbarch_reggroups (gdbarch))
     {
-      ui_out_emit_tuple tuple_emitter (out, nullptr);
+      ui_out_emit_tuple tuple_emitter (out);
 
       /* Group name.  */
       out->field_string ("group", group->name ());

diff --git a/gdb/stack.c b/gdb/stack.c
index f41f818cebb0b71e00db3e6061bfc4bb3d0603b9..954ef6b11a4b55fc32daecaf842cfe0a7374e14b 100644 (file)
--- a/gdb/stack.c
+++ b/gdb/stack.c
@@ -424,7 +424,7 @@ print_frame_arg (const frame_print_options &fp_opts,
                  && arg->entry_kind == print_entry_values_compact));
 
   annotate_arg_emitter arg_emitter;
-  ui_out_emit_tuple tuple_emitter (uiout, NULL);
+  ui_out_emit_tuple tuple_emitter (uiout);
   gdb_puts (arg->sym->print_name (), &stb);
   if (arg->entry_kind == print_entry_values_compact)
     {

diff --git a/gdb/symmisc.c b/gdb/symmisc.c
index 6d90765fe50b6e9b5011ee3b52c84567e9f0e913..9e9c6e4c4e52e77b695d628f57e8940331c6283b 100644 (file)
--- a/gdb/symmisc.c
+++ b/gdb/symmisc.c
@@ -1018,7 +1018,7 @@ maintenance_print_one_line_table (struct symtab *symtab, void *data)
          const linetable_entry *item;
 
          item = &linetable->item [i];
-         ui_out_emit_tuple tuple_emitter (uiout, nullptr);
+         ui_out_emit_tuple tuple_emitter (uiout);
          uiout->field_signed ("index", i);
          if (item->line > 0)
            uiout->field_signed ("line", item->line,

diff --git a/gdb/symtab.c b/gdb/symtab.c
index 5d5076f2e775dbcfaa56fb5017f1468a4c957a2a..4c27f3951fd1c2ccf3524ad2db5c923e3598827e 100644 (file)
--- a/gdb/symtab.c
+++ b/gdb/symtab.c
@@ -4385,7 +4385,7 @@ output_source_filename_data::output (const char *disp_name,
   if (!m_filter.matches (fullname))
     return;
 
-  ui_out_emit_tuple ui_emitter (m_uiout, nullptr);
+  ui_out_emit_tuple ui_emitter (m_uiout);
 
   /* Print it and reset *FIRST.  */
   if (!m_first)

diff --git a/gdb/target-connection.c b/gdb/target-connection.c
index 953d4e678724e1e981a5d01f818e7da1e4dca08c..ec074268c0a372410a8189e6b65a430a06a5d06f 100644 (file)
--- a/gdb/target-connection.c
+++ b/gdb/target-connection.c
@@ -124,7 +124,7 @@ print_connection (struct ui_out *uiout, const char *requested_connections)
       if (!number_is_in_list (requested_connections, t->connection_number))
        continue;
 
-      ui_out_emit_tuple tuple_emitter (uiout, NULL);
+      ui_out_emit_tuple tuple_emitter (uiout);
 
       if (current_inferior ()->process_target () == t)
        uiout->field_string ("current", "*");

diff --git a/gdb/thread.c b/gdb/thread.c
index 7815d76b5e24806e3c8f5afdfa544e6b5a836f6b..9571c8662760857bf331c489a4c081f43263a7f4 100644 (file)
--- a/gdb/thread.c
+++ b/gdb/thread.c
@@ -1186,7 +1186,7 @@ do_print_thread (ui_out *uiout, const char *requested_threads,
                            global_ids, pid, tp))
     return;
 
-  ui_out_emit_tuple tuple_emitter (uiout, NULL);
+  ui_out_emit_tuple tuple_emitter (uiout);
 
   if (!uiout->is_mi_like_p ())
     {

diff --git a/gdb/tui/tui-win.c b/gdb/tui/tui-win.c
index c5cca2fdd00364f14aff695449d216d5af3e7344..7b174b13913aad3f850d350e03f0aec2b42e4574 100644 (file)
--- a/gdb/tui/tui-win.c
+++ b/gdb/tui/tui-win.c
@@ -769,7 +769,7 @@ tui_all_windows_info (const char *arg, int from_tty)
   for (tui_win_info *win_info : all_tui_windows ())
     if (win_info->is_visible ())
       {
-       ui_out_emit_tuple tuple_emitter (uiout, nullptr);
+       ui_out_emit_tuple tuple_emitter (uiout);
 
        uiout->field_string ("name", win_info->name ());
        uiout->field_signed ("lines", win_info->height);

diff --git a/gdb/ui-out.h b/gdb/ui-out.h
index d59e58631e9bf2eb2af513e0281f83119d6aa81b..0c82e82bf6e9743b196a97f00dc3a6a27ea03dd8 100644 (file)
--- a/gdb/ui-out.h
+++ b/gdb/ui-out.h
@@ -421,7 +421,7 @@ class ui_out_emit_type
 {
 public:
 
-  ui_out_emit_type (struct ui_out *uiout, const char *id)
+  ui_out_emit_type (struct ui_out *uiout, const char *id = nullptr)
     : m_uiout (uiout)
   {
     uiout->begin (Type, id);

diff --git a/gdb/user-regs.c b/gdb/user-regs.c
index 527ebcd1f13a03f0469e9bc09ecdb2bf3d5ea83e..f1c6c9a1b248e3e48e0437eefceb038223b75054 100644 (file)
--- a/gdb/user-regs.c
+++ b/gdb/user-regs.c
@@ -223,7 +223,7 @@ maintenance_print_user_registers (const char *args, int from_tty)
 
   for (reg = regs->first; reg != NULL; reg = reg->next, ++regnum)
     {
-      ui_out_emit_tuple tuple_emitter (current_uiout, nullptr);
+      ui_out_emit_tuple tuple_emitter (current_uiout);
       current_uiout->field_string ("name", reg->name);
       current_uiout->field_signed ("regnum", regnum);
       current_uiout->text ("\n");