diff options
Diffstat (limited to 'src/cc4group.c')
| -rw-r--r-- | src/cc4group.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/cc4group.c b/src/cc4group.c index ca5d0db..14d35ab 100644 --- a/src/cc4group.c +++ b/src/cc4group.c @@ -382,7 +382,7 @@ static bool cc4group_inflateFillOutput(z_stream* const strm, CC4Group_ReadCallba } size_t readSize = 0; - *eof = callback(lastData, &readSize, callbackArg); + *eof = callback((const void**)lastData, &readSize, callbackArg); if(readSize == 0) { @@ -447,7 +447,7 @@ static bool cc4group_uncompressGroup(CC4Group* const this, CC4Group_ReadCallback readData = NULL; readSize = 0; - eof = callback(&readData, &readSize, callbackArg); + eof = callback((const void**)&readData, &readSize, callbackArg); if(readSize == 0) { @@ -672,11 +672,11 @@ ret: } typedef struct { - const uint8_t* data; + const void* data; size_t size; } CompleteDataReadCallbackArg; -static bool cc4group_completeDataReadCallback(const uint8_t** const data, size_t* const size, void* callbackArg) +static bool cc4group_completeDataReadCallback(const void** const data, size_t* const size, void* callbackArg) { CompleteDataReadCallbackArg* argData = callbackArg; *data = argData->data; @@ -684,10 +684,10 @@ static bool cc4group_completeDataReadCallback(const uint8_t** const data, size_t return true; } -static bool cc4group_readFdReadCallback(const uint8_t** const data, size_t* const size, void* callbackArg) +static bool cc4group_readFdReadCallback(const void** const data, size_t* const size, void* callbackArg) { #define CHUNK_SIZE 1000*1000 - uint8_t* readData = malloc(CHUNK_SIZE); + void* readData = malloc(CHUNK_SIZE); if(data == NULL) { return true; @@ -705,10 +705,10 @@ static bool cc4group_readFdReadCallback(const uint8_t** const data, size_t* cons #undef CHUNK_SIZE } -static bool cc4group_readFilePointerReadCallback(const uint8_t** const data, size_t* const size, void* callbackArg) +static bool cc4group_readFilePointerReadCallback(const void** const data, size_t* const size, void* callbackArg) { #define CHUNK_SIZE 1000*1000 - uint8_t* readData = malloc(CHUNK_SIZE); + void* readData = malloc(CHUNK_SIZE); if(data == NULL) { return true; @@ -726,7 +726,7 @@ static bool cc4group_readFilePointerReadCallback(const uint8_t** const data, siz #undef CHUNK_SIZE } -static bool cc4group_openMemory(CC4Group* const this, const uint8_t* const compressedData, size_t const size, int const memoryManagement) +static bool cc4group_openMemory(CC4Group* const this, const void* const compressedData, size_t const size, int const memoryManagement) { assert(this); assert(compressedData); |