Import nbdkit-1.22.3

This commit is contained in:
Matthew Arnold 2020-09-28 20:01:26 +00:00
parent 37b1966c8e
commit 0c50d4a20b

View file

@ -529,7 +529,7 @@ func PluginInitialize(name string, impl PluginInterface) unsafe.Pointer {
// Set up the hidden plugin fields as for C. // Set up the hidden plugin fields as for C.
struct_size := C.ulong(unsafe.Sizeof(plugin)) struct_size := C.ulong(unsafe.Sizeof(plugin))
plugin._struct_size = struct_size plugin._struct_size = C.uint64_t(struct_size)
plugin._api_version = C.NBDKIT_API_VERSION plugin._api_version = C.NBDKIT_API_VERSION
plugin._thread_model = C.NBDKIT_THREAD_MODEL_PARALLEL plugin._thread_model = C.NBDKIT_THREAD_MODEL_PARALLEL
@ -563,7 +563,7 @@ func PluginInitialize(name string, impl PluginInterface) unsafe.Pointer {
// Return a newly malloced copy of the struct. This must be // Return a newly malloced copy of the struct. This must be
// globally available to the C code in the server, so it is // globally available to the C code in the server, so it is
// never freed. // never freed.
p := (*C.struct_nbdkit_plugin)(C.malloc(struct_size)) p := (*C.struct_nbdkit_plugin)(C.malloc(C.size_t(struct_size)))
*p = plugin *p = plugin
return unsafe.Pointer(p) return unsafe.Pointer(p)
} }