Format the code via clang-format

.clang-format

@@ -0,0 +1,67 @@
+# Generated from CLion C/C++ Code Style settings
+BasedOnStyle: LLVM
+AccessModifierOffset: -4
+AlignAfterOpenBracket: Align
+AlignConsecutiveAssignments: Consecutive
+AlignConsecutiveMacros: AcrossEmptyLinesAndComments
+AlignOperands: Align
+AllowAllArgumentsOnNextLine: false
+AllowAllConstructorInitializersOnNextLine: false
+AllowAllParametersOfDeclarationOnNextLine: false
+AllowShortBlocksOnASingleLine: Always
+AllowShortCaseLabelsOnASingleLine: false
+AllowShortFunctionsOnASingleLine: All
+AllowShortIfStatementsOnASingleLine: Always
+AllowShortLambdasOnASingleLine: All
+AllowShortLoopsOnASingleLine: true
+AlwaysBreakAfterReturnType: None
+AlwaysBreakTemplateDeclarations: Yes
+BreakBeforeBraces: Custom
+BraceWrapping:
+  AfterCaseLabel: false
+  AfterClass: false
+  AfterControlStatement: Never
+  AfterEnum: false
+  AfterFunction: false
+  AfterNamespace: false
+  AfterUnion: false
+  BeforeCatch: false
+  BeforeElse: false
+  IndentBraces: false
+  SplitEmptyFunction: false
+  SplitEmptyRecord: true
+BreakBeforeBinaryOperators: None
+BreakBeforeTernaryOperators: true
+BreakConstructorInitializers: BeforeColon
+BreakInheritanceList: BeforeColon
+ColumnLimit: 0
+CompactNamespaces: false
+ContinuationIndentWidth: 8
+IndentCaseLabels: true
+IndentPPDirectives: None
+IndentWidth: 4
+KeepEmptyLinesAtTheStartOfBlocks: true
+MaxEmptyLinesToKeep: 2
+NamespaceIndentation: All
+ObjCSpaceAfterProperty: false
+ObjCSpaceBeforeProtocolList: true
+PointerAlignment: Right
+ReflowComments: false
+SpaceAfterCStyleCast: true
+SpaceAfterLogicalNot: false
+SpaceAfterTemplateKeyword: false
+SpaceBeforeAssignmentOperators: true
+SpaceBeforeCpp11BracedList: false
+SpaceBeforeCtorInitializerColon: true
+SpaceBeforeInheritanceColon: true
+SpaceBeforeParens: ControlStatements
+SpaceBeforeRangeBasedForLoopColon: true
+SpaceInEmptyParentheses: false
+SpacesBeforeTrailingComments: 1
+SpacesInAngles: false
+SpacesInCStyleCastParentheses: false
+SpacesInContainerLiterals: false
+SpacesInParentheses: false
+SpacesInSquareBrackets: false
+TabWidth: 4
+UseTab: Never

.github/workflows/ci.yml

@@ -6,8 +6,16 @@ on:
       - master
     
 jobs:
+  clang-format:
+    runs-on: ubuntu-18.04
+    steps:
+    - uses: actions/checkout@v2
+    - name: clang-format
+      run: |
+        docker run --rm -v ${PWD}:/src  wiiuenv/clang-format:13.0.0-2 -r ./source
   build-binary:
     runs-on: ubuntu-18.04
+    needs: clang-format
     steps:
     - uses: actions/checkout@v2
     - name: build binary

.github/workflows/ci_non_master.yml

@@ -1,16 +0,0 @@
-name: Build binary
-
-on:
-  push:
-    branches-ignore:
-      - master
-    
-jobs:
-  build-binary:
-    runs-on: ubuntu-18.04
-    steps:
-    - uses: actions/checkout@v2
-    - name: build binary
-      run: |
-        docker build . -t builder
-        docker run --rm -v ${PWD}:/project builder make

.github/workflows/pr.yml

@@ -3,8 +3,16 @@ name: CI-PR
 on: [pull_request]
 
 jobs:
+  clang-format:
+    runs-on: ubuntu-18.04
+    steps:
+    - uses: actions/checkout@v2
+    - name: clang-format
+      run: |
+        docker run --rm -v ${PWD}:/src  wiiuenv/clang-format:13.0.0-2 -r ./source
   build-binary:
     runs-on: ubuntu-18.04
+    needs: clang-format
     steps:
     - uses: actions/checkout@v2
     - name: build binary

README.md

