| archive_virtual.c (228763) | archive_virtual.c (228773) |
|---|---|
| 1/*- 2 * Copyright (c) 2003-2007 Tim Kientzle 3 * All rights reserved. 4 * 5 * Redistribution and use in source and binary forms, with or without 6 * modification, are permitted provided that the following conditions 7 * are met: 8 * 1. Redistributions of source code must retain the above copyright --- 10 unchanged lines hidden (view full) --- 19 * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, 20 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY 21 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 22 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF 23 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 24 */ 25 26#include "archive_platform.h" | 1/*- 2 * Copyright (c) 2003-2007 Tim Kientzle 3 * All rights reserved. 4 * 5 * Redistribution and use in source and binary forms, with or without 6 * modification, are permitted provided that the following conditions 7 * are met: 8 * 1. Redistributions of source code must retain the above copyright --- 10 unchanged lines hidden (view full) --- 19 * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, 20 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY 21 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 22 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF 23 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 24 */ 25 26#include "archive_platform.h" |
| 27__FBSDID("$FreeBSD: head/contrib/libarchive/libarchive/archive_virtual.c 228763 2011-12-21 11:13:29Z mm $"); | 27__FBSDID("$FreeBSD: head/contrib/libarchive/libarchive/archive_virtual.c 228773 2011-12-21 15:18:52Z mm $"); |
| 28 29#include "archive.h" 30#include "archive_entry.h" 31#include "archive_private.h" 32 33int 34archive_write_close(struct archive *a) 35{ 36 return ((a->vtable->archive_close)(a)); 37} 38 39int 40archive_read_close(struct archive *a) 41{ 42 return ((a->vtable->archive_close)(a)); 43} 44 | 28 29#include "archive.h" 30#include "archive_entry.h" 31#include "archive_private.h" 32 33int 34archive_write_close(struct archive *a) 35{ 36 return ((a->vtable->archive_close)(a)); 37} 38 39int 40archive_read_close(struct archive *a) 41{ 42 return ((a->vtable->archive_close)(a)); 43} 44 |
| 45#if ARCHIVE_API_VERSION > 1 | |
| 46int | 45int |
| 47archive_write_finish(struct archive *a) | 46archive_write_free(struct archive *a) |
| 48{ | 47{ |
| 49 return ((a->vtable->archive_finish)(a)); | 48 return ((a->vtable->archive_free)(a)); |
| 50} | 49} |
| 51#else 52/* Temporarily allow library to compile with either 1.x or 2.0 API. */ 53void | 50 51#if ARCHIVE_VERSION_NUMBER < 4000000 52/* For backwards compatibility; will be removed with libarchive 4.0. */ 53int |
| 54archive_write_finish(struct archive *a) 55{ | 54archive_write_finish(struct archive *a) 55{ |
| 56 (void)(a->vtable->archive_finish)(a); | 56 return ((a->vtable->archive_free)(a)); |
| 57} 58#endif 59 60int | 57} 58#endif 59 60int |
| 61archive_read_free(struct archive *a) 62{ 63 return ((a->vtable->archive_free)(a)); 64} 65 66#if ARCHIVE_VERSION_NUMBER < 4000000 67/* For backwards compatibility; will be removed with libarchive 4.0. */ 68int |
|
| 61archive_read_finish(struct archive *a) 62{ | 69archive_read_finish(struct archive *a) 70{ |
| 63 return ((a->vtable->archive_finish)(a)); | 71 return ((a->vtable->archive_free)(a)); |
| 64} | 72} |
| 73#endif |
|
| 65 66int 67archive_write_header(struct archive *a, struct archive_entry *entry) 68{ 69 ++a->file_count; 70 return ((a->vtable->archive_write_header)(a, entry)); 71} 72 73int 74archive_write_finish_entry(struct archive *a) 75{ 76 return ((a->vtable->archive_write_finish_entry)(a)); 77} 78 | 74 75int 76archive_write_header(struct archive *a, struct archive_entry *entry) 77{ 78 ++a->file_count; 79 return ((a->vtable->archive_write_header)(a, entry)); 80} 81 82int 83archive_write_finish_entry(struct archive *a) 84{ 85 return ((a->vtable->archive_write_finish_entry)(a)); 86} 87 |
| 79#if ARCHIVE_API_VERSION > 1 | |
| 80ssize_t | 88ssize_t |
| 81#else 82/* Temporarily allow library to compile with either 1.x or 2.0 API. */ 83int 84#endif | |
| 85archive_write_data(struct archive *a, const void *buff, size_t s) 86{ 87 return ((a->vtable->archive_write_data)(a, buff, s)); 88} 89 90ssize_t 91archive_write_data_block(struct archive *a, const void *buff, size_t s, off_t o) 92{ 93 return ((a->vtable->archive_write_data_block)(a, buff, s, o)); 94} | 89archive_write_data(struct archive *a, const void *buff, size_t s) 90{ 91 return ((a->vtable->archive_write_data)(a, buff, s)); 92} 93 94ssize_t 95archive_write_data_block(struct archive *a, const void *buff, size_t s, off_t o) 96{ 97 return ((a->vtable->archive_write_data_block)(a, buff, s, o)); 98} |