ErnyTech/Open-USB-Extreme
1
0
Fork 0
mirror of https://github.com/ErnyTech/Open-USB-Extreme synced 2025-01-28 11:27:32 +01:00
Code Issues Releases Wiki Activity

toD: Fix issue with castArray and remove pointer in ouePointHeaders

Browse Source
This commit is contained in:
Ernesto Castellotti 2019-08-27 14:31:38 +02:00
parent 28d6ee7d8f
commit 192384a3c3
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/usbextreme.di
View File

@ -86,7 +86,7 @@ enum SCECdvdMediaType
extern (D) int isOue(const(void)[] headers); extern (D) int isOue(const(void)[] headers);
extern (D) UsbExtremeVersion getVersion(uint8_t usbExtremeVersion); extern (D) UsbExtremeVersion getVersion(uint8_t usbExtremeVersion);
extern (D) int oueNumHeaders(ref int num_headers, const(void)[] headers); extern (D) int oueNumHeaders(ref int num_headers, const(void)[] headers);
extern (D) int ouePointHeaders(ref const(usb_extreme_base)* headers, const(void)[] raw_headers); extern (D) int ouePointHeaders(ref const(usb_extreme_base)[] headers, const(void)[] raw_headers);
extern (D) int oueHeadersVersion(ref UsbExtremeVersion oueVersion, const(void)[] headers); extern (D) int oueHeadersVersion(ref UsbExtremeVersion oueVersion, const(void)[] headers);
extern (D) int oueReadHeaders(ref usb_extreme_headers headers, const(void)[] raw_headers); extern (D) int oueReadHeaders(ref usb_extreme_headers headers, const(void)[] raw_headers);
extern (D) int oueRead(usb_extreme_filestat[] filestat, const(usb_extreme_headers) headers); extern (D) int oueRead(usb_extreme_filestat[] filestat, const(usb_extreme_headers) headers);

4
lib/cabi.d
View File

@ -15,7 +15,9 @@ extern(C) int oue_num_headers(int *num_headers, const(void) *headers, size_t hea
} }
extern(C) int oue_point_headers(const(usb_extreme_base)** headers, const(void)* raw_headers, size_t headerslen) { extern(C) int oue_point_headers(const(usb_extreme_base)** headers, const(void)* raw_headers, size_t headerslen) {
return ouePointHeaders(*headers, raw_headers[0..headerslen]); auto len = headerslen / usb_extreme_base.sizeof;
const(usb_extreme_base)[] headersArr = (*headers)[0..len];
return ouePointHeaders(headersArr, raw_headers[0..headerslen]);
} }
extern(C) int oue_version(UsbExtremeVersion* oueVersion, const(void) *headers, size_t headerslen) { extern(C) int oue_version(UsbExtremeVersion* oueVersion, const(void) *headers, size_t headerslen) {

8
lib/usbextreme.d
View File

@ -119,16 +119,14 @@ extern(D) int oueNumHeaders(ref int num_headers, const(void)[] headers) {
return headers_nlen; return headers_nlen;
} }
extern(D) int ouePointHeaders(ref const(usb_extreme_base)* headers, const(void)[] raw_headers) { extern(D) int ouePointHeaders(ref const(usb_extreme_base)[] headers, const(void)[] raw_headers) {
import core.stdc.stdio;
int headers_nlen; int headers_nlen;
if (oueNumHeaders(headers_nlen, raw_headers) <= 0) { if (oueNumHeaders(headers_nlen, raw_headers) <= 0) {
return -1; return -1;
} }
auto headersArr = castArray!(const(usb_extreme_base))(raw_headers)[]; headers = castArray!(const(usb_extreme_base))(raw_headers)[];
headers = headersArr.ptr;
return headers_nlen; return headers_nlen;
} }
@ -218,5 +216,5 @@ extern(D) int oueRead(usb_extreme_filestat[] filestat, const(usb_extreme_headers
private R[] castArray(R, T) (T[] array) { // Workaround for https://issues.dlang.org/show_bug.cgi?id=20088 private R[] castArray(R, T) (T[] array) { // Workaround for https://issues.dlang.org/show_bug.cgi?id=20088
auto ptr = array.ptr; auto ptr = array.ptr;
auto castPtr = cast(R*) ptr; auto castPtr = cast(R*) ptr;
return castPtr[0..(array.length / R.sizeof)]; return castPtr[0..((array.length * T.sizeof) / R.sizeof)];
} }