capi: update to chd 0.2

Author: chyyran

Cargo.lock

@@ -1,6 +1,6 @@
 [package]
 name = "chd-capi"
-version = "0.1.4"
+version = "0.1.5"
 edition = "2021"
 authors = ["Ronny Chan <ronny@ronnychan.ca>"]
 description = "libchdr-compatible C API for a Rust implementation of the CHD File Format"
@@ -21,7 +21,7 @@ chd_precache = []
 verify_block_crc = ["chd/verify_block_crc"]
 
 [dependencies]
-chd = "0.1"
+chd = { version = "0.2", git = "https://github.com/SnowflakePowered/chd-rs" }
 
 [build-dependencies]
 cbindgen = "0.24.3"

chd-rs-capi/Cargo.toml

@@ -29,145 +29,6 @@
 
 #define CHD_SHA1_BYTES 20
 
-/**
- * Error types that may occur when reading a CHD file or hunk.
- *
- * This type tries to be ABI-compatible with [libchdr](https://github.com/rtissera/libchdr/blob/6eeb6abc4adc094d489c8ba8cafdcff9ff61251b/include/libchdr/chd.h#L258),
- * given sane defaults in the C compiler. See [repr(C) in the Rustonomicon](https://doc.rust-lang.org/nomicon/other-reprs.html#reprc) for more details.
- */
-typedef enum chd_error {
-  /**
-   * No error.
-   * This is only used by the C API bindings.
-   */
-  CHDERR_NONE,
-  /**
-   * No drive interface.
-   * This is only for C-compatibility purposes and is otherwise unused.
-   */
-  CHDERR_NO_INTERFACE,
-  /**
-   * Unable to allocate the required size of buffer.
-   */
-  CHDERR_OUT_OF_MEMORY,
-  /**
-   * The file is not a valid CHD file.
-   */
-  CHDERR_INVALID_FILE,
-  /**
-   * An invalid parameter was provided.
-   */
-  CHDERR_INVALID_PARAMETER,
-  /**
-   * The data is invalid.
-   */
-  CHDERR_INVALID_DATA,
-  /**
-   * The file was not found.
-   */
-  CHDERR_FILE_NOT_FOUND,
-  /**
-   * This CHD requires a parent CHD that was not provided.
-   */
-  CHDERR_REQUIRES_PARENT,
-  /**
-   * The provided file is not writable.
-   * Since chd-rs does not implement CHD creation, this is unused.
-   */
-  CHDERR_FILE_NOT_WRITEABLE,
-  /**
-   * An error occurred when reading this CHD file.
-   */
-  CHDERR_READ_ERROR,
-  /**
-   * An error occurred when writing this CHD file.
-   * Since chd-rs does not implement CHD creation, this is unused.
-   */
-  CHDERR_WRITE_ERROR,
-  /**
-   * An error occurred when initializing a codec.
-   */
-  CHDERR_CODEC_ERROR,
-  /**
-   * The provided parent CHD is invalid.
-   */
-  CHDERR_INVALID_PARENT,
-  /**
-   * The request hunk is out of range for this CHD file.
-   */
-  CHDERR_HUNK_OUT_OF_RANGE,
-  /**
-   * An error occurred when decompressing a hunk.
-   */
-  CHDERR_DECOMPRESSION_ERROR,
-  /**
-   * An error occurred when compressing a hunk.
-   * Since chd-rs does not implement CHD creation, this is unused.
-   */
-  CHDERR_COMPRESSION_ERROR,
-  /**
-   * Could not create the file.
-   * Since chd-rs does not implement CHD creation, this is unused.
-   */
-  CHDERR_CANT_CREATE_FILE,
-  /**
-   * Could not verify the CHD.
-   * This is only for C-compatibility purposes and is otherwise unused.
-   */
-  CHDERR_CANT_VERIFY,
-  /**
-   * The requested operation is not supported.
-   * This is only for C-compatibility purposes and is otherwise unused.
-   */
-  CHDERR_NOT_SUPPORTED,
-  /**
-   * The requested metadata was not found.
-   * This is only used by the C API bindings.
-   */
-  CHDERR_METADATA_NOT_FOUND,
-  /**
-   * The metadata has an invalid size.
-   * This is only for C-compatibility purposes and is otherwise unused.
-   */
-  CHDERR_INVALID_METADATA_SIZE,
-  /**
-   * The CHD version of the provided file is not supported by this library.
-   */
-  CHDERR_UNSUPPORTED_VERSION,
-  /**
-   * Unable to verify the CHD completely.
-   * This is only for C-compatibility purposes and is otherwise unused.
-   */
-  CHDERR_VERIFY_INCOMPLETE,
-  /**
-   * The requested metadata is invalid.
-   */
-  CHDERR_INVALID_METADATA,
-  /**
-   * The internal state of the decoder/encoder is invalid.
-   * This is only for C-compatibility purposes and is otherwise unused.
-   */
-  CHDERR_INVALID_STATE,
-  /**
-   * An operation is already pending.
-   * This is only for C-compatibility purposes and is otherwise unused.
-   */
-  CHDERR_OPERATION_PENDING,
-  /**
-   * No async operations are allowed.
-   * This is only for C-compatibility purposes and is otherwise unused.
-   */
-  CHDERR_NO_ASYNC_OPERATION,
-  /**
-   * Decompressing the CHD requires a codec that is not supported.
-   */
-  CHDERR_UNSUPPORTED_FORMAT,
-  /**
-   * Unknown error.
-   */
-  CHDERR_UNKNOWN,
-} chd_error;
-
 /**
  * An opaque type for an opened CHD file.
  */

chd-rs-capi/chd.h

@@ -1,6 +1,6 @@
 use crate::chd_file;
-use chd::header::{ChdHeader, HeaderV1, HeaderV3, HeaderV4, HeaderV5};
-use chd::map::ChdMap;
+use chd::header::{Header, HeaderV1, HeaderV3, HeaderV4, HeaderV5};
+use chd::map::Map;
 use std::mem;
 
 pub const CHD_MD5_BYTES: usize = 16;
@@ -128,11 +128,11 @@ impl From<&HeaderV4> for chd_header {
 
 pub(crate) fn get_v5_header(chd: &chd_file) -> chd_header {
     let header: HeaderV5 = match chd.header() {
-        ChdHeader::V5Header(h) => h.clone(),
+        Header::V5Header(h) => h.clone(),
         _ => unreachable!(),
     };
     let mut map_data: Vec<u8> = match chd.map() {
-        ChdMap::V5(map) => map.into(),
+        Map::V5(map) => map.into(),
         _ => unreachable!(),
     };
     let version = header.version;