mirrors/coreutils
0
0
Fork 0
mirror of https://github.com/coreutils/coreutils.git synced 2024-11-27 12:04:25 +08:00
Code Issues Packages Projects Releases Wiki Activity

build: update gnulib submodule to latest

Browse Source 
* gl/lib/randperm.c, src/cp-hash.c, src/ls.c, src/sort.c, src/tail.c:
Change all instaces of hash_delete to hash_remove to accommodate
change to Gnulib API.
This commit is contained in:
Paul Eggert 2020-10-19 10:47:32 -07:00
parent d9b33b1535
commit 00ea4bacf6
6 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gl/lib/randperm.c
View File

@ -119,8 +119,8 @@ sparse_new (size_t size_hint)
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)

2
gnulib

@ -1 +1 @@
Subproject commit 0b93877fc4bdcd84b78805e5917e4ab94684b9bc
Subproject commit 2d386f229aba9ecda85736b931e2964d7922d90e

2
src/cp-hash.c
View File

@ -88,7 +88,7 @@ forget_created (ino_t ino, dev_t dev)
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);
}

2
src/ls.c
View File

@ -1766,7 +1766,7 @@ main (int argc, char **argv)
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);

2
src/sort.c
View File

@ -757,7 +757,7 @@ delete_proc (pid_t pid)
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;

6
src/tail.c
View File

@ -1771,7 +1771,7 @@ tail_forever_inotify (int wd, struct File_spec *f, size_t n_files,
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;
@ -1782,7 +1782,7 @@ tail_forever_inotify (int wd, struct File_spec *f, size_t n_files,
/* 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)
@ -1817,7 +1817,7 @@ tail_forever_inotify (int wd, struct File_spec *f, size_t n_files,
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.