From 009f094c01dda05be7fc4ad034f4f0a1dd1bb630 Mon Sep 17 00:00:00 2001 From: Ernesto Castellotti Date: Tue, 27 Aug 2019 16:19:32 +0200 Subject: [PATCH] toD: remove pointer usb_extreme_header.headers Signed-off-by: Ernesto Castellotti --- include/usbextreme.di | 4 ++-- lib/usbextreme.d | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/include/usbextreme.di b/include/usbextreme.di index 2da204e..84864e6 100644 --- a/include/usbextreme.di +++ b/include/usbextreme.di @@ -1,4 +1,4 @@ -// D import file generated from 'usbextreme.d' +// D import file generated from '/home/erny/Open-USB-Extreme/lib/usbextreme.d' module usbextreme; import std.stdint; enum USBEXTREME_NAME_LENGTH = 32; @@ -46,7 +46,7 @@ align (1) struct usb_extreme_v1 struct usb_extreme_headers { const(void)* first_header; - const(usb_extreme_base)* headers; + const(usb_extreme_base)[] headers; int num_headers; size_t headerslen; UsbExtremeVersion oueVersion; diff --git a/lib/usbextreme.d b/lib/usbextreme.d index c645fb7..572b60e 100644 --- a/lib/usbextreme.d +++ b/lib/usbextreme.d @@ -40,7 +40,7 @@ align(1) struct usb_extreme_v1 { struct usb_extreme_headers { const(void)* first_header; - const(usb_extreme_base)* headers; + const(usb_extreme_base)[] headers; int num_headers; size_t headerslen; UsbExtremeVersion oueVersion; @@ -165,7 +165,7 @@ extern(D) int oueReadHeaders(ref usb_extreme_headers headers, const(void)[] raw_ auto headersArr = castArray!(usb_extreme_base)(raw_headers); headers = usb_extreme_headers(raw_headers.ptr, - headersArr.ptr, + headersArr, num_headers, raw_headers.length, oueVersion); @@ -173,7 +173,7 @@ extern(D) int oueReadHeaders(ref usb_extreme_headers headers, const(void)[] raw_ } extern(D) usb_extreme_filestat[] oueRead(usb_extreme_filestat[] filestats, const(usb_extreme_headers) headers) { - auto headers_full = castArray!(usb_extreme_v1)(headers.headers[0..headers.num_headers]); + auto headers_full = castArray!(usb_extreme_v1)(headers.headers); auto headersLength = headers_full.length; int fileStatsLength = 0;