Code cleanup.

core.mod/common.bmx

@@ -32,7 +32,6 @@ Extern
 
 	Function bmx_libarchive_archive_read_next_header:Int(handle:Byte Ptr, entry:Byte Ptr)
 	Function bmx_libarchive_archive_read_data_skip:Int(handle:Byte Ptr)
-	Function bmx_libarchive_archive_read_extract:Int(handle:Byte Ptr, entry:Byte Ptr, flags:Int)
 	Function bmx_libarchive_archive_read_open:Int(handle:Byte Ptr, data:Object)
 	Function bmx_libarchive_archive_read_set_read_callback:Int(handle:Byte Ptr)
 	Function bmx_libarchive_archive_read_set_seek_callback:Int(handle:Byte Ptr)
@@ -95,15 +94,6 @@ Extern
 	Function bmx_libarchive_archive_entry_size_is_set:Int(handle:Byte Ptr)
 	Function bmx_libarchive_archive_entry_size:Long(handle:Byte Ptr)
 
-	Function bmx_libarchive_archive_read_disk_new:Byte Ptr()
-	Function bmx_libarchive_archive_read_disk_entry_from_file:Int(handle:Byte Ptr, entry:Byte Ptr)
-	Function bmx_libarchive_archive_read_disk_set_standard_lookup:Int(handle:Byte Ptr)
-	Function bmx_libarchive_archive_read_disk_set_symlink_logical:Int(handle:Byte Ptr)
-	Function bmx_libarchive_archive_read_disk_set_symlink_physical:Int(handle:Byte Ptr)
-	Function bmx_libarchive_archive_read_disk_set_symlink_hybrid:Int(handle:Byte Ptr)
-	Function bmx_libarchive_archive_read_disk_gname:String(handle:Byte Ptr, gid:Long)
-	Function bmx_libarchive_archive_read_disk_uname:String(handle:Byte Ptr, uid:Long)
-
 	Function archive_error_string:Byte Ptr(handle:Byte Ptr)
 End Extern
 

core.mod/core.bmx

@@ -624,49 +624,6 @@ Type TWriteArchive Extends TArchive
 
 End Type
 
-Type TReadDiskArchive Extends TArchive
-
-	Method New()
-		archivePtr = bmx_libarchive_archive_read_disk_new()
-	End Method
-	
-	Method EntryFromFile:Int(entry:TArchiveEntry)
-		Return bmx_libarchive_archive_read_disk_entry_from_file(archivePtr, entry.entryPtr)
-	End Method
-
-	Method SetSymlinkLogical:Int()
-		Return bmx_libarchive_archive_read_disk_set_symlink_logical(archivePtr)
-	End Method
-
-	Method SetSymlinkPhysical:Int()
-		Return bmx_libarchive_archive_read_disk_set_symlink_physical(archivePtr)
-	End Method
-
-	Method SetSymlinkhybrid:Int()
-		Return bmx_libarchive_archive_read_disk_set_symlink_hybrid(archivePtr)
-	End Method
-	
-	Method GName:String(gid:Long)
-		Return bmx_libarchive_archive_read_disk_gname(archivePtr, gid)
-	End Method
-	
-	Method UName:String(uid:Long)
-		Return bmx_libarchive_archive_read_disk_uname(archivePtr, uid)
-	End Method
-	
-	Method SetStandardLookup:Int()
-		Return bmx_libarchive_archive_read_disk_set_standard_lookup(archivePtr)
-	End Method
-	
-	Method Free()
-		If archivePtr Then
-			bmx_libarchive_archive_read_free(archivePtr)
-			archivePtr = Null
-		End If
-	End Method
-
-End Type
-
 Rem
 bbdoc: Represents entries within an archive.
 about: You can think of a #TArchiveEntry as a heavy-duty version of the c struct stat: it includes everything from struct stat plus

core.mod/glue.c

@@ -79,10 +79,6 @@ int bmx_libarchive_archive_read_data_skip(struct archive * arc) {
 	return archive_read_data_skip(arc);
 }
 
