From 83751fdd759bc9f21c53dfb010e2fa61598760d1 Mon Sep 17 00:00:00 2001 From: BullyWiiPlaza Date: Thu, 28 Sep 2017 22:14:32 +0200 Subject: [PATCH] Convert more to C++ --- src/tcpgecko/main.h | 6 ++---- src/tcpgecko/{net.c => net.cpp} | 10 +++++----- src/tcpgecko/{title.c => title.cpp} | 0 src/tcpgecko/title.h | 8 ++++++++ tcpgecko.elf | Bin 159756 -> 159756 bytes 5 files changed, 15 insertions(+), 9 deletions(-) rename src/tcpgecko/{net.c => net.cpp} (98%) rename src/tcpgecko/{title.c => title.cpp} (100%) diff --git a/src/tcpgecko/main.h b/src/tcpgecko/main.h index 7316087..6381b21 100644 --- a/src/tcpgecko/main.h +++ b/src/tcpgecko/main.h @@ -4,13 +4,11 @@ #include "../common/types.h" #include "../dynamic_libs/os_functions.h" -/* Main */ #ifdef __cplusplus extern "C" { #endif -//! C wrapper for our C++ functions -int Menu_Main(void); +int Menu_Main(); extern bool isCodeHandlerInstalled; extern bool areSDCheatsEnabled; @@ -19,4 +17,4 @@ extern bool areSDCheatsEnabled; } #endif -#endif +#endif \ No newline at end of file diff --git a/src/tcpgecko/net.c b/src/tcpgecko/net.cpp similarity index 98% rename from src/tcpgecko/net.c rename to src/tcpgecko/net.cpp index 59d72d4..c7d410d 100644 --- a/src/tcpgecko/net.c +++ b/src/tcpgecko/net.cpp @@ -156,7 +156,7 @@ int cafiine_send_handle(int sock, const char *path, int handle) { return -1; } -int cafiine_fopen(int sock, int *result, const char *path, const char *mode, int *handle) { +/*int cafiine_fopen(int sock, int *result, const char *path, const char *mode, int *handle) { while (iLock) usleep(5000); iLock = 1; @@ -201,7 +201,7 @@ int cafiine_fopen(int sock, int *result, const char *path, const char *mode, int error: iLock = 0; return final_result; -} +}*/ void cafiine_send_file(int sock, char *file, int size, int fd) { while (iLock) @@ -481,7 +481,7 @@ int recvwait(int sock, void *buffer, int len) { ret = recv(sock, buffer, len, 0); CHECK_ERROR(ret < 0); len -= ret; - buffer += ret; + buffer = &buffer + ret; } return 0; error: @@ -494,7 +494,7 @@ int recvwaitlen(int sock, void *buffer, int len) { ret = recv(sock, buffer, len, 0); CHECK_ERROR(ret < 0); len -= ret; - buffer += ret; + buffer = &buffer + ret; } return 0; error: @@ -517,7 +517,7 @@ int sendwait(int sock, const void *buffer, int len) { ret = send(sock, buffer, len, 0); CHECK_ERROR(ret < 0); len -= ret; - buffer += ret; + buffer = &buffer + ret; } return 0; error: diff --git a/src/tcpgecko/title.c b/src/tcpgecko/title.cpp similarity index 100% rename from src/tcpgecko/title.c rename to src/tcpgecko/title.cpp diff --git a/src/tcpgecko/title.h b/src/tcpgecko/title.h index 1274bbb..40c943c 100644 --- a/src/tcpgecko/title.h +++ b/src/tcpgecko/title.h @@ -6,6 +6,14 @@ #define TITLE_ID_BAYONETTA_2 0x0005000010172500 #define TITLE_ID_INTERNET_BROWSER 0x000500301001200A +#ifdef __cplusplus +extern "C" { +#endif + bool isRunningAllowedTitleID(); +#ifdef __cplusplus +} +#endif + #endif \ No newline at end of file diff --git a/tcpgecko.elf b/tcpgecko.elf index 4342b82a2eaafa2c689ae0b5c170a88969c4c363..906dc41aafad3eecd098a382d704cb522b07060a 100644 GIT binary patch delta 3499 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 delta 3424 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 QrhZ|au*4j>0