diff options
| author | Tim Kientzle <kientzle@FreeBSD.org> | 2004-06-27 18:38:13 +0000 |
|---|---|---|
| committer | Tim Kientzle <kientzle@FreeBSD.org> | 2004-06-27 18:38:13 +0000 |
| commit | 527b6597a0cff9a74c6f0bd9b28404577f058aef (patch) | |
| tree | 028a85142b5dcf820d4a79533ebb325b81e54117 /lib/libarchive/archive_entry.h | |
| parent | e2fe7499b66699cdb86a147e1f8aa11554171b92 (diff) | |
| download | src-527b6597a0cff9a74c6f0bd9b28404577f058aef.tar.gz src-527b6597a0cff9a74c6f0bd9b28404577f058aef.zip | |
Clean up some consistent confusion between "dev" and "rdev."
Mostly, these were being used correctly even though a lot of
variables and function names were mis-named.
In the process, I found and fixed a couple of latent bugs and
added a guard against adding an archive to itself.
Notes
Notes:
svn path=/head/; revision=131205
Diffstat (limited to 'lib/libarchive/archive_entry.h')
| -rw-r--r-- | lib/libarchive/archive_entry.h | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/lib/libarchive/archive_entry.h b/lib/libarchive/archive_entry.h index 79054fbbc0db..b725a3b9fd1c 100644 --- a/lib/libarchive/archive_entry.h +++ b/lib/libarchive/archive_entry.h @@ -66,18 +66,21 @@ struct archive_entry *archive_entry_new(void); * Retrieve fields from an archive_entry. */ -dev_t archive_entry_devmajor(struct archive_entry *); -dev_t archive_entry_devminor(struct archive_entry *); +dev_t archive_entry_dev(struct archive_entry *); const char *archive_entry_fflags_text(struct archive_entry *); void archive_entry_fflags(struct archive_entry *, unsigned long *set, unsigned long *clear); const char *archive_entry_gname(struct archive_entry *); const char *archive_entry_hardlink(struct archive_entry *); +ino_t archive_entry_ino(struct archive_entry *); mode_t archive_entry_mode(struct archive_entry *); time_t archive_entry_mtime(struct archive_entry *); long archive_entry_mtime_nsec(struct archive_entry *); const char *archive_entry_pathname(struct archive_entry *); const wchar_t *archive_entry_pathname_w(struct archive_entry *); +dev_t archive_entry_rdev(struct archive_entry *); +dev_t archive_entry_rdevmajor(struct archive_entry *); +dev_t archive_entry_rdevminor(struct archive_entry *); int64_t archive_entry_size(struct archive_entry *); const struct stat *archive_entry_stat(struct archive_entry *); const char *archive_entry_symlink(struct archive_entry *); @@ -91,8 +94,6 @@ const char *archive_entry_uname(struct archive_entry *); */ void archive_entry_copy_stat(struct archive_entry *, const struct stat *); -void archive_entry_set_devmajor(struct archive_entry *, dev_t); -void archive_entry_set_devminor(struct archive_entry *, dev_t); void archive_entry_set_fflags(struct archive_entry *, unsigned long set, unsigned long clear); /* Returns pointer to start of first invalid token, or NULL if none. */ @@ -109,6 +110,8 @@ void archive_entry_set_link(struct archive_entry *, const char *); void archive_entry_set_mode(struct archive_entry *, mode_t); void archive_entry_set_pathname(struct archive_entry *, const char *); void archive_entry_copy_pathname_w(struct archive_entry *, const wchar_t *); +void archive_entry_set_rdevmajor(struct archive_entry *, dev_t); +void archive_entry_set_rdevminor(struct archive_entry *, dev_t); void archive_entry_set_size(struct archive_entry *, int64_t); void archive_entry_set_symlink(struct archive_entry *, const char *); void archive_entry_copy_symlink_w(struct archive_entry *, const wchar_t *); |