diff --git a/.clang-format b/.clang-format index 92399ef..56cc685 100644 --- a/.clang-format +++ b/.clang-format @@ -2,7 +2,8 @@ BasedOnStyle: LLVM AccessModifierOffset: -4 AlignAfterOpenBracket: Align -AlignConsecutiveAssignments: None +AlignConsecutiveAssignments: Consecutive +AlignConsecutiveMacros: AcrossEmptyLinesAndComments AlignOperands: Align AllowAllArgumentsOnNextLine: false AllowAllConstructorInitializersOnNextLine: false @@ -56,7 +57,7 @@ SpaceBeforeInheritanceColon: true SpaceBeforeParens: ControlStatements SpaceBeforeRangeBasedForLoopColon: true SpaceInEmptyParentheses: false -SpacesBeforeTrailingComments: 0 +SpacesBeforeTrailingComments: 1 SpacesInAngles: false SpacesInCStyleCastParentheses: false SpacesInContainerLiterals: false diff --git a/source/ElfUtils.cpp b/source/ElfUtils.cpp index bb5795a..161671f 100644 --- a/source/ElfUtils.cpp +++ b/source/ElfUtils.cpp @@ -13,7 +13,7 @@ int32_t LoadFileToMem(const char *relativefilepath, char **fileOut, uint32_t *sizeOut) { char path[256]; - int result = 0; + int result = 0; char *sdRootPath = nullptr; if (!WHBMountSdCard()) { DEBUG_FUNCTION_LINE("Failed to mount SD Card..."); @@ -39,7 +39,7 @@ exit: } uint32_t load_loader_elf_from_sd(unsigned char *baseAddress, const char *relativePath) { - char *elf_data = nullptr; + char *elf_data = nullptr; uint32_t fileSize = 0; if (LoadFileToMem(relativePath, &elf_data, &fileSize) != 0) { OSFatal("Failed to load hook_payload.elf from the SD Card."); @@ -83,7 +83,7 @@ uint32_t load_loader_elf(unsigned char *baseAddress, char *elf_data, uint32_t fi } uint32_t p_paddr = phdrs[i].p_paddr + (uint32_t) baseAddress; - image = (uint8_t *) (elf_data + phdrs[i].p_offset); + image = (uint8_t *) (elf_data + phdrs[i].p_offset); memcpy((void *) p_paddr, image, phdrs[i].p_filesz); DCFlushRange((void *) p_paddr, phdrs[i].p_filesz); @@ -112,9 +112,9 @@ uint32_t load_loader_elf(unsigned char *baseAddress, char *elf_data, uint32_t fi bool ElfUtils::doRelocation(std::vector> &relocData, relocation_trampolin_entry_t *tramp_data, uint32_t tramp_length) { for (auto const &curReloc : relocData) { - std::string functionName = curReloc->getName(); - std::string rplName = curReloc->getImportRPLInformation()->getName(); - int32_t isData = curReloc->getImportRPLInformation()->isData(); + std::string functionName = curReloc->getName(); + std::string rplName = curReloc->getImportRPLInformation()->getName(); + int32_t isData = curReloc->getImportRPLInformation()->isData(); OSDynLoad_Module rplHandle = nullptr; @@ -149,7 +149,7 @@ bool ElfUtils::elfLinkOne(char type, size_t offset, int32_t addend, uint32_t des return true; } auto target = destination + offset; - auto value = symbol_addr + addend; + auto value = symbol_addr + addend; auto relValue = value - static_cast(target); @@ -243,10 +243,10 @@ bool ElfUtils::elfLinkOne(char type, size_t offset, int32_t addend, uint32_t des return false; } - freeSlot->trampolin[0] = 0x3D600000 | ((((uint32_t) value) >> 16) & 0x0000FFFF);// lis r11, real_addr@h - freeSlot->trampolin[1] = 0x616B0000 | (((uint32_t) value) & 0x0000ffff); // ori r11, r11, real_addr@l - freeSlot->trampolin[2] = 0x7D6903A6; // mtctr r11 - freeSlot->trampolin[3] = 0x4E800420; // bctr + freeSlot->trampolin[0] = 0x3D600000 | ((((uint32_t) value) >> 16) & 0x0000FFFF); // lis r11, real_addr@h + freeSlot->trampolin[1] = 0x616B0000 | (((uint32_t) value) & 0x0000ffff); // ori r11, r11, real_addr@l + freeSlot->trampolin[2] = 0x7D6903A6; // mtctr r11 + freeSlot->trampolin[3] = 0x4E800420; // bctr DCFlushRange((void *) freeSlot->trampolin, sizeof(freeSlot->trampolin)); ICInvalidateRange((unsigned char *) freeSlot->trampolin, sizeof(freeSlot->trampolin)); @@ -257,8 +257,8 @@ bool ElfUtils::elfLinkOne(char type, size_t offset, int32_t addend, uint32_t des freeSlot->status = RELOC_TRAMP_IMPORT_DONE; } auto symbolValue = (uint32_t) & (freeSlot->trampolin[0]); - value = symbolValue + addend; - distance = static_cast(value) - static_cast(target); + value = symbolValue + addend; + distance = static_cast(value) - static_cast(target); } } diff --git a/source/common/dynamic_linking_defines.h b/source/common/dynamic_linking_defines.h index 9ef300f..47889c7 100644 --- a/source/common/dynamic_linking_defines.h +++ b/source/common/dynamic_linking_defines.h @@ -46,8 +46,8 @@ typedef struct _dyn_linking_import_t { typedef struct _dyn_linking_relocation_entry_t { dyn_linking_function_t *functionEntry = nullptr; - dyn_linking_import_t *importEntry = nullptr; - void *destination = NULL; + dyn_linking_import_t *importEntry = nullptr; + void *destination = NULL; char type{}; size_t offset{}; int32_t addend{}; diff --git a/source/fs/CFile.cpp b/source/fs/CFile.cpp index a5a141e..eb63a80 100644 --- a/source/fs/CFile.cpp +++ b/source/fs/CFile.cpp @@ -6,10 +6,10 @@ #include CFile::CFile() { - iFd = -1; + iFd = -1; mem_file = NULL; filesize = 0; - pos = 0; + pos = 0; } CFile::CFile(const std::string &filepath, eOpenTypes mode) { @@ -35,16 +35,16 @@ int32_t CFile::open(const std::string &filepath, eOpenTypes mode) { switch (mode) { default: - case ReadOnly:// file must exist + case ReadOnly: // file must exist openMode = O_RDONLY; break; - case WriteOnly:// file will be created / zerod + case WriteOnly: // file will be created / zerod openMode = O_TRUNC | O_CREAT | O_WRONLY; break; - case ReadWrite:// file must exist + case ReadWrite: // file must exist openMode = O_RDWR; break; - case Append:// append to file, file will be created if missing. write only + case Append: // append to file, file will be created if missing. write only openMode = O_CREAT | O_APPEND | O_WRONLY; break; } @@ -77,10 +77,10 @@ void CFile::close() { if (iFd >= 0) ::close(iFd); - iFd = -1; + iFd = -1; mem_file = NULL; filesize = 0; - pos = 0; + pos = 0; } int32_t CFile::read(uint8_t *ptr, size_t size) { @@ -127,7 +127,7 @@ int32_t CFile::write(const uint8_t *ptr, size_t size) { } int32_t CFile::seek(long int offset, int32_t origin) { - int32_t ret = 0; + int32_t ret = 0; int64_t newPos = pos; if (origin == SEEK_SET) { @@ -158,7 +158,7 @@ int32_t CFile::seek(long int offset, int32_t origin) { int32_t CFile::fwrite(const char *format, ...) { char tmp[512]; - tmp[0] = 0; + tmp[0] = 0; int32_t result = -1; va_list va; diff --git a/source/fs/DirList.cpp b/source/fs/DirList.cpp index a18f048..3198efb 100644 --- a/source/fs/DirList.cpp +++ b/source/fs/DirList.cpp @@ -37,9 +37,9 @@ #include DirList::DirList() { - Flags = 0; + Flags = 0; Filter = 0; - Depth = 0; + Depth = 0; } DirList::DirList(const std::string &path, const char *filter, uint32_t flags, uint32_t maxDepth) { @@ -55,9 +55,9 @@ BOOL DirList::LoadPath(const std::string &folder, const char *filter, uint32_t f if (folder.empty()) return false; - Flags = flags; + Flags = flags; Filter = filter; - Depth = maxDepth; + Depth = maxDepth; std::string folderpath(folder); uint32_t length = folderpath.size(); @@ -82,14 +82,14 @@ BOOL DirList::InternalLoadPath(std::string &folderpath) { return false; struct dirent *dirent = NULL; - DIR *dir = NULL; + DIR *dir = NULL; dir = opendir(folderpath.c_str()); if (dir == NULL) return false; while ((dirent = readdir(dir)) != 0) { - BOOL isDir = dirent->d_type & DT_DIR; + BOOL isDir = dirent->d_type & DT_DIR; const char *filename = dirent->d_name; if (isDir) { diff --git a/source/fs/DirList.h b/source/fs/DirList.h index 749d9de..bd1cd90 100644 --- a/source/fs/DirList.h +++ b/source/fs/DirList.h @@ -93,8 +93,8 @@ public: //! Enum for search/filter flags enum { - Files = 0x01, - Dirs = 0x02, + Files = 0x01, + Dirs = 0x02, CheckSubfolders = 0x08, }; diff --git a/source/main.cpp b/source/main.cpp index a8948d3..23cd621 100644 --- a/source/main.cpp +++ b/source/main.cpp @@ -110,7 +110,7 @@ int main(int argc, char **argv) { auto handle = IOS_Open("/dev/mcp", IOS_OPEN_READ); if (handle >= 0) { - int in = 0xF9;// IPC_CUSTOM_COPY_ENVIRONMENT_PATH + int in = 0xF9; // IPC_CUSTOM_COPY_ENVIRONMENT_PATH if (IOS_Ioctl(handle, 100, &in, sizeof(in), environmentPath, sizeof(environmentPath)) == IOS_ERROR_OK) { DEBUG_FUNCTION_LINE("Boot into %s", environmentPath); } @@ -129,17 +129,17 @@ int main(int argc, char **argv) { if (strncmp(environmentPath, "fs:/vol/external01/wiiu/environments/", strlen("fs:/vol/external01/wiiu/environments/")) != 0) { DirList environmentDirs("fs:/vol/external01/wiiu/environments/", nullptr, DirList::Dirs, 1); - bool forceMenu = true; - auto res = getFileContent(AUTOBOOT_CONFIG_PATH); + bool forceMenu = true; + auto res = getFileContent(AUTOBOOT_CONFIG_PATH); auto autobootIndex = -1; if (res) { DEBUG_FUNCTION_LINE("Got result %s", res->c_str()); for (int i = 0; i < environmentDirs.GetFilecount(); i++) { if (environmentDirs.GetFilename(i) == res.value()) { DEBUG_FUNCTION_LINE("Found environment %s from config at index %d", res.value().c_str(), i); - autobootIndex = i; + autobootIndex = i; environment_path = environmentDirs.GetFilepath(i); - forceMenu = false; + forceMenu = false; break; } } @@ -253,7 +253,7 @@ int main(int argc, char **argv) { std::string EnvironmentSelectionScreen(const std::map &payloads, int32_t autobootIndex) { OSScreenInit(); - uint32_t tvBufferSize = OSScreenGetBufferSizeEx(SCREEN_TV); + uint32_t tvBufferSize = OSScreenGetBufferSizeEx(SCREEN_TV); uint32_t drcBufferSize = OSScreenGetBufferSizeEx(SCREEN_DRC); auto *screenBuffer = (uint8_t *) memalign(0x100, tvBufferSize + drcBufferSize); @@ -272,7 +272,7 @@ std::string EnvironmentSelectionScreen(const std::map DrawUtils::initFont(); uint32_t selected = autobootIndex > 0 ? autobootIndex : 0; - int autoBoot = autobootIndex; + int autoBoot = autobootIndex; bool redraw = true; while (true) { @@ -293,10 +293,10 @@ std::string EnvironmentSelectionScreen(const std::map break; } else if (vpad.trigger & VPAD_BUTTON_X) { autoBoot = -1; - redraw = true; + redraw = true; } else if (vpad.trigger & VPAD_BUTTON_Y) { autoBoot = selected; - redraw = true; + redraw = true; } if (redraw) { @@ -305,7 +305,7 @@ std::string EnvironmentSelectionScreen(const std::map // draw buttons uint32_t index = 8 + 24 + 8 + 4; - uint32_t i = 0; + uint32_t i = 0; if (!payloads.empty()) { for (auto const &[key, val] : payloads) { if (i == selected) { diff --git a/source/module/ImportRPLInformation.h b/source/module/ImportRPLInformation.h index a4bd92f..4e3c42f 100644 --- a/source/module/ImportRPLInformation.h +++ b/source/module/ImportRPLInformation.h @@ -27,7 +27,7 @@ class ImportRPLInformation { public: explicit ImportRPLInformation(std::string name, bool isData = false) { - this->name = std::move(name); + this->name = std::move(name); this->_isData = isData; } @@ -47,7 +47,7 @@ public: rplName = rawSectionName.substr(fimport.size()); } else if (std::equal(dimport.begin(), dimport.end(), rawSectionName.begin())) { rplName = rawSectionName.substr(dimport.size()); - data = true; + data = true; } else { DEBUG_FUNCTION_LINE("invalid section name\n"); return std::nullopt; diff --git a/source/module/ModuleData.h b/source/module/ModuleData.h index ea0f1d7..82ad360 100644 --- a/source/module/ModuleData.h +++ b/source/module/ModuleData.h @@ -63,7 +63,7 @@ public: private: std::vector> relocation_data_list; - uint32_t entrypoint = 0; + uint32_t entrypoint = 0; uint32_t startAddress = 0; - uint32_t endAddress = 0; + uint32_t endAddress = 0; }; diff --git a/source/module/ModuleDataFactory.cpp b/source/module/ModuleDataFactory.cpp index 027e015..8c1aab4 100644 --- a/source/module/ModuleDataFactory.cpp +++ b/source/module/ModuleDataFactory.cpp @@ -35,7 +35,7 @@ ModuleDataFactory::load(const std::string &path, uint32_t destination_address_en return std::nullopt; } - uint32_t sec_num = reader.sections.size(); + uint32_t sec_num = reader.sections.size(); auto **destinations = (uint8_t **) malloc(sizeof(uint8_t *) * sec_num); uint32_t sizeOfModule = 0; @@ -55,7 +55,7 @@ ModuleDataFactory::load(const std::string &path, uint32_t destination_address_en return {}; } - uint32_t baseOffset = (destination_address_end - sizeOfModule) & 0xFFFFFF00; + uint32_t baseOffset = (destination_address_end - sizeOfModule) & 0xFFFFFF00; uint32_t startAddress = baseOffset; uint32_t offset_text = baseOffset; @@ -63,7 +63,7 @@ ModuleDataFactory::load(const std::string &path, uint32_t destination_address_en uint32_t entrypoint = offset_text + (uint32_t) reader.get_entry() - 0x02000000; - uint32_t totalSize = 0; + uint32_t totalSize = 0; uint32_t endAddress = 0; for (uint32_t i = 0; i < sec_num; ++i) { diff --git a/source/module/RelocationData.h b/source/module/RelocationData.h index 0a181a3..06cf5c2 100644 --- a/source/module/RelocationData.h +++ b/source/module/RelocationData.h @@ -26,11 +26,11 @@ class RelocationData { public: RelocationData(char type, size_t offset, int32_t addend, void *destination, std::string name, std::shared_ptr rplInfo) : rplInfo(std::move(rplInfo)) { - this->type = type; - this->offset = offset; - this->addend = addend; + this->type = type; + this->offset = offset; + this->addend = addend; this->destination = destination; - this->name = std::move(name); + this->name = std::move(name); } ~RelocationData() = default; diff --git a/source/utils/DrawUtils.cpp b/source/utils/DrawUtils.cpp index d59cca7..550f4dc 100644 --- a/source/utils/DrawUtils.cpp +++ b/source/utils/DrawUtils.cpp @@ -9,26 +9,26 @@ #include FT_FREETYPE_H // buffer width -#define TV_WIDTH 0x500 +#define TV_WIDTH 0x500 #define DRC_WIDTH 0x380 bool DrawUtils::isBackBuffer; -uint8_t *DrawUtils::tvBuffer = nullptr; -uint32_t DrawUtils::tvSize = 0; +uint8_t *DrawUtils::tvBuffer = nullptr; +uint32_t DrawUtils::tvSize = 0; uint8_t *DrawUtils::drcBuffer = nullptr; -uint32_t DrawUtils::drcSize = 0; +uint32_t DrawUtils::drcSize = 0; // Don't put those into the class or we have to include ft everywhere static FT_Library ft_lib = nullptr; -static FT_Face ft_face = nullptr; -static Color font_col = {0xFFFFFFFF}; +static FT_Face ft_face = nullptr; +static Color font_col = {0xFFFFFFFF}; void DrawUtils::initBuffers(void *tvBuffer, uint32_t tvSize, void *drcBuffer, uint32_t drcSize) { - DrawUtils::tvBuffer = (uint8_t *) tvBuffer; - DrawUtils::tvSize = tvSize; + DrawUtils::tvBuffer = (uint8_t *) tvBuffer; + DrawUtils::tvSize = tvSize; DrawUtils::drcBuffer = (uint8_t *) drcBuffer; - DrawUtils::drcSize = drcSize; + DrawUtils::drcSize = drcSize; } void DrawUtils::beginDraw() { @@ -70,11 +70,11 @@ void DrawUtils::drawPixel(uint32_t x, uint32_t y, uint8_t r, uint8_t g, uint8_t i += drcSize / 2; } if (a == 0xFF) { - drcBuffer[i] = r; + drcBuffer[i] = r; drcBuffer[i + 1] = g; drcBuffer[i + 2] = b; } else { - drcBuffer[i] = r * opacity + drcBuffer[i] * (1 - opacity); + drcBuffer[i] = r * opacity + drcBuffer[i] * (1 - opacity); drcBuffer[i + 1] = g * opacity + drcBuffer[i + 1] * (1 - opacity); drcBuffer[i + 2] = b * opacity + drcBuffer[i + 2] * (1 - opacity); } @@ -89,11 +89,11 @@ void DrawUtils::drawPixel(uint32_t x, uint32_t y, uint8_t r, uint8_t g, uint8_t i += tvSize / 2; } if (a == 0xFF) { - tvBuffer[i] = r; + tvBuffer[i] = r; tvBuffer[i + 1] = g; tvBuffer[i + 2] = b; } else { - tvBuffer[i] = r * opacity + tvBuffer[i] * (1 - opacity); + tvBuffer[i] = r * opacity + tvBuffer[i] * (1 - opacity); tvBuffer[i + 1] = g * opacity + tvBuffer[i + 1] * (1 - opacity); tvBuffer[i + 2] = b * opacity + tvBuffer[i + 2] * (1 - opacity); } @@ -124,8 +124,8 @@ void DrawUtils::drawBitmap(uint32_t x, uint32_t y, uint32_t target_width, uint32 } uint32_t dataPos = __builtin_bswap32(*(uint32_t *) &(data[0x0A])); - uint32_t width = __builtin_bswap32(*(uint32_t *) &(data[0x12])); - uint32_t height = __builtin_bswap32(*(uint32_t *) &(data[0x16])); + uint32_t width = __builtin_bswap32(*(uint32_t *) &(data[0x12])); + uint32_t height = __builtin_bswap32(*(uint32_t *) &(data[0x16])); if (dataPos == 0) { dataPos = 54; @@ -166,17 +166,17 @@ void DrawUtils::drawPNG(uint32_t x, uint32_t y, const uint8_t *data) { png_read_info(png_ptr, info_ptr); - uint32_t width = 0; + uint32_t width = 0; uint32_t height = 0; - int bitDepth = 0; - int colorType = -1; + int bitDepth = 0; + int colorType = -1; uint32_t retval = png_get_IHDR(png_ptr, info_ptr, &width, &height, &bitDepth, &colorType, NULL, NULL, NULL); if (retval != 1) { return; } uint32_t bytesPerRow = png_get_rowbytes(png_ptr, info_ptr); - uint8_t *rowData = new uint8_t[bytesPerRow]; + uint8_t *rowData = new uint8_t[bytesPerRow]; for (uint32_t yy = y; yy < y + height; yy++) { png_read_row(png_ptr, (png_bytep) rowData, NULL); @@ -197,7 +197,7 @@ void DrawUtils::drawPNG(uint32_t x, uint32_t y, const uint8_t *data) { } void DrawUtils::initFont() { - void *font = NULL; + void *font = NULL; uint32_t size = 0; OSGetSharedData(OS_SHAREDDATATYPE_FONT_STANDARD, 0, &font, &size); @@ -255,7 +255,7 @@ void DrawUtils::print(uint32_t x, uint32_t y, const char *string, bool alignRigh void DrawUtils::print(uint32_t x, uint32_t y, const wchar_t *string, bool alignRight) { FT_GlyphSlot slot = ft_face->glyph; - FT_Vector pen = {(int) x, (int) y}; + FT_Vector pen = {(int) x, (int) y}; if (alignRight) { pen.x -= getTextWidth(string); @@ -298,7 +298,7 @@ uint32_t DrawUtils::getTextWidth(const char *string) { uint32_t DrawUtils::getTextWidth(const wchar_t *string) { FT_GlyphSlot slot = ft_face->glyph; - uint32_t width = 0; + uint32_t width = 0; for (; *string; string++) { FT_Load_Glyph(ft_face, FT_Get_Char_Index(ft_face, *string), FT_LOAD_BITMAP_METRICS_ONLY); diff --git a/source/utils/DrawUtils.h b/source/utils/DrawUtils.h index 10b211b..b30aa56 100644 --- a/source/utils/DrawUtils.h +++ b/source/utils/DrawUtils.h @@ -3,7 +3,7 @@ #include // visible screen sizes -#define SCREEN_WIDTH 854 +#define SCREEN_WIDTH 854 #define SCREEN_HEIGHT 480 union Color { diff --git a/source/utils/StringTools.cpp b/source/utils/StringTools.cpp index f2f9de3..726264c 100644 --- a/source/utils/StringTools.cpp +++ b/source/utils/StringTools.cpp @@ -84,7 +84,7 @@ const wchar_t *StringTools::wfmt(const char *format, ...) { static char tmp[512]; static wchar_t strWChar[512]; strWChar[0] = 0; - tmp[0] = 0; + tmp[0] = 0; if (!format) return (const wchar_t *) strWChar; @@ -97,7 +97,7 @@ const wchar_t *StringTools::wfmt(const char *format, ...) { if ((vsprintf(tmp, format, va) >= 0)) { int bt; int32_t strlength = strlen(tmp); - bt = mbstowcs(strWChar, tmp, (strlength < 512) ? strlength : 512); + bt = mbstowcs(strWChar, tmp, (strlength < 512) ? strlength : 512); if (bt > 0) { strWChar[bt] = 0; @@ -111,13 +111,13 @@ const wchar_t *StringTools::wfmt(const char *format, ...) { int32_t StringTools::strprintf(std::string &str, const char *format, ...) { static char tmp[512]; - tmp[0] = 0; + tmp[0] = 0; int32_t result = 0; va_list va; va_start(va, format); if ((vsprintf(tmp, format, va) >= 0)) { - str = tmp; + str = tmp; result = str.size(); } va_end(va); @@ -214,7 +214,7 @@ const char *StringTools::FullpathToFilename(const char *path) { if (!path) return path; - const char *ptr = path; + const char *ptr = path; const char *Filename = ptr; while (*ptr != '\0') { @@ -243,20 +243,20 @@ void StringTools::RemoveDoubleSlashs(std::string &str) { // You must free the result if result is non-NULL. char *StringTools::str_replace(char *orig, char *rep, char *with) { - char *result; // the return string - char *ins; // the next insert point - char *tmp; // varies - int len_rep; // length of rep (the string to remove) - int len_with; // length of with (the string to replace rep with) - int len_front;// distance between rep and end of last rep - int count; // number of replacements + char *result; // the return string + char *ins; // the next insert point + char *tmp; // varies + int len_rep; // length of rep (the string to remove) + int len_with; // length of with (the string to replace rep with) + int len_front; // distance between rep and end of last rep + int count; // number of replacements // sanity checks and initialization if (!orig || !rep) return NULL; len_rep = strlen(rep); if (len_rep == 0) - return NULL;// empty rep causes infinite loop during count + return NULL; // empty rep causes infinite loop during count if (!with) with = (char *) ""; len_with = strlen(with); @@ -278,11 +278,11 @@ char *StringTools::str_replace(char *orig, char *rep, char *with) { // ins points to the next occurrence of rep in orig // orig points to the remainder of orig after "end of rep" while (count--) { - ins = strstr(orig, rep); + ins = strstr(orig, rep); len_front = ins - orig; - tmp = strncpy(tmp, orig, len_front) + len_front; - tmp = strcpy(tmp, with) + len_with; - orig += len_front + len_rep;// move to next "end of rep" + tmp = strncpy(tmp, orig, len_front) + len_front; + tmp = strcpy(tmp, with) + len_with; + orig += len_front + len_rep; // move to next "end of rep" } strcpy(tmp, orig); return result; diff --git a/source/utils/logger.c b/source/utils/logger.c index 0ed05e6..f700806 100644 --- a/source/utils/logger.c +++ b/source/utils/logger.c @@ -5,17 +5,17 @@ #include uint32_t moduleLogInit = false; -uint32_t cafeLogInit = false; -uint32_t udpLogInit = false; -#endif// DEBUG +uint32_t cafeLogInit = false; +uint32_t udpLogInit = false; +#endif // DEBUG void initLogging() { #ifdef DEBUG if (!(moduleLogInit = WHBLogModuleInit())) { cafeLogInit = WHBLogCafeInit(); - udpLogInit = WHBLogUdpInit(); + udpLogInit = WHBLogUdpInit(); } -#endif// DEBUG +#endif // DEBUG } void deinitLogging() { @@ -32,5 +32,5 @@ void deinitLogging() { WHBLogUdpDeinit(); udpLogInit = false; } -#endif// DEBUG +#endif // DEBUG } \ No newline at end of file diff --git a/source/utils/logger.h b/source/utils/logger.h index 2321b2b..061d52e 100644 --- a/source/utils/logger.h +++ b/source/utils/logger.h @@ -9,8 +9,8 @@ extern "C" { #ifdef DEBUG -#define __FILENAME_X__ (strrchr(__FILE__, '\\') ? strrchr(__FILE__, '\\') + 1 : __FILE__) -#define __FILENAME__ (strrchr(__FILE__, '/') ? strrchr(__FILE__, '/') + 1 : __FILENAME_X__) +#define __FILENAME_X__ (strrchr(__FILE__, '\\') ? strrchr(__FILE__, '\\') + 1 : __FILE__) +#define __FILENAME__ (strrchr(__FILE__, '/') ? strrchr(__FILE__, '/') + 1 : __FILENAME_X__) #define DEBUG_FUNCTION_LINE_VERBOSE(FMT, ARGS...) while (0) @@ -28,9 +28,9 @@ extern "C" { #define DEBUG_FUNCTION_LINE_VERBOSE(FMT, ARGS...) while (0) -#define DEBUG_FUNCTION_LINE(FMT, ARGS...) while (0) +#define DEBUG_FUNCTION_LINE(FMT, ARGS...) while (0) -#define DEBUG_FUNCTION_LINE_WRITE(FMT, ARGS...) while (0) +#define DEBUG_FUNCTION_LINE_WRITE(FMT, ARGS...) while (0) #endif