From 2fde7880a161522d6aaf34ea953388b9098b4963 Mon Sep 17 00:00:00 2001
From: Ernesto Castellotti <erny.castell@gmail.com>
Date: Tue, 20 Aug 2019 16:10:46 +0200
Subject: [PATCH] toD: oue_point_headers

---
 lib/dusbextreme.d | 17 ++++++++++++++---
 lib/usbextreme.c  | 11 -----------
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/lib/dusbextreme.d b/lib/dusbextreme.d
index 31daa84..0fa6607 100644
--- a/lib/dusbextreme.d
+++ b/lib/dusbextreme.d
@@ -18,8 +18,8 @@ enum UsbExtremeVersion  {
     V1
 }
 
-extern(C) int is_oue(immutable(void)* headers, size_t headerslen) {
-    immutable headers_oeu = cast(immutable usb_extreme_base*) headers;
+extern(C) int is_oue(const(void)* headers, size_t headerslen) {
+    const headers_oeu = cast(const usb_extreme_base*) headers;
     auto headers_nlen = headerslen / USBEXTREME_HEADER_SIZE;
     
     for (auto i = 0; i < headers_nlen; i++) {
@@ -49,7 +49,7 @@ extern(C) UsbExtremeVersion get_version(uint8_t usbExtremeVersion) {
     }
 }
 
-extern(C) int oue_num_headers(int *num_headers, immutable(void) *headers, size_t headerslen) {
+extern(C) int oue_num_headers(int *num_headers, const(void) *headers, size_t headerslen) {
     auto headers_nlen = cast(int) (headerslen / USBEXTREME_HEADER_SIZE);
 
     if (!is_oue(headers, headerslen)) {
@@ -59,3 +59,14 @@ extern(C) int oue_num_headers(int *num_headers, immutable(void) *headers, size_t
     *num_headers = headers_nlen;
     return headers_nlen;
 }
+
+extern(C) int oue_point_headers(const(usb_extreme_base)** headers, const(void)* raw_headers, size_t headerslen) {
+    int headers_nlen;
+
+    if (oue_num_headers(&headers_nlen, raw_headers, headerslen) <= 0) {
+        return -1;
+    }
+
+    *headers = cast(const(usb_extreme_base)*) raw_headers;
+    return headers_nlen;
+}
diff --git a/lib/usbextreme.c b/lib/usbextreme.c
index 3d75e8f..4ca016e 100644
--- a/lib/usbextreme.c
+++ b/lib/usbextreme.c
@@ -1,17 +1,6 @@
 #include <usbextreme.h>
 #include <string.h>
 
-int oue_point_headers(usb_extreme_base **headers, void *raw_headers, size_t headerslen) {
-    int headers_nlen;
-
-    if (oue_num_headers(&headers_nlen, raw_headers, headerslen) <= 0) {
-        return -1;
-    }
-
-    *headers = raw_headers;
-    return headers_nlen;
-}
-
 int oue_version(usb_extreme_versions *version, const void *headers, size_t headerslen) {
     const usb_extreme_v1 *headers_oeu = headers;
     int headers_nlen = (int) (headerslen / USBEXTREME_HEADER_SIZE);