From ba261c9e3bfce6a89ba74711ff69c13536fd70b1 Mon Sep 17 00:00:00 2001 From: Markus Mittendrein Date: Sat, 17 Aug 2019 20:57:00 +0200 Subject: Make parameters const more consistently --- src/cc4group.c | 42 +++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) (limited to 'src/cc4group.c') diff --git a/src/cc4group.c b/src/cc4group.c index 8831cf5..fff46e7 100644 --- a/src/cc4group.c +++ b/src/cc4group.c @@ -42,7 +42,7 @@ static bool cc4group_extractAll(CC4Group* const this, const char* const targetPa static bool cc4group_extractSingle(CC4Group* const this, const char* const entryPath, const char* const targetPath); // the group owns the data pointed to. the pointer is valid until the group destructor is called -static bool cc4group_getEntryData(CC4Group* const this, const char* const entryPath, const void** const data, size_t* size); +static bool cc4group_getEntryData(CC4Group* const this, const char* const entryPath, const void** const data, size_t* const size); #define C4GroupMagic1 0x1e #define C4GroupMagic2 0x8c @@ -375,7 +375,7 @@ static void cc4group_tryWarnUnlink(const char* const fileName) } } -static void cc4group_unmapTmpMemoryFile(MunmapData* data) +static void cc4group_unmapTmpMemoryFile(MunmapData* const data) { if(cc4group_munmap(data->addr, data->size) == -1) { @@ -390,7 +390,7 @@ static void cc4group_unmapTmpMemoryFile(MunmapData* data) free(data); } -static void* cc4group_createTmpMemoryFile(CC4Group* const this, const size_t size, CC4Group_CleanupJob* cleanupJob) +static void* cc4group_createTmpMemoryFile(CC4Group* const this, const size_t size, CC4Group_CleanupJob* const cleanupJob) { MunmapData* unmapData = malloc(sizeof(MunmapData)); @@ -445,7 +445,7 @@ ret: return ret; } -static void* cc4group_createTmpMemoryMalloc(CC4Group* const this, const size_t size, CC4Group_CleanupJob* cleanupJob) +static void* cc4group_createTmpMemoryMalloc(CC4Group* const this, const size_t size, CC4Group_CleanupJob* const cleanupJob) { (void)this; void* ret = malloc(size); @@ -463,7 +463,7 @@ static void* cc4group_createTmpMemoryMalloc(CC4Group* const this, const size_t s } // uses in memory for up to 500MB, although it falls back to tmp file if in memory fails -static void* cc4group_createTmpMemoryAuto(CC4Group* const this, const size_t size, CC4Group_CleanupJob* cleanupJob) +static void* cc4group_createTmpMemoryAuto(CC4Group* const this, const size_t size, CC4Group_CleanupJob* const cleanupJob) { void* ret = NULL; @@ -496,7 +496,7 @@ static bool cc4group_buildGroupHierarchy(CC4Group* const this) return ret; } -static bool cc4group_inflateFillOutput(z_stream* const strm, CC4Group_ReadCallback const callback, void* const callbackArg, CC4Group_MemoryManagement const memoryManagement, bool* eof, const uint8_t** const lastData, int* inflateRet) +static bool cc4group_inflateFillOutput(z_stream* const strm, CC4Group_ReadCallback const callback, void* const callbackArg, CC4Group_MemoryManagement const memoryManagement, bool* const eof, const uint8_t** const lastData, int* const inflateRet) { int ret = Z_OK; while(strm->avail_out > 0) @@ -939,7 +939,7 @@ typedef struct { void* buffer; } ChunkedReadData; -static bool cc4group_initChunkBufferCallback(void* callbackArg) +static bool cc4group_initChunkBufferCallback(void* const callbackArg) { #define CHUNK_SIZE 1024 * 1024 void* buffer = malloc(CHUNK_SIZE); @@ -953,7 +953,7 @@ static bool cc4group_initChunkBufferCallback(void* callbackArg) return true; } -static bool cc4group_deinitChunkBufferCallback(void* callbackArg) +static bool cc4group_deinitChunkBufferCallback(void* const callbackArg) { free(((ChunkedReadData*)callbackArg)->buffer); free(callbackArg); @@ -965,7 +965,7 @@ typedef struct { int fd; } FdReadData; -static bool cc4group_readFdReadCallback(const void** const data, size_t* const size, void* callbackArg) +static bool cc4group_readFdReadCallback(const void** const data, size_t* const size, void* const callbackArg) { FdReadData* arg = callbackArg; void* buffer = arg->chunkedData.buffer; @@ -980,7 +980,7 @@ static bool cc4group_readFdReadCallback(const void** const data, size_t* const s return true; } -static bool cc4group_readFilePointerReadCallback(const void** const data, size_t* const size, void* callbackArg) +static bool cc4group_readFilePointerReadCallback(const void** const data, size_t* const size, void* const callbackArg) { ChunkedReadData* arg = callbackArg; void* buffer = arg->buffer; @@ -1387,7 +1387,7 @@ static bool cc4group_create(CC4Group* const this) return true; } -static bool cc4group_openFd(CC4Group* const this, int fd) +static bool cc4group_openFd(CC4Group* const this, int const fd) { // assert is in cc4group_uncompressGroup @@ -1402,7 +1402,7 @@ static bool cc4group_openFd(CC4Group* const this, int fd) return cc4group_uncompressGroup(this, cc4group_readFdReadCallback, arg, cc4group.MemoryManagement.Reference, cc4group_initChunkBufferCallback, cc4group_deinitChunkBufferCallback); } -static bool cc4group_openFilePointer(CC4Group* const this, FILE* file) +static bool cc4group_openFilePointer(CC4Group* const this, FILE* const file) { // assert(this) is in cc4group_uncompressGroup assert(file); @@ -1744,7 +1744,7 @@ static bool cc4group_extractSingle(CC4Group* const this, const char* const entry return cc4group_extractChildren(this, entry, targetPath); } -static const uint8_t* cc4group_getOnlyEntryData(CC4Group* const this, const C4GroupEntryData* entry) +static const uint8_t* cc4group_getOnlyEntryData(CC4Group* const this, const C4GroupEntryData* const entry) { if(entry->data == NULL) { @@ -1759,7 +1759,7 @@ static const uint8_t* cc4group_getOnlyEntryData(CC4Group* const this, const C4Gr return entry->data; } -static C4GroupHeader* cc4group_getHeader(CC4Group* const this, const C4GroupEntryData* entry) +static C4GroupHeader* cc4group_getHeader(CC4Group* const this, const C4GroupEntryData* const entry) { assert(entry->core.Directory); @@ -1782,7 +1782,7 @@ static C4GroupHeader* cc4group_getHeader(CC4Group* const this, const C4GroupEntr return entry->header; } -static GroupEntryList* cc4group_getChildren(CC4Group* const this, const C4GroupEntryData* entry) +static GroupEntryList* cc4group_getChildren(CC4Group* const this, const C4GroupEntryData* const entry) { if(entry->children == NULL) { @@ -1805,7 +1805,7 @@ static GroupEntryList* cc4group_getChildren(CC4Group* const this, const C4GroupE return entry->children; } -static bool cc4group_getEntryData(CC4Group* const this, const char* const entryPath, const void** const data, size_t* size) +static bool cc4group_getEntryData(CC4Group* const this, const char* const entryPath, const void** const data, size_t* const size) { assert(this); assert(data); @@ -1969,7 +1969,7 @@ static bool cc4group_bufferedWriteToCallback(WriteCallback* const callback, cons return true; } -static bool cc4group_deflateToCallback(WriteCallback* const callback, const void* const data, size_t size, int flushMode, int expectedRet) +static bool cc4group_deflateToCallback(WriteCallback* const callback, const void* const data, size_t const size, int const flushMode, int const expectedRet) { assert(callback); assert(data || size == 0); @@ -2187,7 +2187,7 @@ ret: return success; } -static bool cc4group_writeToFdCallback(const void* const data, size_t const size, void* arg) +static bool cc4group_writeToFdCallback(const void* const data, size_t const size, void* const arg) { for(;;) { @@ -2205,12 +2205,12 @@ static bool cc4group_writeToFdCallback(const void* const data, size_t const size } } -static bool cc4group_writeToFilePointerCallback(const void* const data, size_t const size, void* arg) +static bool cc4group_writeToFilePointerCallback(const void* const data, size_t const size, void* const arg) { return fwrite(data, 1, size, arg) == size; } -static bool cc4group_saveToFilePointer(CC4Group* const this, FILE* file) +static bool cc4group_saveToFilePointer(CC4Group* const this, FILE* const file) { return cc4group_saveWithWriteCallback(this, cc4group_writeToFilePointerCallback, file, 0); } @@ -2382,7 +2382,7 @@ static char* cc4group_splitParentAndChildPaths(char* const combinedPath, const c } } -static bool cc4group_getParentAndChildEntries(CC4Group* const this, const char* const path, const C4GroupEntryData** parentEntry, GroupEntryListEntry** childEntry) +static bool cc4group_getParentAndChildEntries(CC4Group* const this, const char* const path, const C4GroupEntryData** parentEntry, GroupEntryListEntry** const childEntry) { const C4GroupEntryData* parent; -- cgit v1.2.3-54-g00ecf