Formatting and cleanup

src/BackgroundThread.cpp

@@ -1,28 +1,21 @@
 #include "BackgroundThread.hpp"
-#include <malloc.h>
+#include <cstring>
-#include <stdio.h>
-#include <string.h>
-#include <coreinit/cache.h>
-
-#include <utils/logger.h>
-
 #include "ftp.h"
 #include "net.h"
 
 BackgroundThread *BackgroundThread::instance = nullptr;
 
 BackgroundThread::BackgroundThread() : BackgroundThreadWrapper(BackgroundThread::getPriority()) {
-    DEBUG_FUNCTION_LINE("Create new Server");
+    DEBUG_FUNCTION_LINE("Start FTP Server");
     mutex.lock();
     this->serverSocket = create_server(PORT);
     DCFlushRange(&(this->serverSocket), 4);
     mutex.unlock();
-    DEBUG_FUNCTION_LINE("handle %d", this->serverSocket);
     CThread::resumeThread();
 }
 
 BackgroundThread::~BackgroundThread() {
-    DEBUG_FUNCTION_LINE("Clean up FTP");
+    DEBUG_FUNCTION_LINE("Shutting down FTP Server");
     if (this->serverSocket != -1) {
         mutex.lock();
         cleanup_ftp();
@@ -30,7 +23,6 @@ BackgroundThread::~BackgroundThread() {
         mutex.unlock();
         this->serverSocket = -1;
     }
-    DEBUG_FUNCTION_LINE("Cleaned up FTP");
 }
 
 BOOL BackgroundThread::whileLoop() {

src/BackgroundThread.hpp

@@ -1,4 +1,5 @@
 #pragma once
+
 #include "utils/BackgroundThreadWrapper.hpp"
 #include <coreinit/cache.h>
 #include "utils/logger.h"
@@ -8,43 +9,42 @@
 class BackgroundThread : BackgroundThreadWrapper {
 public:
     static BackgroundThread *getInstance() {
-                    DCFlushRange(&instance, sizeof(instance));
+        DCFlushRange(&instance, sizeof(BackgroundThread));
-            ICInvalidateRange(&instance, sizeof(instance));
+        ICInvalidateRange(&instance, sizeof(BackgroundThread));
-        if(instance == NULL) {
+        if (instance == nullptr) {
             instance = new BackgroundThread();
-            DCFlushRange(&instance, sizeof(instance));
+            DCFlushRange(&instance, sizeof(BackgroundThread));
-            ICInvalidateRange(&instance, sizeof(instance));
+            ICInvalidateRange(&instance, sizeof(BackgroundThread));
         }
         return instance;
     }
 
     static void destroyInstance() {
-        DCFlushRange(&instance, sizeof(instance));
+        DCFlushRange(&instance, sizeof(BackgroundThread));
-        ICInvalidateRange(&instance, sizeof(instance));
+        ICInvalidateRange(&instance, sizeof(BackgroundThread));
         DEBUG_FUNCTION_LINE("Instance is %08X\n", instance);
         OSSleepTicks(OSSecondsToTicks(1));
-        if(instance != NULL) {
+        if (instance != nullptr) {
             delete instance;
-            instance = NULL;
+            instance = nullptr;
-            DCFlushRange(&instance, sizeof(instance));
+            DCFlushRange(&instance, sizeof(BackgroundThread));
-            ICInvalidateRange(&instance, sizeof(instance));
+            ICInvalidateRange(&instance, sizeof(BackgroundThread));
         }
     }
 
     BackgroundThread();
 
-    virtual ~BackgroundThread();
+    ~BackgroundThread() override;
 
 private:
     static int32_t getPriority() {
         return 16;
     }
 
-    virtual BOOL whileLoop();
+    BOOL whileLoop() override;
 
     static BackgroundThread *instance;
 
     int serverSocket = -1;
     int network_down = 0;
-
 };

src/ftp.c

@@ -76,7 +76,9 @@ struct client_struct {
     bool data_connection_connected;
     data_connection_callback data_callback;
     void *data_connection_callback_arg;
+
     void (*data_connection_cleanup)(void *arg);
+
     uint64_t data_connection_timer;
 };
 
@@ -639,7 +641,8 @@ static int32_t dispatch_to_handler(client_t *client, char *cmd_line, const char
 }
 
 static const char *site_commands[] = {"LOADER", "CLEAR", "CHMOD", "PASSWD", "NOPASSWD", "EJECT", "MOUNT", "UNMOUNT", "LOAD", NULL};
-static const ftp_command_handler site_handlers[] = { ftp_SITE_LOADER, ftp_SITE_CLEAR, ftp_SITE_CHMOD, ftp_SITE_PASSWD, ftp_SITE_NOPASSWD, ftp_SITE_EJECT, ftp_SITE_MOUNT, ftp_SITE_UNMOUNT, ftp_SITE_LOAD, ftp_SITE_UNKNOWN };
+static const ftp_command_handler site_handlers[] = {ftp_SITE_LOADER, ftp_SITE_CLEAR, ftp_SITE_CHMOD, ftp_SITE_PASSWD, ftp_SITE_NOPASSWD, ftp_SITE_EJECT, ftp_SITE_MOUNT, ftp_SITE_UNMOUNT,
+                                                    ftp_SITE_LOAD, ftp_SITE_UNKNOWN};
 
 static int32_t ftp_SITE(client_t *client, char *cmd_line) {
     return dispatch_to_handler(client, cmd_line, site_commands, site_handlers);

src/ftp.h

@@ -29,11 +29,15 @@ misrepresented as being the original software.
 #ifdef __cplusplus
 extern "C"{
 #endif
+
 #include <stdbool.h>
 
 void accept_ftp_client(int32_t server);
+
 void set_ftp_password(char *new_password);
+
 bool process_ftp_events(int32_t server);
+
 void cleanup_ftp();
 
 #ifdef __cplusplus

src/main.cpp

@@ -8,7 +8,6 @@
 #include <coreinit/cache.h>
 #include "utils/logger.h"
 #include <whb/log_udp.h>
-#include <whb/libmanager.h>
 #include "virtualpath.h"
 #include "BackgroundThread.hpp"
 
@@ -63,9 +62,9 @@ ON_APPLICATION_START() {
         mount_fs("storage_odd_updates", fsaFd, "/dev/odd02", "/vol/storage_odd_updates");
         mount_fs("storage_odd_content", fsaFd, "/dev/odd03", "/vol/storage_odd_content");
         mount_fs("storage_odd_content2", fsaFd, "/dev/odd04", "/vol/storage_odd_content2");
-        mount_fs("storage_slc", fsaFd, NULL, "/vol/system");
+        mount_fs("storage_slc", fsaFd, nullptr, "/vol/system");
-        mount_fs("storage_mlc", fsaFd, NULL, "/vol/storage_mlc01");
+        mount_fs("storage_mlc", fsaFd, nullptr, "/vol/storage_mlc01");
-        mount_fs("storage_usb", fsaFd, NULL, "/vol/storage_usb01");
+        mount_fs("storage_usb", fsaFd, nullptr, "/vol/storage_usb01");
 
         VirtualMountDevice("fs:/");
         VirtualMountDevice("slccmpt01:/");

src/main.h

@@ -5,6 +5,7 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
+
 #include <stdint.h>
 #include "net.h"
 

src/net.c

@@ -193,6 +193,7 @@ int32_t create_server(uint16_t port) {
 }
 
 typedef int32_t (*transferrer_type)(int32_t s, void *mem, int32_t len);
+
 static int32_t transfer_exact(int32_t s, char *buf, int32_t length, transferrer_type transferrer) {
     int32_t result = 0;
     int32_t remaining = length;

src/net.h

@@ -44,12 +44,19 @@ void initialise_network();
 #endif
 
 int32_t network_socket(uint32_t domain, uint32_t type, uint32_t protocol);
+
 int32_t network_bind(int32_t s, struct sockaddr *name, int32_t namelen);
+
 int32_t network_listen(int32_t s, uint32_t backlog);
+
 int32_t network_accept(int32_t s, struct sockaddr *addr, int32_t *addrlen);
+
 int32_t network_connect(int32_t s, struct sockaddr *, int32_t);
+
 int32_t network_read(int32_t s, void *mem, int32_t len);
+
 int32_t network_close(int32_t s);
+
 uint32_t network_gethostip();
 
 int32_t set_blocking(int32_t s, bool blocking);

src/utils/BackgroundThreadWrapper.cpp

@@ -1,28 +1,22 @@
 #include "BackgroundThreadWrapper.hpp"
-
-#include <string.h>
 #include <coreinit/cache.h>
 
-
 BackgroundThreadWrapper::BackgroundThreadWrapper(int32_t priority) : CThread(CThread::eAttributeAffCore2, priority, 0x100000) {
 }
 
 BackgroundThreadWrapper::~BackgroundThreadWrapper() {
     exitThread = 1;
     DCFlushRange((void *) &exitThread, 4);
-    DEBUG_FUNCTION_LINE("Exit thread");
 }
 
 void BackgroundThreadWrapper::executeThread() {
     while (true) {
         if (exitThread) {
-            DEBUG_FUNCTION_LINE("We want to exit");
             break;
         }
         if (!whileLoop()) {
             break;
         }
     }
-    DEBUG_FUNCTION_LINE("Exit!");
 }
 

src/utils/BackgroundThreadWrapper.hpp

@@ -7,7 +7,9 @@
 class BackgroundThreadWrapper : public CThread {
 public:
     explicit BackgroundThreadWrapper(int32_t priority);
+
     ~BackgroundThreadWrapper() override;
+
 protected:
     [[nodiscard]] BOOL shouldExit() const {
         return (exitThread == 1);
@@ -16,6 +18,7 @@ protected:
     void setThreadPriority(int32_t priority) override {
         CThread::setThreadPriority(priority);
     }
+
     std::recursive_mutex mutex;
 private:
     void executeThread() override;

src/utils/CThread.h

@@ -28,11 +28,8 @@ public:
     typedef void (*Callback)(CThread *thread, void *arg);
 
     //! constructor
-    CThread(int32_t iAttr, int32_t iPriority = 16, int32_t iStackSize = 0x8000, CThread::Callback callback = NULL, void *callbackArg = NULL)
+    explicit CThread(int32_t iAttr, int32_t iPriority = 16, int32_t iStackSize = 0x8000, CThread::Callback callback = nullptr, void *callbackArg = nullptr)
-        : pThread(NULL)
+            : pThread(nullptr), pThreadStack(nullptr), pCallback(callback), pCallbackArg(callbackArg) {
-        , pThreadStack(NULL)
-        , pCallback(callback)
-        , pCallbackArg(callbackArg) {
         //! save attribute assignment
         iAttributes = iAttr;
         //! allocate the thread
@@ -55,50 +52,58 @@ public:
     }
 
     //! Get thread ID
-    virtual void* getThread() const {
+    [[nodiscard]] virtual void *getThread() const {
         return pThread;
     }
+
     //! Thread entry function
-    virtual void executeThread(void) {
+    virtual void executeThread() {
         if (pCallback)
             pCallback(this, pCallbackArg);
     }
+
     //! Suspend thread
-    virtual void suspendThread(void) {
+    virtual void suspendThread() {
         if (isThreadSuspended()) return;
         if (pThread) OSSuspendThread(pThread);
     }
+
     //! Resume thread
-    virtual void resumeThread(void) {
+    virtual void resumeThread() {
         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 {
+    [[nodiscard]] virtual BOOL isThreadSuspended() const {
         if (pThread) return OSIsThreadSuspended(pThread);
         return false;
     }
+
     //! Check if thread is terminated
-    virtual BOOL isThreadTerminated(void) const {
+    [[nodiscard]] virtual BOOL isThreadTerminated() const {
         if (pThread) return OSIsThreadTerminated(pThread);
         return false;
     }
+
     //! Check if thread is running
-    virtual BOOL isThreadRunning(void) const {
+    [[nodiscard]] virtual BOOL isThreadRunning() const {
         return !isThreadSuspended() && !isThreadRunning();
     }
+
     //! Shutdown thread
-    virtual void shutdownThread(void) {
+    virtual void shutdownThread() {
         //! wait for thread to finish
         if (pThread && !(iAttributes & eAttributeDetach)) {
             if (isThreadSuspended())
                 resumeThread();
 
-            OSJoinThread(pThread, NULL);
+            OSJoinThread(pThread, nullptr);
         }
         //! free the thread stack buffer
         if (pThreadStack)
@@ -106,9 +111,10 @@ public:
         if (pThread)
             free(pThread);
 
-        pThread = NULL;
+        pThread = nullptr;
-        pThreadStack = NULL;
+        pThreadStack = nullptr;
     }
+
     //! 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/logger.h

@@ -16,7 +16,7 @@ extern "C" {
 
 #define DEBUG_FUNCTION_LINE(FMT, ARGS...)do { \
     WHBLogPrintf("[%23s]%30s@L%04d: " FMT "",__FILENAME__,__FUNCTION__, __LINE__, ## ARGS); \
-    } while (0);
+    } while (0)
 
 #define DEBUG_FUNCTION_LINE_WRITE(FMT, ARGS...)do { \
     WHBLogWritef("[%23s]%30s@L%04d: " FMT "",__FILENAME__,__FUNCTION__, __LINE__, ## ARGS); \

src/virtualpath.c

@@ -40,8 +40,7 @@ VIRTUAL_PARTITION *VIRTUAL_FS = NULL;
 uint8_t MAX_VIRTUAL_FS_VOL = 0;
 VIRTUAL_PARTITION *VIRTUAL_FS_VOL = NULL;
 
-void VirtualMountDevice(const char * path)
+void VirtualMountDevice(const char *path) {
-{
     if (!path)
         return;
 
@@ -53,13 +52,11 @@ void VirtualMountDevice(const char * path)
 
     alias[0] = '/';
 
-	do
+    do {
-	{
         if (path[i] == ':')
             namestop = true;
 
-		if(!namestop)
+        if (!namestop) {
-		{
             name[i] = path[i];
             name[i + 1] = '\0';
             alias[i + 1] = path[i];
@@ -69,13 +66,11 @@ void VirtualMountDevice(const char * path)
         prefix[i] = path[i];
         prefix[i + 1] = '\0';
         i++;
-	}
+    } while (path[i - 1] != '/');
-	while(path[i-1] != '/');
     AddVirtualPath(name, alias, prefix);
 }
 
-void AddVirtualPath(const char *name, const char *alias, const char *prefix)
+void AddVirtualPath(const char *name, const char *alias, const char *prefix) {
-{
     if (!VIRTUAL_PARTITIONS) {
         VIRTUAL_PARTITIONS = (VIRTUAL_PARTITION *) malloc(sizeof(VIRTUAL_PARTITION));
     }
@@ -140,8 +135,7 @@ void AddVirtualPath(const char *name, const char *alias, const char *prefix)
     MAX_VIRTUAL_FS_VOL++;
 }
 
-void MountVirtualDevices()
+void MountVirtualDevices() {
-{
     VirtualMountDevice("fs:/");
     VirtualMountDevice("slccmpt01:/");
     VirtualMountDevice("storage_odd_tickets:/");

src/virtualpath.h

@@ -54,10 +54,15 @@ extern VIRTUAL_PARTITION * VIRTUAL_FS_VOL;
 extern uint8_t MAX_VIRTUAL_FS_VOL;
 
 void VirtualMountDevice(const char *devicepath);
+
 void AddVirtualPath(const char *name, const char *alias, const char *prefix);
+
 void AddVirtualFSPath(const char *name, const char *alias, const char *prefix);
+
 void AddVirtualFSVOLPath(const char *name, const char *alias, const char *prefix);
+
 void MountVirtualDevices();
+
 void UnmountVirtualPaths();
 
 #ifdef __cplusplus

src/vrt.c

@@ -190,11 +190,21 @@ static void *with_virtual_path(void *virtual_cwd, void *void_f, char *virtual_pa
 
     void *result;
     switch (num_args) {
-		case 0: result = f(path); break;
+        case 0:
-		case 1: result = f(path, args[0]); break;
+            result = f(path);
-		case 2: result = f(path, args[0], args[1]); break;
+            break;
-		case 3: result = f(path, args[0], args[1], args[2]); break;
+        case 1:
-		default: result = (void *)failed; break;
+            result = f(path, args[0]);
+            break;
+        case 2:
+            result = f(path, args[0], args[1]);
+            break;
+        case 3:
+            result = f(path, args[0], args[1], args[2]);
+            break;
+        default:
+            result = (void *) failed;
+            break;
     }
 
     free(path);
@@ -207,12 +217,9 @@ FILE *vrt_fopen(char *cwd, char *path, char *mode) {
 
 int vrt_stat(char *cwd, char *path, struct stat *st) {
     char *real_path = to_real_path(cwd, path);
-	if (!real_path)
+    if (!real_path) {
-    {
         return -1;
-    }
+    } else if (!*real_path || (strcmp(path, ".") == 0) || (strlen(cwd) == 1) || ((strlen(cwd) > 1) && (strcmp(path, "..") == 0))) {
-	else if (!*real_path || (strcmp(path, ".") == 0) || (strlen(cwd) == 1) || ((strlen(cwd) > 1) && (strcmp(path, "..") == 0)))
-    {
         st->st_mode = S_IFDIR;
         st->st_size = 31337;
         return 0;
@@ -223,12 +230,9 @@ int vrt_stat(char *cwd, char *path, struct stat *st) {
 
 static int vrt_checkdir(char *cwd, char *path) {
     char *real_path = to_real_path(cwd, path);
-	if (!real_path)
+    if (!real_path) {
-	{
         return -1;
-	}
+    } else if (!*real_path || (strcmp(path, ".") == 0) || (strlen(cwd) == 1) || ((strlen(cwd) > 1) && (strcmp(path, "..") == 0))) {
-	else if (!*real_path || (strcmp(path, ".") == 0) || (strlen(cwd) == 1) || ((strlen(cwd) > 1) && (strcmp(path, "..") == 0)))
-	{
         return 0;
     }
     free(real_path);
@@ -358,8 +362,7 @@ struct dirent *vrt_readdir(DIR_P *pDir) {
 int vrt_closedir(DIR_P *iter) {
     if (!iter) return -1;
 
-	if(iter->dir)
+    if (iter->dir) {
-	{
         if (iter->virt_root)
             free(iter->dir);
         else

src/vrt.h

@@ -32,8 +32,7 @@ extern "C"{
 #include <stdio.h>
 #include <sys/dirent.h>
 
-typedef struct
+typedef struct {
-{
     DIR *dir;
     char *path;
     uint8_t virt_root;
@@ -44,13 +43,21 @@ typedef struct
 char *to_real_path(char *virtual_cwd, char *virtual_path);
 
 FILE *vrt_fopen(char *cwd, char *path, char *mode);
+
 int vrt_stat(char *cwd, char *path, struct stat *st);
+
 int vrt_chdir(char *cwd, char *path);
+
 int vrt_unlink(char *cwd, char *path);
+
 int vrt_mkdir(char *cwd, char *path, mode_t mode);
+
 int vrt_rename(char *cwd, char *from_path, char *to_path);
+
 DIR_P *vrt_opendir(char *cwd, char *path);
+
 struct dirent *vrt_readdir(DIR_P *iter);
+
 int vrt_closedir(DIR_P *iter);
 
 #ifdef __cplusplus