diff options
author | Jim Meyering <jim@meyering.net> | 2007-08-23 10:47:16 +0200 |
---|---|---|
committer | Jim Meyering <jim@meyering.net> | 2007-08-23 13:59:40 +0200 |
commit | 22ed81c410c197003782ba379cb3148306b0cd8a (patch) | |
tree | 3faddb492038c4eed405090a032c7312d072aa7e /gl/lib/hash-triple.h | |
parent | 173524ed7d0bb5f458251b796f23a2dfc49a4b24 (diff) | |
download | coreutils-22ed81c410c197003782ba379cb3148306b0cd8a.tar.xz |
Move functions from copy.c into new modules, since ln needs them, too.
* bootstrap.conf (gnulib_modules): Add file-set.
* gl/lib/file-set.c (record_file, seen_file): Functions from copy.c.
* gl/lib/file-set.h: Add prototypes.
* gl/lib/hash-triple.c (triple_hash, triple_hash_no_name):
(triple_compare, triple_free): Functions from copy.c.
* gl/lib/hash-triple.h (struct F_triple): Define. From copy.c.
Add prototypes.
* gl/modules/file-set: New module.
* gl/modules/hash-triple: New module.
* src/Makefile.am (copy_sources): New variable.
(ginstall_SOURCES, cp_SOURCES, mv_SOURCES): Use it.
* src/copy.c: Include hash-triple.h.
No longer include hash-pjw.h.
(copy_internal): Don't pass a NULL third argument to record_file,
since that function no longer accepts that.
(record_file): Move this function to file-set.c.
Along the way, remove the code to allow a NULL stat-buffer pointer.
Adjust sole caller.
(seen_file): Move this function to file-set.c.
(struct F_triple): Move declaration to hash-triple.h.
(triple_compare, triple_free, triple_hash, triple_hash_no_name):
Move these functions to hash-triple.c.
Signed-off-by: Jim Meyering <jim@meyering.net>
Diffstat (limited to 'gl/lib/hash-triple.h')
-rw-r--r-- | gl/lib/hash-triple.h | 21 |
1 files changed, 21 insertions, 0 deletions
diff --git a/gl/lib/hash-triple.h b/gl/lib/hash-triple.h new file mode 100644 index 000000000..7abe97044 --- /dev/null +++ b/gl/lib/hash-triple.h @@ -0,0 +1,21 @@ +#ifndef HASH_TRIPLE_H +#define HASH_TRIPLE_H + +#include <sys/types.h> +#include <sys/stat.h> +#include <stdbool.h> + +/* Describe a just-created or just-renamed destination file. */ +struct F_triple +{ + char *name; + ino_t st_ino; + dev_t st_dev; +}; + +extern size_t triple_hash (void const *x, size_t table_size); +extern size_t triple_hash_no_name (void const *x, size_t table_size); +extern bool triple_compare (void const *x, void const *y); +extern void triple_free (void *x); + +#endif |