install_variable cannot fail

I noticed that install_variable will never return false, so this patch
changes the return type to void.  I couldn't find a spot in history
where it did return false, maybe it's always been like this.

gdb/ChangeLog
2020-12-11  Tom Tromey  <tom@tromey.com>

	* varobj.c (varobj_create): Update.
	(install_variable): Return void.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 90bfac77470a3faa393df2e5e5e40fa641167605..a3d977dc604506f5cc1b4ffefef5d108e0fcf2e1 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2020-12-11  Tom Tromey  <tom@tromey.com>
+
+       * varobj.c (varobj_create): Update.
+       (install_variable): Return void.
+
 2020-12-11  Tom Tromey  <tom@tromey.com>
 
        * varobj.c (instantiate_pretty_printer): Use gdbpy_ref.

diff --git a/gdb/varobj.c b/gdb/varobj.c
index ba0e1357d3f816d86a5cf8764ce2f07eec0f5cf2..19a90c7119613f158f697c49fd8f23eac3ecc1ff 100644 (file)
--- a/gdb/varobj.c
+++ b/gdb/varobj.c
@@ -142,7 +142,7 @@ static int delete_variable (struct varobj *, bool);
 
 static void delete_variable_1 (int *, struct varobj *, bool, bool);
 
-static bool install_variable (struct varobj *);
+static void install_variable (struct varobj *);
 
 static void uninstall_variable (struct varobj *);
 
@@ -390,11 +390,7 @@ varobj_create (const char *objname,
   if ((var != NULL) && (objname != NULL))
     {
       var->obj_name = objname;
-
-      /* If a varobj name is duplicated, the install will fail so
-        we must cleanup.  */
-      if (!install_variable (var.get ()))
-       return NULL;
+      install_variable (var.get ());
     }
 
   return var.release ();
@@ -1733,7 +1729,7 @@ delete_variable_1 (int *delcountp, struct varobj *var, bool only_children_p,
 }
 
 /* Install the given variable VAR with the object name VAR->OBJ_NAME.  */
-static bool
+static void
 install_variable (struct varobj *var)
 {
   hashval_t hash = htab_hash_string (var->obj_name.c_str ());
@@ -1749,8 +1745,6 @@ install_variable (struct varobj *var)
   /* If root, add varobj to root list.  */
   if (is_root_p (var))
     rootlist.push_front (var->root);
-
-  return true;                 /* OK */
 }
 
 /* Uninstall the object VAR.  */