-int bmx_libarchive_archive_read_extract(struct archive * arc, struct archive_entry * entry, int flags) {
-	return archive_read_extract(arc, entry, flags);
-}
-
 int bmx_libarchive_archive_read_open(struct archive * arc, BBObject * data) {
 	return archive_read_open2(arc, data, bmx_libarchive_open_cb, bmx_libarchive_read_cb,
 		bmx_libarchive_seek_cb, bmx_libarchive_close_cb);
@@ -411,37 +407,3 @@ int bmx_libarchive_archive_entry_size_is_set(struct archive_entry * entry) {
 BBInt64 bmx_libarchive_archive_entry_size(struct archive_entry * entry) {
 	return archive_entry_size(entry);
 }
-
-/* +++++++++++++++++++++++++++++++++++++++++++++++++++++ */
-
-struct archive * bmx_libarchive_archive_read_disk_new() {
-	return archive_read_disk_new();
-}
-
-int bmx_libarchive_archive_read_disk_entry_from_file(struct archive * arc, struct archive_entry * entry) {
-	return archive_read_disk_entry_from_file(arc, entry, -1, NULL);
-}
-
-int bmx_libarchive_archive_read_disk_set_standard_lookup(struct archive * arc) {
-	return archive_read_disk_set_standard_lookup(arc);
-}
-
-int bmx_libarchive_archive_read_disk_set_symlink_logical(struct archive * arc) {
-	return archive_read_disk_set_symlink_logical(arc);
-}
-
-int bmx_libarchive_archive_read_disk_set_symlink_physical(struct archive * arc) {
-	return archive_read_disk_set_symlink_physical(arc);
-}
-
-int bmx_libarchive_archive_read_disk_set_symlink_hybrid(struct archive * arc) {
-	return archive_read_disk_set_symlink_hybrid(arc);
-}
-
-BBString * bmx_libarchive_archive_read_disk_gname(struct archive * arc, __LA_INT64_T gid) {
-	return bbStringFromUTF8String(archive_read_disk_gname(arc, gid));
-}
-
-BBString * bmx_libarchive_archive_read_disk_uname(struct archive * arc, __LA_INT64_T uid) {
-	return bbStringFromUTF8String(archive_read_disk_uname(arc, uid));
-}

core.mod/source.bmx

@@ -27,8 +27,6 @@ Import "include/*.h"
 Import "libarchive/libarchive/*.h"
 
 Import "libarchive/libarchive/archive_acl.c"
-Import "libarchive/libarchive/archive_blake2s_ref.c"
-Import "libarchive/libarchive/archive_blake2sp_ref.c"
 Import "libarchive/libarchive/archive_check_magic.c"
 Import "libarchive/libarchive/archive_cmdline.c"
 Import "libarchive/libarchive/archive_cryptor.c"
@@ -41,7 +39,6 @@ Import "libarchive/libarchive/archive_entry_xattr.c"
 Import "libarchive/libarchive/archive_entry.c"
 Import "libarchive/libarchive/archive_getdate.c"
 Import "libarchive/libarchive/archive_hmac.c"
-Import "libarchive/libarchive/archive_match.c"
 Import "libarchive/libarchive/archive_options.c"
 Import "libarchive/libarchive/archive_pack_dev.c"
 Import "libarchive/libarchive/archive_pathmatch.c"
@@ -51,33 +48,18 @@ Import "libarchive/libarchive/archive_random.c"
 Import "libarchive/libarchive/archive_rb.c"
 Import "libarchive/libarchive/archive_read_add_passphrase.c"
 Import "libarchive/libarchive/archive_read_append_filter.c"
-Import "libarchive/libarchive/archive_read_data_into_fd.c"
-Import "libarchive/libarchive/archive_read_disk_entry_from_file.c"
-Import "libarchive/libarchive/archive_read_disk_posix.c"
-Import "libarchive/libarchive/archive_read_disk_set_standard_lookup.c"
-Import "libarchive/libarchive/archive_read_extract.c"
-Import "libarchive/libarchive/archive_read_extract2.c"
-Import "libarchive/libarchive/archive_read_open_fd.c"
-Import "libarchive/libarchive/archive_read_open_file.c"
-Import "libarchive/libarchive/archive_read_open_filename.c"
 Import "libarchive/libarchive/archive_read_open_memory.c"
 Import "libarchive/libarchive/archive_read_set_options.c"
 Import "libarchive/libarchive/archive_read_support_filter_program.c"
 Import "libarchive/libarchive/archive_read_support_format_empty.c"
-Import "libarchive/libarchive/archive_read_support_format_raw.c"
 Import "libarchive/libarchive/archive_read.c"
 Import "libarchive/libarchive/archive_string_sprintf.c"
 Import "libarchive/libarchive/archive_util.c"
 Import "libarchive/libarchive/archive_virtual.c"
 Import "libarchive/libarchive/archive_version_details.c"
 Import "libarchive/libarchive/archive_write_add_filter_program.c"
-Import "libarchive/libarchive/archive_write_disk_posix.c"
 Import "libarchive/libarchive/archive_write_disk_set_standard_lookup.c"
-Import "libarchive/libarchive/archive_write_open_fd.c"
-Import "libarchive/libarchive/archive_write_open_file.c"
-Import "libarchive/libarchive/archive_write_open_filename.c"
 Import "libarchive/libarchive/archive_write_open_memory.c"
-Import "libarchive/libarchive/archive_write_set_format_raw.c"
 Import "libarchive/libarchive/archive_write_set_options.c"
 Import "libarchive/libarchive/archive_write_set_passphrase.c"
 Import "libarchive/libarchive/archive_write.c"
@@ -86,9 +68,7 @@ Import "libarchive/libarchive/filter_fork_posix.c"
 ?
 ?win32
 Import "libarchive/libarchive/archive_entry_copy_bhfi.c"
-Import "libarchive/libarchive/archive_read_disk_windows.c"
 Import "libarchive/libarchive/archive_windows.c"
-Import "libarchive/libarchive/archive_write_disk_windows.c"
 Import "libarchive/libarchive/filter_fork_windows.c"
 ?