Simplify shash_find() followed by shash_add() into shash_add_once().

This is just a cleanup.

diff --git a/lib/fatal-signal.c b/lib/fatal-signal.c
index 2e38fc51aca1fc8b0e2c5d71f3fc8deff36a6abc..0f3603689541150495683fe34a2b096aec456bf8 100644 (file)
--- a/lib/fatal-signal.c
+++ b/lib/fatal-signal.c
@@ -215,9 +215,7 @@ fatal_signal_add_file_to_unlink(const char *file)
         fatal_signal_add_hook(unlink_files, cancel_files, NULL, true);
     }
 
-    if (!shash_find(&files, file)) {
-        shash_add(&files, file, NULL);
-    }
+    shash_add_once(&files, file, NULL);
 }
 
 /* Unregisters 'file' from being unlinked when the program terminates via

diff --git a/lib/netdev.c b/lib/netdev.c
index dc27fd749e2324a0786b6b20128ba9bfda7cc65d..38f4dd58561ad5a2abd9e78d8c22294eccbc4ad1 100644 (file)
--- a/lib/netdev.c
+++ b/lib/netdev.c
@@ -1483,9 +1483,7 @@ netdev_monitor_cb(struct netdev_notifier *notifier)
 {
     struct netdev_monitor *monitor = notifier->aux;
     const char *name = netdev_get_name(notifier->netdev);
-    if (!shash_find(&monitor->changed_netdevs, name)) {
-        shash_add(&monitor->changed_netdevs, name, NULL);
-    }
+    shash_add_once(&monitor->changed_netdevs, name, NULL);
 }
 
 /* Attempts to add 'netdev' as a netdev monitored by 'monitor'.  Returns 0 if

diff --git a/lib/ovsdb-idl.c b/lib/ovsdb-idl.c
index 62a33609ec599c2c44b627b54affedf23c55e53b..2537db7e7e49e5b3b34fade3a4a74e038502c03a 100644 (file)
--- a/lib/ovsdb-idl.c
+++ b/lib/ovsdb-idl.c
@@ -157,15 +157,13 @@ ovsdb_idl_create(const char *remote, const struct ovsdb_idl_class *class)
         struct ovsdb_idl_table *table = &idl->tables[i];
         size_t j;
 
-        assert(!shash_find(&idl->table_by_name, tc->name));
-        shash_add(&idl->table_by_name, tc->name, table);
+        shash_add_assert(&idl->table_by_name, tc->name, table);
         table->class = tc;
         shash_init(&table->columns);
         for (j = 0; j < tc->n_columns; j++) {
             const struct ovsdb_idl_column *column = &tc->columns[j];
 
-            assert(!shash_find(&table->columns, column->name));
-            shash_add(&table->columns, column->name, column);
+            shash_add_assert(&table->columns, column->name, column);
         }
         hmap_init(&table->rows);
         table->idl = idl;

diff --git a/vswitchd/bridge.c b/vswitchd/bridge.c
index d4a08b92fd36a1c8513ec2f6902a40d7c4840cd0..b7f068bf0cd181407bc7cf74b8cca5b52c774bab 100644 (file)
--- a/vswitchd/bridge.c
+++ b/vswitchd/bridge.c
@@ -645,9 +645,7 @@ bridge_reconfigure(const struct ovsrec_open_vswitch *ovs_cfg)
         shash_init(&cur_ifaces);
         for (i = 0; i < n_dpif_ports; i++) {
             const char *name = dpif_ports[i].devname;
-            if (!shash_find(&cur_ifaces, name)) {
-                shash_add(&cur_ifaces, name, NULL);
-            }
+            shash_add_once(&cur_ifaces, name, NULL);
         }
         free(dpif_ports);