From 000ec9984f3f38686e715c77b55dd07b99ab05e2 Mon Sep 17 00:00:00 2001 From: "Thomas \"Cakeisalie5\" Touhey" Date: Sat, 22 Apr 2017 21:02:13 +0200 Subject: [PATCH] Headers, lol --- include/libg1m.h | 2 +- include/libg1m/buffer.h | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/include/libg1m.h b/include/libg1m.h index 2880cf2..bb56982 100644 --- a/include/libg1m.h +++ b/include/libg1m.h @@ -141,7 +141,7 @@ extern int g1m_encode_mcsfile(g1m_mcsfile_t *g1m_arg_handle, g1m_buffer_t *g1m_arg_buffer); # define g1m_announce_mcsfile(handle, size) \ (g1m_encode_mcsfile(handle, (g1m_buffer_t[]){{ \ - .cookie = (size_t*)size, .announce = g1m_announce_callback }})) + (void*)size, 0, NULL, NULL, g1m_announce_callback, NULL}})) /* open CAS head for decoding, correct it for encoding */ extern int g1m_decode_casfile_head(g1m_mcshead_t *g1m_arg_head, diff --git a/include/libg1m/buffer.h b/include/libg1m/buffer.h index 64528d4..6b30cad 100644 --- a/include/libg1m/buffer.h +++ b/include/libg1m/buffer.h @@ -40,10 +40,10 @@ * In each case, the `cookie` is sent as the first argument to your callbacks. * Here are their types: */ -typedef int (*g1m_buffer_read_t)(void*, unsigned char*, size_t); -typedef int (*g1m_buffer_write_t)(void*, const unsigned char*, size_t); -typedef int (*g1m_buffer_announce_t)(void*, size_t); -typedef void (*g1m_buffer_unannounce_t)(void*); +typedef int g1m_buffer_read_t(void*, unsigned char*, size_t); +typedef int g1m_buffer_write_t(void*, const unsigned char*, size_t); +typedef int g1m_buffer_announce_t(void*, size_t); +typedef void g1m_buffer_unannounce_t(void*); /* ... and the structure of a buffer: */ @@ -52,10 +52,10 @@ typedef struct { size_t g1m_buffer_offset; /* callbacks */ - g1m_buffer_read_t g1m_buffer_read; - g1m_buffer_write_t g1m_buffer_write; - g1m_buffer_announce_t g1m_buffer_announce; - g1m_buffer_unannounce_t g1m_buffer_unannounce; + g1m_buffer_read_t *g1m_buffer_read; + g1m_buffer_write_t *g1m_buffer_write; + g1m_buffer_announce_t *g1m_buffer_announce; + g1m_buffer_unannounce_t *g1m_buffer_unannounce; } g1m_buffer_t; /* ************************************************************************** */ /* File buffer definition */