static void
sparse_swap (sparse_map *sv, size_t* v, size_t i, size_t j)
{
- struct sparse_ent_ *v1 = hash_delete (sv, &(struct sparse_ent_) {i,0});
- struct sparse_ent_ *v2 = hash_delete (sv, &(struct sparse_ent_) {j,0});
+ struct sparse_ent_ *v1 = hash_remove (sv, &(struct sparse_ent_) {i,0});
+ struct sparse_ent_ *v2 = hash_remove (sv, &(struct sparse_ent_) {j,0});
/* FIXME: reduce the frequency of these mallocs. */
if (!v1)
-Subproject commit 0b93877fc4bdcd84b78805e5917e4ab94684b9bc
+Subproject commit 2d386f229aba9ecda85736b931e2964d7922d90e
probe.st_dev = dev;
probe.name = NULL;
- ent = hash_delete (src_to_dest, &probe);
+ ent = hash_remove (src_to_dest, &probe);
if (ent)
src_to_dest_free (ent);
}
Use its dev/ino numbers to remove the corresponding
entry from the active_dir_set hash table. */
struct dev_ino di = dev_ino_pop ();
- struct dev_ino *found = hash_delete (active_dir_set, &di);
+ struct dev_ino *found = hash_remove (active_dir_set, &di);
/* ASSERT_MATCHING_DEV_INO (thispend->realname, di); */
assert (found);
dev_ino_free (found);
struct tempnode test;
test.pid = pid;
- struct tempnode *node = hash_delete (proctab, &test);
+ struct tempnode *node = hash_remove (proctab, &test);
if (! node)
return false;
node->state = REAPED;
if (0 <= fspec->wd)
{
inotify_rm_watch (wd, fspec->wd);
- hash_delete (wd_to_name, fspec);
+ hash_remove (wd_to_name, fspec);
}
fspec->wd = new_wd;
/* If the file was moved then inotify will use the source file wd
for the destination file. Make sure the key is not present in
the table. */
- struct File_spec *prev = hash_delete (wd_to_name, fspec);
+ struct File_spec *prev = hash_remove (wd_to_name, fspec);
if (prev && prev != fspec)
{
if (follow_mode == Follow_name)
if (ev->mask & IN_DELETE_SELF)
{
inotify_rm_watch (wd, fspec->wd);
- hash_delete (wd_to_name, fspec);
+ hash_remove (wd_to_name, fspec);
}
/* Note we get IN_ATTRIB for unlink() as st_nlink decrements.