cleanup: fix extism_plugin_new/extism_plugin_update function paramete…

…r types
extism · Jan 4, 2023 · 6ccdd1f · 6ccdd1f
1 parent dd48970
commit 6ccdd1f
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/runtime/extism.h b/runtime/extism.h
@@ -157,7 +157,7 @@ void extism_function_free(ExtismFunction *ptr);
 ExtismPlugin extism_plugin_new(ExtismContext *ctx,
                                const uint8_t *wasm,
                                ExtismSize wasm_size,
-                               ExtismFunction **functions,
+                               const ExtismFunction **functions,
                                ExtismSize n_functions,
                                bool with_wasi);
 
@@ -173,7 +173,7 @@ bool extism_plugin_update(ExtismContext *ctx,
                           ExtismPlugin index,
                           const uint8_t *wasm,
                           ExtismSize wasm_size,
-                          ExtismFunction *const *functions,
+                          const ExtismFunction **functions,
                           ExtismSize nfunctions,
                           bool with_wasi);
 

diff --git a/runtime/src/sdk.rs b/runtime/src/sdk.rs
@@ -254,7 +254,7 @@ pub unsafe extern "C" fn extism_plugin_new(
     ctx: *mut Context,
     wasm: *const u8,
     wasm_size: Size,
-    functions: *mut *mut ExtismFunction,
+    functions: *mut *const ExtismFunction,
     n_functions: Size,
     with_wasi: bool,
 ) -> PluginIndex {
@@ -290,7 +290,7 @@ pub unsafe extern "C" fn extism_plugin_update(
     index: PluginIndex,
     wasm: *const u8,
     wasm_size: Size,
-    functions: *const *mut ExtismFunction,
+    functions: *mut *const ExtismFunction,
     nfunctions: Size,
     with_wasi: bool,
 ) -> bool {

diff --git a/rust/src/plugin.rs b/rust/src/plugin.rs
@@ -74,17 +74,17 @@ impl<'a> Plugin<'a> {
             .into_iter()
             .map(|x| bindings::ExtismFunction::from(x.clone()))
             .collect::<Vec<_>>();
-        let functions = functions
+        let mut functions = functions
             .into_iter()
-            .map(|mut x| &mut x as *mut _)
+            .map(|x| &x as *const _)
             .collect::<Vec<_>>();
         let b = unsafe {
             bindings::extism_plugin_update(
                 &mut *self.context.lock(),
                 self.id,
                 data.as_ref().as_ptr(),
                 data.as_ref().len() as u64,
-                functions.as_ptr(),
+                functions.as_mut_ptr(),
                 functions.len() as u64,
                 wasi,
             )