diff options
| author | Brad King <brad.king@kitware.com> | 2014-04-15 20:34:50 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2014-04-15 20:34:50 (GMT) |
| commit | 4533560c23adf29a03d57b5c5678048795ed6134 (patch) | |
| tree | ae53680c085c37e68c2fc101306acdd40fecb780 /Utilities/cmlibarchive/libarchive/archive_read_private.h | |
| parent | 44d6b82f4351dc3941fd9794ad8f3909148c0314 (diff) | |
| parent | 37f225b72c8e4c440025a98f68eda9914f7ba5f7 (diff) | |
| download | CMake-4533560c23adf29a03d57b5c5678048795ed6134.zip CMake-4533560c23adf29a03d57b5c5678048795ed6134.tar.gz CMake-4533560c23adf29a03d57b5c5678048795ed6134.tar.bz2 | |
Merge branch 'libarchive-upstream' into update-libarchive
Resolve conflicts in Utilities/cmlibarchive/CMakeLists.txt as
appropriate.
Diffstat (limited to 'Utilities/cmlibarchive/libarchive/archive_read_private.h')
| -rw-r--r-- | Utilities/cmlibarchive/libarchive/archive_read_private.h | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/Utilities/cmlibarchive/libarchive/archive_read_private.h b/Utilities/cmlibarchive/libarchive/archive_read_private.h index 6636a59..27e203b 100644 --- a/Utilities/cmlibarchive/libarchive/archive_read_private.h +++ b/Utilities/cmlibarchive/libarchive/archive_read_private.h @@ -142,6 +142,14 @@ struct archive_read_client { struct archive_read_data_node *dataset; }; +struct archive_read_extract { + struct archive *ad; /* archive_write_disk object */ + + /* Progress function invoked during extract. */ + void (*extract_progress)(void *); + void *extract_progress_user_data; +}; + struct archive_read { struct archive archive; @@ -215,7 +223,7 @@ struct archive_read { /* * Various information needed by archive_extract. */ - struct extract *extract; + struct archive_read_extract *extract; int (*cleanup_archive_extract)(struct archive_read *); }; @@ -245,4 +253,5 @@ int64_t __archive_read_filter_consume(struct archive_read_filter *, int64_t); int __archive_read_program(struct archive_read_filter *, const char *); void __archive_read_free_filters(struct archive_read *); int __archive_read_close_filters(struct archive_read *); +struct archive_read_extract *__archive_read_get_extract(struct archive_read *); #endif |