all: use uint8_t instead of void

myfreeer · myfreeer · commit 08b05e4e0315 · 2018-04-19T12:23:38.000+08:00
CMakeLists: better setting defaults
pak_defs: prefer fast ints in custom structs
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,14 +1,17 @@
-cmake_minimum_required (VERSION 2.8)
-project (chrome-pak C)
+cmake_minimum_required(VERSION 2.8)
+project(chrome-pak C)
 option(LGPL "Use custom startfiles on windows for smaller binary, requiring GNU Lesser General Public License 2.1+." ON)
-
-set (CMAKE_BUILD_TYPE Release)
+if (NOT CMAKE_BUILD_TYPE)
+    set(CMAKE_BUILD_TYPE "Release" CACHE STRING "Choose the type of build, options are: Debug Release RelWithDebInfo MinSizeRel." FORCE)
+endif (NOT CMAKE_BUILD_TYPE)
 if ("${CMAKE_C_COMPILER_ID}" STREQUAL "GNU")
-  set (CMAKE_C_FLAGS "-O3 -Os -s -pipe -Wall -Wextra -fmerge-all-constants -Wl,--gc-sections,--build-id=none")
-  if (WIN32 AND LGPL)
-    set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -nostartfiles -D_LGPL")
-  endif ()
-  set (CMAKE_EXE_LINKER_FLAGS "${CMAKE_C_FLAGS}")
+    set(CMAKE_C_FLAGS "-O3 -Os -pipe -Wall -Wextra -fmerge-all-constants -Wl,--gc-sections,--build-id=none")
+    set(CMAKE_C_FLAGS_DEBUG "-g")
+    set(CMAKE_C_FLAGS_RELEASE "-s")
+    if (WIN32 AND LGPL)
+        set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -nostartfiles -D_LGPL")
+    endif ()
+    set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_C_FLAGS}")
 endif ()
