Formatting

src/fs/CFile.hpp

@@ -18,11 +18,15 @@ public:
     };
 
     CFile();
+
     CFile(const std::string &filepath, eOpenTypes mode);
+
     CFile(const uint8_t *memory, int32_t memsize);
+
     virtual ~CFile();
 
     int32_t open(const std::string &filepath, eOpenTypes mode);
+
     int32_t open(const uint8_t *memory, int32_t memsize);
 
     BOOL isOpen() const {
@@ -38,15 +42,21 @@ public:
     void close();
 
     int32_t read(uint8_t *ptr, size_t size);
+
     int32_t write(const uint8_t *ptr, size_t size);
+
     int32_t fwrite(const char *format, ...);
+
     int32_t seek(long int offset, int32_t origin);
+
     uint64_t tell() {
         return pos;
     };
+
     uint64_t size() {
         return filesize;
     };
+
     void rewind() {
         this->seek(0, SEEK_SET);
     };

src/fs/DirList.h

@@ -40,42 +40,54 @@ class DirList {
 public:
     //!Constructor
     DirList(void);
+
     //!\param path Path from where to load the filelist of all files
     //!\param filter A fileext that needs to be filtered
     //!\param flags search/filter flags from the enum
     DirList(const std::string &path, const char *filter = NULL, uint32_t flags = Files | Dirs, uint32_t maxDepth = 0xffffffff);
+
     //!Destructor
     virtual ~DirList();
+
     //! Load all the files from a directory
     BOOL LoadPath(const std::string &path, const char *filter = NULL, uint32_t flags = Files | Dirs, uint32_t maxDepth = 0xffffffff);
+
     //! Get a filename of the list
     //!\param list index
     const char *GetFilename(int32_t index) const;
+
     //! Get the a filepath of the list
     //!\param list index
     const char *GetFilepath(int32_t index) const {
         if (!valid(index)) return "";
         else return FileInfo[index].FilePath;
     }
+
     //! Get the a filesize of the list
     //!\param list index
     uint64_t GetFilesize(int32_t index) const;
+
     //! Is index a dir or a file
     //!\param list index
     BOOL IsDir(int32_t index) const {
         if (!valid(index)) return false;
         return FileInfo[index].isDir;
     };
+
     //! Get the filecount of the whole list
     int32_t GetFilecount() const {
         return FileInfo.size();
     };
+
     //! Sort list by filepath
     void SortList();
+
     //! Custom sort command for custom sort functions definitions
     void SortList(BOOL (*SortFunc)(const DirEntry &a, const DirEntry &b));
+
     //! Get the index of the specified filename
     int32_t GetFileIndex(const char *filename) const;
+
     //! Enum for search/filter flags
     enum {
         Files = 0x01,
@@ -85,10 +97,13 @@ public:
 protected:
     // Internal parser
     BOOL InternalLoadPath(std::string &path);
+
     //!Add a list entrie
     void AddEntrie(const std::string &filepath, const char *filename, BOOL isDir);
+
     //! Clear the list
     void ClearList();
+
     //! Check if valid pos is requested
     inline BOOL valid(uint32_t pos) const {
         return (pos < FileInfo.size());

src/fs/FSUtils.h

@@ -9,7 +9,9 @@ public:
 
     //! todo: C++ class
     static int32_t CreateSubfolder(const char *fullpath);
+
     static int32_t CheckFile(const char *filepath);
+
     static BOOL saveBufferToFile(const char *path, void *buffer, uint32_t size);
 };
 

src/main.cpp

@@ -12,7 +12,6 @@ WUPS_USE_WUT_CRT()
 
 TcpReceiver *thread = NULL;
 
-
 /* Entry point */
 ON_APPLICATION_START(args) {
     WHBInitializeSocketLibrary();

src/utils/CThread.h

@@ -29,10 +29,7 @@ public:
 
     //! constructor
     CThread(int32_t iAttr, int32_t iPriority = 16, int32_t iStackSize = 0x8000, CThread::Callback callback = NULL, void *callbackArg = NULL)
-        : pThread(NULL)
+            : pThread(NULL), pThreadStack(NULL), pCallback(callback), pCallbackArg(callbackArg) {
-        , pThreadStack(NULL)
-        , pCallback(callback)
-        , pCallbackArg(callbackArg) {
         //! save attribute assignment
         iAttributes = iAttr;
         //! allocate the thread
@@ -58,39 +55,47 @@ public:
     virtual void *getThread() const {
         return pThread;
     }
+
     //! Thread entry function
     virtual void executeThread(void) {
         if (pCallback)
             pCallback(this, pCallbackArg);
     }
+
     //! Suspend thread
     virtual void suspendThread(void) {
         if (isThreadSuspended()) return;
         if (pThread) OSSuspendThread(pThread);
     }
+
     //! Resume thread
     virtual void resumeThread(void) {
         if (!isThreadSuspended()) return;
         if (pThread) OSResumeThread(pThread);
     }
+
     //! Set thread priority
     virtual void setThreadPriority(int prio) {
         if (pThread) OSSetThreadPriority(pThread, prio);
     }
+
     //! Check if thread is suspended
     virtual BOOL isThreadSuspended(void) const {
         if (pThread) return OSIsThreadSuspended(pThread);
         return false;
     }
+
     //! Check if thread is terminated
     virtual BOOL isThreadTerminated(void) const {
         if (pThread) return OSIsThreadTerminated(pThread);
         return false;
     }
+
     //! Check if thread is running
     virtual BOOL isThreadRunning(void) const {
         return !isThreadSuspended() && !isThreadRunning();
     }
+
     //! Shutdown thread
     virtual void shutdownThread(void) {
         //! wait for thread to finish
@@ -109,6 +114,7 @@ public:
         pThread = NULL;
         pThreadStack = NULL;
     }
+
     //! Thread attributes
     enum eCThreadAttributes {
         eAttributeNone              = 0x07,
@@ -124,6 +130,7 @@ private:
         ((CThread *) argv)->executeThread();
         return 0;
     }
+
     int iAttributes;
     OSThread *pThread;
     uint8_t *pThreadStack;

src/utils/StringTools.h

@@ -33,14 +33,23 @@
 class StringTools {
 public:
     static BOOL EndsWith(const std::string &a, const std::string &b);
+
     static const char *byte_to_binary(int32_t x);
+
     static std::string removeCharFromString(std::string &input, char toBeRemoved);
+
     static const char *fmt(const char *format, ...);
+
     static const wchar_t *wfmt(const char *format, ...);
+
     static int32_t strprintf(std::string &str, const char *format, ...);
+
     static std::string strfmt(const char *format, ...);
+
     static BOOL char2wchar_t(const char *src, wchar_t *dest);
+
     static int32_t strtokcmp(const char *string, const char *compare, const char *separator);
+
     static int32_t strextcmp(const char *string, const char *extension, char seperator);
 
     static const char *FullpathToFilename(const char *path) {
@@ -49,8 +58,7 @@ class StringTools{
         const char *ptr = path;
         const char *Filename = ptr;
 
-            while(*ptr != '\0')
+        while (*ptr != '\0') {
-            {
             if (ptr[0] == '/' && ptr[1] != '\0')
                 Filename = ptr + 1;
 
@@ -64,10 +72,8 @@ class StringTools{
         uint32_t length = str.size();
 
         //! clear path of double slashes
-            for(uint32_t i = 1; i < length; ++i)
+        for (uint32_t i = 1; i < length; ++i) {
-            {
+            if (str[i - 1] == '/' && str[i] == '/') {
-                if(str[i-1] == '/' && str[i] == '/')
-                {
                 str.erase(i, 1);
                 i--;
                 length--;

src/utils/TcpReceiver.cpp

@@ -23,11 +23,9 @@ extern "C"{
 uint64_t _SYSGetSystemApplicationTitleId(int32_t);
 void _SYSLaunchTitleWithStdArgsInNoSplash(uint64_t, uint32_t);
 }
+
 TcpReceiver::TcpReceiver(int32_t port)
-    : CThread(CThread::eAttributeAffCore0)
+        : CThread(CThread::eAttributeAffCore0), exitRequested(false), serverPort(port), serverSocket(-1) {
-    , exitRequested(false)
-    , serverPort(port)
-    , serverSocket(-1) {
 
     resumeThread();
 }

src/utils/TcpReceiver.h

@@ -18,6 +18,7 @@ public:
     };
 
     TcpReceiver(int32_t port);
+
     ~TcpReceiver();
 
     //sigslot::signal2<GuiElement *, uint32_t> serverReceiveStart;
@@ -26,7 +27,9 @@ public:
 private:
 
     void executeThread();
+
     int32_t loadToMemory(int32_t clientSocket, uint32_t ipAddress);
+
     bool saveFileToSDCard(const char *path, void *buffer, uint32_t size);
 
     bool exitRequested;

src/utils/logger.h

@@ -8,9 +8,12 @@ extern "C" {
 #include <string.h>
 
 void log_init_();
+
 //void log_deinit_(void);
 void log_print_(const char *str);
+
 void log_printf_(const char *format, ...);
+
 void OSFatal_printf(const char *format, ...);
 
 #define __FILENAME_X__ (strrchr(__FILE__, '\\') ? strrchr(__FILE__, '\\') + 1 : __FILE__)
@@ -21,7 +24,6 @@ void OSFatal_printf(const char *format, ...);
     } while (0)
 
 
-
 #define log_init() log_init_()
 //#define log_deinit() log_deinit_()
 #define log_print(str) log_print_(str)

src/utils/net.h

@@ -1,16 +1,23 @@
 #ifndef _UTILS_NET_H_
 #define _UTILS_NET_H_
+
 #include <stdint.h>
 #include <nsysnet/socket.h>
+
 #ifdef __cplusplus
 extern "C" {
 #endif
 
 int32_t recvwait(int32_t sock, void *buffer, int32_t len);
+
 uint8_t recvbyte(int32_t sock);
+
 uint32_t recvword(int32_t sock);
+
 int32_t checkbyte(int32_t sock);
+
 int32_t sendwait(int32_t sock, const void *buffer, int32_t len);
+
 int32_t sendbyte(int32_t sock, unsigned char byte);
 
 #ifdef __cplusplus

src/utils/romfs_dev.c

@@ -78,15 +78,25 @@ static bool _romfs_read_chk(romfs_mount *mount, uint64_t offset, void* buffer, u
 //-----------------------------------------------------------------------------
 
 static int romfs_open(struct _reent *r, void *fileStruct, const char *path, int flags, int mode);
+
 static int romfs_close(struct _reent *r, void *fd);
+
 static ssize_t romfs_read(struct _reent *r, void *fd, char *ptr, size_t len);
+
 static off_t romfs_seek(struct _reent *r, void *fd, off_t pos, int dir);
+
 static int romfs_fstat(struct _reent *r, void *fd, struct stat *st);
+
 static int romfs_stat(struct _reent *r, const char *path, struct stat *st);
+
 static int romfs_chdir(struct _reent *r, const char *path);
+
 static DIR_ITER *romfs_diropen(struct _reent *r, DIR_ITER *dirState, const char *path);
+
 static int romfs_dirreset(struct _reent *r, DIR_ITER *dirState);
+
 static int romfs_dirnext(struct _reent *r, DIR_ITER *dirState, char *filename, struct stat *filestat);
+
 static int romfs_dirclose(struct _reent *r, DIR_ITER *dirState);
 
 typedef struct {
@@ -125,6 +135,7 @@ static romfs_mount romfs_mounts[32];
 //-----------------------------------------------------------------------------
 
 static int32_t romfsMountCommon(const char *name, romfs_mount *mount);
+
 static void romfsInitMtime(romfs_mount *mount);
 
 static void _romfsResetMount(romfs_mount *mount, int32_t id) {