From: Michihiro NAKAJIMA Date: Sun, 1 Jan 2012 22:03:31 +0000 (-0500) Subject: Rename archive_read_disk_set_time_filter_callback to archive_read_disk_set_metadata_f... X-Git-Tag: v3.0.4~2^2~230 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fcc5dcbece9d71bde51785bc66764f69fe23b40a;p=thirdparty%2Flibarchive.git Rename archive_read_disk_set_time_filter_callback to archive_read_disk_set_metadata_filter_callback. SVN-Revision: 4069 --- diff --git a/libarchive/archive.h b/libarchive/archive.h index d5141a1b7..c29d6396f 100644 --- a/libarchive/archive.h +++ b/libarchive/archive.h @@ -769,8 +769,8 @@ __LA_DECL int archive_read_disk_honor_nodump(struct archive *); __LA_DECL int archive_read_disk_set_name_filter_callback(struct archive *, int (*_name_filter_func)(struct archive *, void *, struct archive_entry *), void *_client_data); -__LA_DECL int archive_read_disk_set_time_filter_callback(struct archive *, - int (*_time_filter_func)(struct archive *, void *, +__LA_DECL int archive_read_disk_set_metadata_filter_callback(struct archive *, + int (*_metadata_filter_func)(struct archive *, void *, struct archive_entry *), void *_client_data); /* diff --git a/libarchive/archive_read_disk_posix.c b/libarchive/archive_read_disk_posix.c index 4e504cefc..e0d78e0bb 100644 --- a/libarchive/archive_read_disk_posix.c +++ b/libarchive/archive_read_disk_posix.c @@ -941,8 +941,9 @@ next_entry: if (name != NULL) archive_entry_copy_gname(entry, name); /* Invoke a filter callback. */ - if (a->time_filter_func) { - if (!a->time_filter_func(_a, a->time_filter_data, entry)) { + if (a->metadata_filter_func) { + if (!a->metadata_filter_func(_a, + a->metadata_filter_data, entry)) { archive_entry_clear(entry); goto next_entry; } @@ -1102,17 +1103,17 @@ archive_read_disk_set_name_filter_callback(struct archive *_a, } int -archive_read_disk_set_time_filter_callback(struct archive *_a, - int (*_time_filter_func)(struct archive *, void *, struct archive_entry *), - void *_client_data) +archive_read_disk_set_metadata_filter_callback(struct archive *_a, + int (*_metadata_filter_func)(struct archive *, void *, + struct archive_entry *), void *_client_data) { struct archive_read_disk *a = (struct archive_read_disk *)_a; archive_check_magic(_a, ARCHIVE_READ_DISK_MAGIC, ARCHIVE_STATE_ANY, - "archive_read_disk_set_time_filter_callback"); + "archive_read_disk_set_metadata_filter_callback"); - a->time_filter_func = _time_filter_func; - a->time_filter_data = _client_data; + a->metadata_filter_func = _metadata_filter_func; + a->metadata_filter_data = _client_data; return (ARCHIVE_OK); } diff --git a/libarchive/archive_read_disk_private.h b/libarchive/archive_read_disk_private.h index 0637e861d..293298c37 100644 --- a/libarchive/archive_read_disk_private.h +++ b/libarchive/archive_read_disk_private.h @@ -73,9 +73,9 @@ struct archive_read_disk { int (*name_filter_func)(struct archive *, void *, struct archive_entry *); void *name_filter_data; - int (*time_filter_func)(struct archive *, void *, + int (*metadata_filter_func)(struct archive *, void *, struct archive_entry *); - void *time_filter_data; + void *metadata_filter_data; }; diff --git a/libarchive/archive_read_disk_windows.c b/libarchive/archive_read_disk_windows.c index fa25c9cc5..94d88af70 100644 --- a/libarchive/archive_read_disk_windows.c +++ b/libarchive/archive_read_disk_windows.c @@ -789,8 +789,9 @@ next_entry: if (name != NULL) archive_entry_copy_gname(entry, name); /* Invoke a filter callback. */ - if (a->time_filter_func) { - if (!a->time_filter_func(_a, a->time_filter_data, entry)) { + if (a->metadata_filter_func) { + if (!a->metadata_filter_func(_a, + a->metadata_filter_data, entry)) { archive_entry_clear(entry); goto next_entry; } @@ -908,17 +909,17 @@ archive_read_disk_set_name_filter_callback(struct archive *_a, } int -archive_read_disk_set_time_filter_callback(struct archive *_a, - int (*_time_filter_func)(struct archive *, void *, struct archive_entry *), - void *_client_data) +archive_read_disk_set_metadata_filter_callback(struct archive *_a, + int (*_metadata_filter_func)(struct archive *, void *, + struct archive_entry *), void *_client_data) { struct archive_read_disk *a = (struct archive_read_disk *)_a; archive_check_magic(_a, ARCHIVE_READ_DISK_MAGIC, ARCHIVE_STATE_ANY, - "archive_read_disk_set_time_filter_callback"); + "archive_read_disk_set_metadata_filter_callback"); - a->time_filter_func = _time_filter_func; - a->time_filter_data = _client_data; + a->metadata_filter_func = _metadata_filter_func; + a->metadata_filter_data = _client_data; return (ARCHIVE_OK); } diff --git a/libarchive/test/test_read_disk_directory_traversals.c b/libarchive/test/test_read_disk_directory_traversals.c index 569d4745f..a116b4a50 100644 --- a/libarchive/test/test_read_disk_directory_traversals.c +++ b/libarchive/test/test_read_disk_directory_traversals.c @@ -1098,7 +1098,7 @@ name_filter(struct archive *a, void *data, struct archive_entry *ae) } static int -time_filter(struct archive *a, void *data, struct archive_entry *ae) +metadata_filter(struct archive *a, void *data, struct archive_entry *ae) { failure("CTime should be set"); assertEqualInt(8, archive_entry_ctime_is_set(ae)); @@ -1110,9 +1110,10 @@ time_filter(struct archive *a, void *data, struct archive_entry *ae) if (archive_read_disk_can_descend(a)) { /* Descend into the current object */ failure("archive_read_disk_can_descend should work" - "in time filter"); + " in metadata filter"); assertEqualIntA(a, 1, archive_read_disk_can_descend(a)); - failure("archive_read_disk_descend should work in time filter"); + failure("archive_read_disk_descend should work" + " in metadata filter"); assertEqualIntA(a, ARCHIVE_OK, archive_read_disk_descend(a)); } return (1); @@ -1185,7 +1186,7 @@ test_callbacks(void) assertEqualInt(ARCHIVE_OK, archive_read_close(a)); /* - * Test2: Traversals with a time filter. + * Test2: Traversals with a metadata filter. */ assertUtimes("cb/f1", 886600, 0, 886600, 0); assertUtimes("cb/f2", 886611, 0, 886611, 0); @@ -1195,7 +1196,8 @@ test_callbacks(void) assertEqualIntA(a, ARCHIVE_OK, archive_read_disk_set_name_filter_callback(a, NULL, NULL)); assertEqualIntA(a, ARCHIVE_OK, - archive_read_disk_set_time_filter_callback(a, time_filter, NULL)); + archive_read_disk_set_metadata_filter_callback(a, metadata_filter, + NULL)); failure("Directory traversals should work as well"); assertEqualIntA(a, ARCHIVE_OK, archive_read_disk_open(a, "cb"));