-aux_source_directory (${CMAKE_CURRENT_SOURCE_DIR} DIR_SRCS)
-add_executable (pak ${DIR_SRCS})
+aux_source_directory(${CMAKE_CURRENT_SOURCE_DIR} DIR_SRCS)
+add_executable(pak ${DIR_SRCS})
diff --git a/main.c b/main.c
@@ -64,7 +64,7 @@ int pakPackIndexFile(char *indexPath, char *outputFilePath) {
         index = strrchr(indexPath, '/');
     }
     if (index != NULL) {
-        filesPath = calloc(index - indexPath + 2, sizeof(char));
+        filesPath = calloc(index - indexPath + 2, sizeof(uint8_t));
         if (filesPath == NULL) {
             returnCode = 5;
             goto PAK_PACK_INDEX_END;
@@ -85,7 +85,7 @@ int pakPackIndexFile(char *indexPath, char *outputFilePath) {
     }
 
     // workaround outputFilePath="" after pakPack()
-    outputFilePath2 = calloc(strlen(outputFilePath) + 1, sizeof(char));
+    outputFilePath2 = calloc(strlen(outputFilePath) + 1, sizeof(uint8_t));
     if (pakIndexFile.buffer == NULL) {
         returnCode = 7;
         goto PAK_PACK_INDEX_END;
diff --git a/pak_defs.h b/pak_defs.h
@@ -63,16 +63,16 @@ typedef struct PakAlias {
 #define PAK_ERROR_BROKEN_INDEX "Error: Probably broken pak index file."
 
 typedef struct MyPakHeader {
-    uint32_t version;
-    uint32_t resource_count;
-    uint16_t alias_count;
-    uint8_t encoding;
-    uint8_t size;
+    uint_fast32_t version;
+    uint_fast32_t resource_count;
+    uint_fast16_t alias_count;
+    uint_fast8_t encoding;
+    uint_fast8_t size;
 } MyPakHeader;
 
 typedef struct PakFile {
-    uint16_t id;
-    uint32_t size;
+    uint_fast16_t id;
+    uint_fast32_t size;
     void *buffer;
 } PakFile;
 
diff --git a/pak_file.c b/pak_file.c
@@ -1,15 +1,15 @@
 #include "pak_file.h"
 PakFile pakPackFiles(MyPakHeader *myHeader, PakFile *pakResFile,
                      PakAlias *pakAlias) {
-    void *buffer = NULL;
+    uint8_t *buffer = NULL;
     uint32_t size = myHeader->size;
     uint32_t entrySize = (myHeader->resource_count + 1) * PAK_ENTRY_SIZE;
     uint32_t aliasSize = myHeader->alias_count * PAK_ALIAS_SIZE;
     size += entrySize + aliasSize;
     for (uint32_t i = 0; i < myHeader->resource_count; i++) {
         size += (pakResFile + i)->size;
     }
-    buffer = calloc(size, sizeof(char));
+    buffer = calloc(size, sizeof(uint8_t));
     if (buffer == NULL)
         return NULL_File;
     uint32_t offset = pakWriteHeader(myHeader, buffer);
@@ -19,7 +19,7 @@ PakFile pakPackFiles(MyPakHeader *myHeader, PakFile *pakResFile,
     }
 
     PakEntry *enrtyPtr = (PakEntry *)(buffer + offset);
-    void *filePtr = buffer + offset + entrySize + aliasSize;
+    uint8_t *filePtr = buffer + offset + entrySize + aliasSize;
     for (uint32_t i = 0; i < myHeader->resource_count; i++) {
         memcpy(filePtr, pakResFile->buffer, pakResFile->size);
         enrtyPtr->resource_id = pakResFile->id;
@@ -39,7 +39,7 @@ PakFile pakPackFiles(MyPakHeader *myHeader, PakFile *pakResFile,
     return pakFile;
 }
 
-PakFile pakGetFile(void *pakBuffer, uint16_t id) {
+PakFile pakGetFile(uint8_t *pakBuffer, uint16_t id) {
     PakFile pakFile = NULL_File;
     MyPakHeader myHeader;
     if (!pakParseHeader(pakBuffer, &myHeader)) {
@@ -70,7 +70,7 @@ PakFile pakGetFile(void *pakBuffer, uint16_t id) {
     return NULL_File;
 }
 
-PakFile *pakGetFiles(void *buffer) {
+PakFile *pakGetFiles(uint8_t *buffer) {
     PakFile *pakResFile = NULL;
     MyPakHeader myHeader;
     if (!pakParseHeader(buffer, &myHeader)) {
diff --git a/pak_file.h b/pak_file.h
@@ -26,14 +26,14 @@ PakFile pakPackFiles(MyPakHeader *myHeader, PakFile *pakResFile,
  * @param uint16_t *id - target file id.
  * @return PakFile - the target file.
  */
-PakFile pakGetFile(void *pakBuffer, uint16_t id);
+PakFile pakGetFile(uint8_t *pakBuffer, uint16_t id);
 
 /**
  * Get all files from pak, returns NULL on failure.
  * Note: this would allocate memory.
  * @param void* buffer - pointer to pak.
  * @return PakFile* - pointer to all files in pak.
  */
-PakFile *pakGetFiles(void *buffer);
+PakFile *pakGetFiles(uint8_t *buffer);
 
 #endif // __PAK_FILE_H__
diff --git a/pak_file_io.c b/pak_file_io.c
@@ -10,34 +10,32 @@ PakFile readFile(const char *fileName) {
 
     /* Get the number of bytes */
     fseeko(filePtr, 0, SEEK_END);
-    file.size = ftello(filePtr);
+    file.size = (uint32_t) ftello(filePtr);
 
     /* reset the file position indicator to
     the beginning of the file */
     fseeko(filePtr, 0, SEEK_SET);
 
     /* grab sufficient memory for the
     buffer to hold the text */
-    file.buffer = calloc(file.size + 1, sizeof(char));
+    file.buffer = calloc(file.size + 1, sizeof(uint8_t));
 
     /* memory error */
     if (file.buffer == NULL)
         return NULL_File;
 
     /* copy all the text into the buffer */
-    fread(file.buffer, sizeof(char), file.size, filePtr);
+    fread(file.buffer, sizeof(uint8_t), file.size, filePtr);
     fclose(filePtr);
 
-    /* free the memory we used for the buffer */
-    // free(buffer);
     return file;
 }
 
 bool writeFile(const char *fileName, const PakFile file) {
     FILE *filePtr = fopen(fileName, "wb");
     if (filePtr == NULL)
         return false;
-    const size_t result = fwrite(file.buffer, sizeof(char), file.size, filePtr);
+    const size_t result = fwrite(file.buffer, sizeof(uint8_t), file.size, filePtr);
     fclose(filePtr);
     return (result == file.size);
 }
diff --git a/pak_get_file_type.c b/pak_get_file_type.c
@@ -16,7 +16,7 @@ char *pakGetFileType(PakFile file) {
     for (unsigned int i = 0; i < FILE_TYPE_COUNT; i++)
         if (file.size > FILE_TYPES[i].size &&
             memcmp(file.buffer, FILE_TYPES[i].identifer, FILE_TYPES[i].size) ==
-                0)
+            0)
             return FILE_TYPES[i].type;
     return "";
 }
diff --git a/pak_header.c b/pak_header.c
@@ -28,7 +28,7 @@ unsigned int pakWriteHeader(MyPakHeader *myHeader, void *buffer) {
     if (myHeader->version == 5) {
         PakHeaderV5 *header = (PakHeaderV5 *)buffer;
         header->version = myHeader->version;
-        header->resource_count = myHeader->resource_count;
+        header->resource_count = (uint16_t) myHeader->resource_count;
         header->encoding = myHeader->encoding;
         header->alias_count = myHeader->alias_count;
     } else if (myHeader->version == 4) {
@@ -43,7 +43,7 @@ unsigned int pakWriteHeader(MyPakHeader *myHeader, void *buffer) {
     return myHeader->size;
 }
 
-bool pakCheckFormat(void *buffer, unsigned int size) {
+bool pakCheckFormat(uint8_t *buffer, unsigned int size) {
     MyPakHeader myHeader;
     if (!pakParseHeader(buffer, &myHeader)) {
         return false;
diff --git a/pak_header.h b/pak_header.h
@@ -27,6 +27,6 @@ unsigned int pakWriteHeader(MyPakHeader *myHeader, void *buffer);
  * @param unsigned int size - pak buffer size in bytes.
  * @return bool - succeed or not.
  */
-bool pakCheckFormat(void *buffer, unsigned int size);
+bool pakCheckFormat(uint8_t *buffer, unsigned int size);
 
 #endif // __PAK_HEADERS_H__
diff --git a/pak_pack.c b/pak_pack.c
@@ -1,5 +1,5 @@
 #include "pak_pack.h"
-bool pakUnpack(void *buffer, char *outputPath) {
+bool pakUnpack(uint8_t *buffer, char *outputPath) {
     MyPakHeader myHeader;
     if (!pakParseHeader(buffer, &myHeader)) {
         return false;
@@ -19,7 +19,7 @@ bool pakUnpack(void *buffer, char *outputPath) {
 #else
     mkdir(outputPath, 0777);
 #endif
-    char *pakIndexStr = calloc(PAK_BUFFER_BLOCK_SIZE, sizeof(char));
+    char *pakIndexStr = calloc(PAK_BUFFER_BLOCK_SIZE, sizeof(uint8_t));
     if (pakIndexStr == NULL) {
         free(files);
         return false;
@@ -87,8 +87,7 @@ PakFile pakPack(PakFile pakIndex, char *path) { // TODO
     PakFile pakFile = NULL_File;
     PakFile *resFiles = NULL;
     PakAlias *pakAlias = NULL;
-    // if (!sscanf(pakIndexBuf, "version=%u", &myHeader.version))
-    //	return NULL_File;
+
     uint32_t count = 0;
     uint32_t offset = sizeof(PAK_INDEX_GLOBAL_TAG) - 1;
     sscanf(pakIndexBuf + offset, " version=%u%n", &myHeader.version, &count);
@@ -122,7 +121,7 @@ PakFile pakPack(PakFile pakIndex, char *path) { // TODO
     } else {
         pakAliasIndex += sizeof(PAK_INDEX_ALIAS_TAG) - 1;
         myHeader.alias_count =
-            countChar(pakAliasIndex, pakIndexEnd - pakAliasIndex, '=');
+                (uint16_t) countChar(pakAliasIndex, pakIndexEnd - pakAliasIndex, '=');
     }
     myHeader.resource_count =
         countChar(pakEntryIndex, pakAliasIndex - pakEntryIndex, '=');
@@ -138,7 +137,7 @@ PakFile pakPack(PakFile pakIndex, char *path) { // TODO
     if (resFiles == NULL) {
         goto PAK_PACK_END;
     }
-    // uint32_t totalFileSize = 0;
+
     offset = 0;
     for (uint32_t i = 0; i < myHeader.resource_count; i++) {
         uint32_t id = 0;
@@ -155,8 +154,7 @@ PakFile pakPack(PakFile pakIndex, char *path) { // TODO
             myHeader.resource_count = i;
             goto PAK_PACK_END;
         }
-        resFiles[i].id = id;
-        // totalFileSize += resFiles[i].size;
+        resFiles[i].id = (uint16_t) id;
         //	printf("id=%u\tfile_name=%s\tpath=%s\tsize=%u\n",id,
         // fileNameBuf, pathBuf, resFiles[i].size);
     }
diff --git a/pak_pack.h b/pak_pack.h
@@ -25,7 +25,7 @@
  * @param char *outputPath - target path.
  * @return bool - succeed or not.
  */
-bool pakUnpack(void *buffer, char *outputPath);
+bool pakUnpack(uint8_t *buffer, char *outputPath);
 
 /**
  * Pack a pak file from target index (ini) file,

Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ char *pakGetFileType(PakFile file) {`
`16`	`16`	`for (unsigned int i = 0; i < FILE_TYPE_COUNT; i++)`
`17`	`17`	`if (file.size > FILE_TYPES[i].size &&`
`18`	`18`	`memcmp(file.buffer, FILE_TYPES[i].identifer, FILE_TYPES[i].size) ==`
`19`		`- 0)`
	`19`	`+ 0)`
`20`	`20`	`return FILE_TYPES[i].type;`
`21`	`21`	`return "";`
`22`	`22`	`}`