@@ -1,4 +1,6 @@
-# Wii U Plugin Loader Backend
+[![CI-Release](https://github.com/wiiu-env/WiiUPluginLoaderBackend/actions/workflows/ci.yml/badge.svg)](https://github.com/wiiu-env/WiiUPluginLoaderBackend/actions/workflows/ci.yml)
+
+# Wii U Plugin Loader Backend
 This is the Backend for the [WiiUPluginSystem](https://github.com/Maschell/WiiUPluginSystem). Check out the readme for more information about the Plugin System.
 
 ## Usage
@@ -46,6 +48,10 @@ docker run -it --rm -v ${PWD}:/project wiiupluginloaderbackend-builder make
 docker run -it --rm -v ${PWD}:/project wiiupluginloaderbackend-builder make clean
 ```
 
+## Format the code via docker
+
+`docker run --rm -v ${PWD}:/src wiiuenv/clang-format:13.0.0-2 -r ./source -i`
+
 # Credits
 - Maschell
 - orboditilt

source/PluginManagement.cpp

@@ -1,18 +1,18 @@
-#include <memory.h>
 #include <coreinit/cache.h>
 #include <coreinit/dynload.h>
 #include <coreinit/memdefaultheap.h>
+#include <memory.h>
 #include <memory>
 
 #include "patcher/hooks_patcher_static.h"
 #include "plugin/PluginContainer.h"
-#include "plugin/PluginMetaInformationFactory.h"
 #include "plugin/PluginInformationFactory.h"
+#include "plugin/PluginMetaInformationFactory.h"
 
-#include "utils/ElfUtils.h"
 #include "PluginManagement.h"
-#include "hooks.h"
 #include "globals.h"
+#include "hooks.h"
+#include "utils/ElfUtils.h"
 
 bool PluginManagement::doRelocation(const std::vector<std::shared_ptr<RelocationData>> &relocData, relocation_trampoline_entry_t *tramp_data, uint32_t tramp_length, uint32_t trampolineID) {
     std::map<std::string, OSDynLoad_Module> moduleHandleCache;
@@ -215,4 +215,3 @@ PluginManagement::loadPlugins(const std::vector<std::shared_ptr<PluginData>> &pl
     }
     return plugins;
 }
-

source/PluginManagement.h

@@ -1,11 +1,12 @@
 #pragma once
 
+#include "plugin/PluginContainer.h"
 #include <common/plugin_defines.h>
+#include <memory>
 #include <vector>
 
 class PluginManagement {
 public:
-
     static void doRelocations(const std::vector<std::shared_ptr<PluginContainer>> &plugins, relocation_trampoline_entry_t *trampData, uint32_t tramp_size);
 
     static void memsetBSS(const std::vector<std::shared_ptr<PluginContainer>> &plugins);

source/common/plugin_defines.h

@@ -17,8 +17,8 @@
 
 #pragma once
 
-#include <cstdint>
 #include <cstddef>
+#include <cstdint>
 #include <wums/defines/dynamic_linking_defines.h>
 #include <wums/defines/export_defines.h>
 #include <wums/defines/relocation_defines.h>

source/config/WUPSConfig.h

@@ -17,12 +17,12 @@
 
 #pragma once
 
-#include <string>
-#include <vector>
-#include <optional>
-#include <wups/config.h>
 #include "WUPSConfigCategory.h"
 #include "utils/logger.h"
+#include <optional>
+#include <string>
+#include <vector>
+#include <wups/config.h>
 
 class WUPSConfig {
 public:

source/config/WUPSConfigCategory.h

@@ -17,10 +17,10 @@
 
 #pragma once
 
+#include "WUPSConfigItem.h"
 #include <string>
 #include <vector>
 #include <wups/config.h>
-#include "WUPSConfigItem.h"
 
 class WUPSConfigCategory {
 public:

source/config/WUPSConfigCategoryExport.cpp

@@ -1,7 +1,7 @@
+#include "../utils/logger.h"
+#include "WUPSConfigCategory.h"
 #include <wums.h>
 #include <wups/config.h>
-#include "WUPSConfigCategory.h"
-#include "../utils/logger.h"
 
 int32_t WUPSConfigCategory_Create(WUPSConfigCategoryHandle *out, const char *name) {
     if (name == nullptr || out == nullptr) {

source/config/WUPSConfigExport.cpp

@@ -1,7 +1,7 @@
+#include "../utils/logger.h"
+#include "WUPSConfig.h"
 #include <wums.h>
 #include <wups/config.h>
-#include "WUPSConfig.h"
-#include "../utils/logger.h"
 
 int32_t WUPSConfig_Create(WUPSConfigHandle *out, const char *name) {
     if (name == nullptr || out == nullptr) {

source/config/WUPSConfigItem.h

@@ -20,9 +20,9 @@
 #include <string>
 #include <vector>
 
-#include <wups/config.h>
 #include "utils/StringTools.h"
 #include "utils/logger.h"
+#include <wups/config.h>
 
 class WUPSConfigItem {
 public:

source/config/WUPSConfigItemExport.cpp

@@ -1,6 +1,6 @@
+#include "WUPSConfigItem.h"
 #include <wums.h>
 #include <wups/config.h>
-#include "WUPSConfigItem.h"
 
 typedef uint32_t WUPSConfigItemHandle;
 

source/elfio/elf_types.hpp

@@ -1,3 +1,4 @@
+// clang-format off
 /*
 Copyright (C) 2001-2015 by Serge Lamikhov-Center
 

source/elfio/elfio.hpp

@@ -1,3 +1,4 @@
+// clang-format off
 /*
 Copyright (C) 2001-2015 by Serge Lamikhov-Center
 

source/elfio/elfio_dump.hpp

@@ -1,3 +1,4 @@
+// clang-format off
 /*
 Copyright (C) 2001-2015 by Serge Lamikhov-Center
 

source/elfio/elfio_dynamic.hpp

@@ -1,3 +1,4 @@
+// clang-format off
 /*
 Copyright (C) 2001-2015 by Serge Lamikhov-Center
 

source/elfio/elfio_header.hpp

@@ -1,3 +1,4 @@
+// clang-format off
 /*
 Copyright (C) 2001-2015 by Serge Lamikhov-Center
 

source/elfio/elfio_note.hpp

@@ -1,3 +1,4 @@
+// clang-format off
 /*
 Copyright (C) 2001-2015 by Serge Lamikhov-Center
 

source/elfio/elfio_relocation.hpp

@@ -1,3 +1,4 @@
+// clang-format off
 /*
 Copyright (C) 2001-2015 by Serge Lamikhov-Center
 

source/elfio/elfio_section.hpp

@@ -1,3 +1,4 @@
+// clang-format off
 /*
 Copyright (C) 2001-2015 by Serge Lamikhov-Center
 

source/elfio/elfio_segment.hpp

@@ -1,3 +1,4 @@
+// clang-format off
 /*
 Copyright (C) 2001-2015 by Serge Lamikhov-Center
 

source/elfio/elfio_strings.hpp

@@ -1,3 +1,4 @@
+// clang-format off
 /*
 Copyright (C) 2001-2015 by Serge Lamikhov-Center
 

source/elfio/elfio_symbols.hpp

@@ -1,3 +1,4 @@
+// clang-format off
 /*
 Copyright (C) 2001-2015 by Serge Lamikhov-Center
 

source/elfio/elfio_utils.hpp

@@ -1,3 +1,4 @@
+// clang-format off
 /*
 Copyright (C) 2001-2015 by Serge Lamikhov-Center
 

source/fs/CFile.cpp

@@ -1,8 +1,8 @@
 
 #include <cstdarg>
 #include <cstdio>
-#include <strings.h>
 #include <fs/CFile.hpp>
+#include <strings.h>
 
 CFile::CFile() {
     iFd      = -1;
@@ -170,5 +170,3 @@ int32_t CFile::fwrite(const char *format, ...) {
 
     return result;
 }
-
-

source/fs/CFile.hpp

@@ -1,9 +1,9 @@
 #pragma once
 
 #include <cstdio>
-#include <string>
 #include <cstring>
 #include <fcntl.h>
+#include <string>
 #include <unistd.h>
 #include <wut_types.h>
 

source/fs/DirList.cpp

@@ -24,14 +24,14 @@
  * DirList Class
  * for WiiXplorer 2010
  ***************************************************************************/
+#include <algorithm>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <string>
 #include <strings.h>
-#include <algorithm>
-#include <sys/stat.h>
 #include <sys/dirent.h>
+#include <sys/stat.h>
 
 #include <fs/DirList.h>
 #include <utils/StringTools.h>

source/fs/DirList.h

@@ -27,8 +27,8 @@
 #ifndef ___DIRLIST_H_
 #define ___DIRLIST_H_
 
-#include <vector>
 #include <string>
+#include <vector>
 #include <wut_types.h>
 
 typedef struct {
@@ -97,6 +97,7 @@ public:
         Dirs            = 0x02,
         CheckSubfolders = 0x08,
     };
+
 protected:
     // Internal parser
     BOOL InternalLoadPath(std::string &path);

source/fs/FSUtils.cpp

@@ -1,11 +1,11 @@
-#include <malloc.h>
-#include <string.h>
-#include <stdio.h>
-#include <unistd.h>
-#include <fcntl.h>
 #include "fs/FSUtils.h"
 #include "fs/CFile.hpp"
 #include "utils/logger.h"
+#include <fcntl.h>
+#include <malloc.h>
+#include <stdio.h>
+#include <string.h>
+#include <unistd.h>
 
 int32_t FSUtils::LoadFileToMem(const char *filepath, uint8_t **inbuffer, uint32_t *size) {
     //! always initialze input
@@ -139,4 +139,3 @@ int32_t FSUtils::saveBufferToFile(const char *path, void *buffer, uint32_t size)
     file.close();
     return written;
 }
-

source/globals.h

@@ -2,8 +2,8 @@
 
 #include <wums.h>
 
-#include "plugin/PluginContainer.h"
 #include "common/plugin_defines.h"
+#include "plugin/PluginContainer.h"
 #include "utils/ConfigUtils.h"
 
 extern plugin_information_t *gPluginInformation;

source/hooks.cpp

@@ -1,6 +1,6 @@
 #include "hooks.h"
-#include "utils/logger.h"
 #include "utils/StorageUtils.h"
+#include "utils/logger.h"
 
 void CallHook(plugin_information_t *pluginInformation, wups_loader_hook_type_t hook_type) {
     CallHookEx(pluginInformation, hook_type, -1);
@@ -87,8 +87,7 @@ void CallHookEx(plugin_information_t *pluginInformation, wups_loader_hook_type_t
                         hook_type == WUPS_LOADER_HOOK_GET_CONFIG ||
                         hook_type == WUPS_LOADER_HOOK_CONFIG_CLOSED ||
                         hook_type == WUPS_LOADER_HOOK_RELEASE_FOREGROUND ||
-                        hook_type == WUPS_LOADER_HOOK_ACQUIRED_FOREGROUND
+                        hook_type == WUPS_LOADER_HOOK_ACQUIRED_FOREGROUND) {
-                            ) {
                         ((void (*)())((uint32_t *) func_ptr))();
                     } else if (hook_type == WUPS_LOADER_HOOK_INIT_STORAGE) {
                         wups_loader_init_storage_args_t args;

source/hooks.h

@@ -1,7 +1,7 @@
 #pragma once
 
-#include <wups.h>
 #include "common/plugin_defines.h"
+#include <wups.h>
 
 void CallHook(plugin_information_t *pluginInformation, wups_loader_hook_type_t hook_type);
 

source/main.cpp

@@ -1,18 +1,18 @@
-#include <wums.h>
-#include <coreinit/debug.h>
-#include <coreinit/cache.h>
-#include <coreinit/ios.h>
-#include <coreinit/dynload.h>
-#include <coreinit/memdefaultheap.h>
-#include <memory>
-#include "plugin/PluginContainer.h"
-#include "globals.h"
-#include "plugin/PluginDataFactory.h"
-#include "plugin/PluginDataPersistence.h"
-#include "plugin/PluginContainerPersistence.h"
 #include "PluginManagement.h"
+#include "globals.h"
 #include "hooks.h"
 #include "patcher/hooks_patcher_static.h"
+#include "plugin/PluginContainer.h"
+#include "plugin/PluginContainerPersistence.h"
+#include "plugin/PluginDataFactory.h"
+#include "plugin/PluginDataPersistence.h"
+#include <coreinit/cache.h>
+#include <coreinit/debug.h>
+#include <coreinit/dynload.h>
+#include <coreinit/ios.h>
+#include <coreinit/memdefaultheap.h>
+#include <memory>
+#include <wums.h>
 
 WUMS_MODULE_EXPORT_NAME("homebrew_wupsbackend");
 

source/patcher/hooks_patcher_static.cpp

@@ -1,13 +1,13 @@
 #include "hooks_patcher_static.h"
-#include <wups.h>
-#include <vpad/input.h>
-#include <padscore/wpad.h>
-#include <coreinit/messagequeue.h>
 #include <coreinit/core.h>
+#include <coreinit/messagequeue.h>
+#include <padscore/wpad.h>
+#include <vpad/input.h>
+#include <wups.h>
 
-#include "../utils/ConfigUtils.h"
 #include "../globals.h"
 #include "../hooks.h"
+#include "../utils/ConfigUtils.h"
 
 uint8_t vpadPressCooldown  = 0xFF;
 bool configMenuOpened      = false;

source/plugin/DynamicLinkingHelper.h

@@ -1,10 +1,10 @@
 #pragma once
 
-#include <wums/defines/dynamic_linking_defines.h>
+#include "RelocationData.h"
+#include <memory>
 #include <string>
 #include <vector>
-#include <memory>
+#include <wums/defines/dynamic_linking_defines.h>
-#include "RelocationData.h"
 
 class DynamicLinkingHelper {
 public:

source/plugin/FunctionData.h

@@ -16,9 +16,9 @@
  ****************************************************************************/
 #pragma once
 
-#include <wups.h>
-#include <string>
 #include <function_patcher/fpatching_defines.h>
+#include <string>
+#include <wups.h>
 
 class FunctionData {
 
@@ -73,4 +73,3 @@ private:
     void *replaceAddr = nullptr;
     void *replaceCall = nullptr;
 };
-

source/plugin/FunctionSymbolData.h

@@ -24,8 +24,7 @@ class FunctionSymbolData {
 public:
     FunctionSymbolData(const FunctionSymbolData &o2) = default;
 
-    FunctionSymbolData(std::string &name, void *address, uint32_t size) :
+    FunctionSymbolData(std::string &name, void *address, uint32_t size) : name(name),
-            name(name),
                                                                           address(address),
                                                                           size(size) {
     }

source/plugin/HookData.h

@@ -17,8 +17,8 @@
 
 #pragma once
 
-#include <wups.h>
 #include <string>
+#include <wups.h>
 
 class HookData {
 

source/plugin/ImportRPLInformation.h

@@ -17,9 +17,9 @@
 
 #pragma once
 
+#include "../utils/logger.h"
 #include <string>
 #include <utility>
-#include "../utils/logger.h"
 
 class ImportRPLInformation {
 

source/plugin/PluginContainer.h

@@ -17,10 +17,10 @@
 
 #pragma once
 
-#include <memory>
 #include "PluginData.h"
-#include "PluginMetaInformation.h"
 #include "PluginInformation.h"
+#include "PluginMetaInformation.h"
+#include <memory>
 
 class PluginContainer {
 public:

source/plugin/PluginContainerPersistence.cpp

@@ -2,12 +2,12 @@
 
 #include <memory>
 
+#include "DynamicLinkingHelper.h"
 #include "PluginContainer.h"
-#include "PluginInformationFactory.h"
-#include "PluginMetaInformationFactory.h"
 #include "PluginContainerPersistence.h"
 #include "PluginDataPersistence.h"
-#include "DynamicLinkingHelper.h"
+#include "PluginInformationFactory.h"
+#include "PluginMetaInformationFactory.h"
 
 bool PluginContainerPersistence::savePlugin(plugin_information_t *pluginInformation, const std::shared_ptr<PluginContainer> &plugin, MEMHeapHandle heapHandle) {
     int32_t plugin_count = pluginInformation->number_used_plugins;

source/plugin/PluginData.cpp

@@ -1,8 +1,8 @@
 #include "PluginData.h"
 
-#include <utility>
-#include <malloc.h>
 #include "../utils/logger.h"
+#include <malloc.h>
+#include <utility>
 
 PluginData::PluginData(const PluginData &obj) {
     this->buffer     = obj.buffer;
@@ -34,8 +34,7 @@ void PluginData::freeMemory() {
 PluginData::PluginData(const std::vector<uint8_t> &buffer) : PluginData(buffer, nullptr, eMemTypeMEM2) {
 }
 
-PluginData::PluginData(const std::vector<uint8_t> &input, MEMHeapHandle heapHandle, eMemoryTypes memoryType) :
+PluginData::PluginData(const std::vector<uint8_t> &input, MEMHeapHandle heapHandle, eMemoryTypes memoryType) : heapHandle(heapHandle),
-        heapHandle(heapHandle),
                                                                                                                memoryType(memoryType),
                                                                                                                length(input.size()) {
     void *data_copy = nullptr;

source/plugin/PluginData.h

@@ -17,10 +17,10 @@
 
 #pragma once
 
+#include <coreinit/memexpheap.h>
+#include <malloc.h>
 #include <optional>
 #include <vector>
-#include <malloc.h>
-#include <coreinit/memexpheap.h>
 
 #include "../elfio/elfio.hpp"
 

source/plugin/PluginDataFactory.cpp

@@ -14,13 +14,13 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  ****************************************************************************/
-#include <fcntl.h>
-#include <sys/stat.h>
-#include <dirent.h>
-#include <memory>
 #include "PluginDataFactory.h"
-#include "../utils/logger.h"
 #include "../utils/StringTools.h"
+#include "../utils/logger.h"
+#include <dirent.h>
+#include <fcntl.h>
+#include <memory>
+#include <sys/stat.h>
 
 
 std::vector<std::shared_ptr<PluginData>> PluginDataFactory::loadDir(const std::string &path, MEMHeapHandle heapHandle) {

source/plugin/PluginDataFactory.h

@@ -17,11 +17,12 @@
 
 #pragma once
 
+#include "PluginData.h"
+#include <coreinit/memexpheap.h>
+#include <memory>
 #include <optional>
 #include <string>
 #include <vector>
-#include <coreinit/memexpheap.h>
-#include "PluginData.h"
 
 class PluginDataFactory {
 public:

source/plugin/PluginDataPersistence.cpp

@@ -1,6 +1,6 @@
-#include <memory>
-#include "../common/plugin_defines.h"
 #include "PluginDataPersistence.h"
+#include "../common/plugin_defines.h"
+#include <memory>
 
 bool PluginDataPersistence::save(plugin_data_t *pluginDataStruct, const std::shared_ptr<PluginData> &plugin) {
     if (pluginDataStruct == nullptr) {

source/plugin/PluginDataPersistence.h

@@ -1,6 +1,8 @@
 #pragma once
 
+#include "../common/plugin_defines.h"
 #include "PluginData.h"
+#include <memory>
 
 class PluginDataPersistence {
 

source/plugin/PluginInformation.h

@@ -17,18 +17,18 @@
 
 #pragma once
 
-#include <map>
+#include "FunctionData.h"
-#include <set>
+#include "FunctionSymbolData.h"
-#include <optional>
+#include "HookData.h"
-#include <string>
-#include <vector>
-#include <memory>
 #include "PluginMetaInformation.h"
 #include "RelocationData.h"
-#include "HookData.h"
-#include "FunctionData.h"
 #include "SectionInfo.h"
-#include "FunctionSymbolData.h"
+#include <map>
+#include <memory>
+#include <optional>
+#include <set>
+#include <string>
+#include <vector>
 
 struct FunctionSymbolDataComparator {
     bool operator()(const std::shared_ptr<FunctionSymbolData> &lhs,

source/plugin/PluginInformationFactory.cpp

@@ -15,17 +15,17 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  ****************************************************************************/
 
+#include "PluginInformationFactory.h"
+#include "../utils/ElfUtils.h"
+#include "../utils/utils.h"
+#include "PluginData.h"
+#include <coreinit/cache.h>
+#include <coreinit/memexpheap.h>
+#include <map>
 #include <memory>
 #include <string>
 #include <vector>
-#include <map>
-#include <coreinit/cache.h>
-#include <coreinit/memexpheap.h>
 #include <wups.h>
-#include "PluginData.h"
-#include "PluginInformationFactory.h"
-#include "../utils/utils.h"
-#include "../utils/ElfUtils.h"
 
 using namespace ELFIO;
 

source/plugin/PluginInformationFactory.h

@@ -17,15 +17,15 @@
 
 #pragma once
 
+#include "../elfio/elfio.hpp"
+#include "PluginContainer.h"
+#include "PluginInformation.h"
+#include <coreinit/memheap.h>
+#include <map>
 #include <optional>
 #include <string>
 #include <vector>
-#include <map>
-#include <coreinit/memheap.h>
 #include <wums/defines/relocation_defines.h>
-#include "PluginInformation.h"
-#include "PluginContainer.h"
-#include "../elfio/elfio.hpp"
 
 class PluginInformationFactory {
 public:

source/plugin/PluginMetaInformationFactory.cpp

@@ -15,12 +15,12 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  ****************************************************************************/
 
-#include <sys/types.h>
-#include <dirent.h>
-#include <whb/file.h>
-#include <memory>
-#include "../utils/StringTools.h"
 #include "PluginMetaInformationFactory.h"
+#include "../utils/StringTools.h"
+#include <dirent.h>
+#include <memory>
+#include <sys/types.h>
+#include <whb/file.h>
 
 using namespace ELFIO;
 

source/plugin/PluginMetaInformationFactory.h

@@ -17,12 +17,12 @@
 
 #pragma once
 
+#include "PluginData.h"
+#include "PluginMetaInformation.h"
+#include <memory>
 #include <optional>
 #include <string>
-#include <memory>
 #include <vector>
-#include "PluginMetaInformation.h"
-#include "PluginData.h"
 
 class PluginMetaInformationFactory {
 public:

source/plugin/RelocationData.h

@@ -17,15 +17,15 @@
 
 #pragma once
 
+#include "ImportRPLInformation.h"
+#include <memory>
 #include <string>
 #include <utility>
-#include "ImportRPLInformation.h"
 
 class RelocationData {
 
 public:
-    RelocationData(const char type, size_t offset, int32_t addend, void *destination, std::string &name, std::shared_ptr<ImportRPLInformation> rplInfo) :
+    RelocationData(const char type, size_t offset, int32_t addend, void *destination, std::string &name, std::shared_ptr<ImportRPLInformation> rplInfo) : type(type),
-            type(type),
                                                                                                                                                           offset(offset),
                                                                                                                                                           addend(addend),
                                                                                                                                                           destination(destination),

source/plugin/SectionInfo.h

@@ -22,8 +22,7 @@
 class SectionInfo {
 
 public:
-    SectionInfo(std::string &name, uint32_t address, uint32_t sectionSize) :
+    SectionInfo(std::string &name, uint32_t address, uint32_t sectionSize) : name(name),
-            name(name),
                                                                              address(address),
                                                                              sectionSize(sectionSize) {
     }

source/utils/ConfigUtils.cpp

@@ -1,17 +1,17 @@
 #include "ConfigUtils.h"
 
-#include "logger.h"
 #include "../config/WUPSConfig.h"
 #include "../globals.h"
 #include "DrawUtils.h"
+#include "logger.h"
 
+#include <coreinit/screen.h>
+#include <gx2/display.h>
+#include <memory/mappedmemory.h>
+#include <padscore/kpad.h>
 #include <string>
 #include <vector>
-#include <coreinit/screen.h>
-#include <memory/mappedmemory.h>
 #include <vpad/input.h>
-#include <padscore/kpad.h>
-#include <gx2/display.h>
 
 #define COLOR_BACKGROUND         Color(238, 238, 238, 255)
 #define COLOR_TEXT               Color(51, 51, 51, 255)

source/utils/DrawUtils.cpp

@@ -2,8 +2,8 @@
 
 #include <coreinit/memory.h>
 #include <coreinit/screen.h>
-#include <png.h>
 #include <ft2build.h>
+#include <png.h>
 #include FT_FREETYPE_H
 
 // buffer width
@@ -243,7 +243,8 @@ void DrawUtils::print(uint32_t x, uint32_t y, const char *string, bool alignRigh
         buffer[num] = 0;
     } else {
         wchar_t *tmp = buffer;
-        while ((*tmp++ = *string++));
+        while ((*tmp++ = *string++))
+            ;
     }
 
     print(x, y, buffer, alignRight);
@@ -283,7 +284,8 @@ uint32_t DrawUtils::getTextWidth(const char *string) {
         buffer[num] = 0;
     } else {
         wchar_t *tmp = buffer;
-        while ((*tmp++ = *string++));
+        while ((*tmp++ = *string++))
+            ;
     }
 
     uint32_t width = getTextWidth(buffer);

source/utils/ElfUtils.cpp

@@ -1,8 +1,8 @@
-#include <cstring>
 #include <coreinit/cache.h>
+#include <cstring>
 
-#include "utils/logger.h"
 #include "ElfUtils.h"
+#include "utils/logger.h"
 
 // See https://github.com/decaf-emu/decaf-emu/blob/43366a34e7b55ab9d19b2444aeb0ccd46ac77dea/src/libdecaf/src/cafe/loader/cafe_loader_reloc.cpp#L144
 bool ElfUtils::elfLinkOne(char type, size_t offset, int32_t addend, uint32_t destination, uint32_t symbol_addr, relocation_trampoline_entry_t *trampoline_data, uint32_t trampoline_data_length,

source/utils/StorageUtils.cpp

@@ -1,10 +1,10 @@
 #include "StorageUtils.h"
 #include <string>
 
-#include "utils/logger.h"
-#include "utils/json.hpp"
 #include "fs/CFile.hpp"
 #include "fs/FSUtils.h"
+#include "utils/json.hpp"
+#include "utils/logger.h"
 
 static void processJson(wups_storage_item_t *items, nlohmann::json json) {
     if (items == nullptr) {

source/utils/StringTools.cpp

@@ -23,14 +23,14 @@
  *
  * for WiiXplorer 2010
  ***************************************************************************/
-#include <vector>
-#include <string>
 #include <cstdarg>
+#include <cstdio>
 #include <cstdlib>
 #include <string.h>
-#include <wut_types.h>
+#include <string>
-#include <cstdio>
 #include <utils/StringTools.h>
+#include <vector>
+#include <wut_types.h>
 
 
 BOOL StringTools::EndsWith(const std::string &a, const std::string &b) {

source/utils/StringTools.h

@@ -26,8 +26,8 @@
 #ifndef __STRING_TOOLS_H
 #define __STRING_TOOLS_H
 
-#include <vector>
 #include <string>
+#include <vector>
 #include <wut_types.h>
 
 class StringTools {
@@ -86,4 +86,3 @@ public:
 };
 
 #endif /* __STRING_TOOLS_H */
-

source/utils/exports.cpp

@@ -1,15 +1,15 @@
-#include <coreinit/cache.h>
+#include "exports.h"
-#include "../plugin/PluginMetaInformationFactory.h"
+#include "../PluginManagement.h"
+#include "../globals.h"
 #include "../plugin/PluginContainer.h"
 #include "../plugin/PluginContainerPersistence.h"
 #include "../plugin/PluginDataFactory.h"
-#include "../PluginManagement.h"
-#include "../globals.h"
 #include "../plugin/PluginDataPersistence.h"
-#include "exports.h"
+#include "../plugin/PluginMetaInformationFactory.h"
+#include <coreinit/cache.h>
 #include <wums.h>
 
-void fillPluginInformation(plugin_information *out, const std::shared_ptr<PluginMetaInformation> &metaInformation) {
+static void fillPluginInformation(plugin_information *out, const std::shared_ptr<PluginMetaInformation> &metaInformation) {
     out->plugin_information_version = PLUGIN_INFORMATION_VERSION;
     strncpy(out->author, metaInformation->getAuthor().c_str(), sizeof(out->author) - 1);
     strncpy(out->buildTimestamp, metaInformation->getBuildTimestamp().c_str(), sizeof(out->buildTimestamp) - 1);

source/utils/exports.h

@@ -7,8 +7,6 @@
 extern "C" {
 #endif
 
-void fillPluginInformation(plugin_information *out, PluginMetaInformation *metaInformation);
-
 PluginBackendApiErrorType WUPSLoadAndLinkByDataHandle(const plugin_data_handle *plugin_data_handle_list, uint32_t plugin_data_handle_list_size);
 
 PluginBackendApiErrorType WUPSDeletePluginContainer(const plugin_container_handle *handle_list, uint32_t handle_list_size);

source/utils/json.hpp

@@ -1,3 +1,4 @@
+// clang-format off
 /*
     __ _____ _____ _____
  __|  |   __|     |   | |  JSON for Modern C++

source/utils/logger.c

@@ -1,8 +1,8 @@
 #ifdef DEBUG
 #include <stdint.h>
-#include <whb/log_udp.h>
 #include <whb/log_cafe.h>
 #include <whb/log_module.h>
+#include <whb/log_udp.h>
 
 uint32_t moduleLogInit = false;
 uint32_t cafeLogInit   = false;

source/utils/logger.h

@@ -1,7 +1,7 @@
 #pragma once
 
-#include <whb/log.h>
 #include <string.h>
+#include <whb/log.h>
 
 #ifdef __cplusplus
 extern "C" {
@@ -14,11 +14,13 @@ extern "C" {
 
 #define DEBUG_FUNCTION_LINE_VERBOSE(FMT, ARGS...) while (0)
 
-#define DEBUG_FUNCTION_LINE(FMT, ARGS...)do { \
+#define DEBUG_FUNCTION_LINE(FMT, ARGS...)                                                        \
+    do {                                                                                         \
         WHBLogPrintf("[%23s]%30s@L%04d: " FMT "", __FILENAME__, __FUNCTION__, __LINE__, ##ARGS); \
     } while (0)
 
-#define DEBUG_FUNCTION_LINE_WRITE(FMT, ARGS...)do { \
+#define DEBUG_FUNCTION_LINE_WRITE(FMT, ARGS...)                                                  \
+    do {                                                                                         \
         WHBLogWritef("[%23s]%30s@L%04d: " FMT "", __FILENAME__, __FUNCTION__, __LINE__, ##ARGS); \
     } while (0)
 
@@ -39,4 +41,3 @@ void deinitLogging();
 #ifdef __cplusplus
 }
 #endif
-

source/utils/utils.c

@@ -1,11 +1,11 @@
-#include <string.h>
+#include "utils/logger.h"
-#include <stdlib.h>
+#include <malloc.h>
 #include <stdarg.h>
 #include <stddef.h>
 #include <stdio.h>
-#include <malloc.h>
+#include <stdlib.h>
+#include <string.h>
 #include <whb/log.h>
-#include "utils/logger.h"
 
 // https://gist.github.com/ccbrown/9722406
 void dumpHex(const void *data, size_t size) {

source/utils/utils.h

@@ -12,7 +12,8 @@ extern "C" {
         typeof(x) _x     = x;                                \
         typeof(min) _min = min;                              \
         typeof(max) _max = max;                              \
-        ( ( ( _x ) < ( _min ) ) ? ( _min ) : ( ( _x ) > ( _max ) ) ? ( _max) : ( _x ) );    \
+        (((_x) < (_min)) ? (_min) : ((_x) > (_max)) ? (_max) \
+                                                    : (_x)); \
     })
 
 #define DegToRad(a)           ((a) *0.01745329252f)