Fixed warning and removed useless code from CheatEngineServer.

2 files changed, 20 insertions, 13 deletions

diff --git a/CheatEngineServer/CheatEngine.h b/CheatEngineServer/CheatEngine.h
index 9d13183..d2f4d41 100644
--- a/CheatEngineServer/CheatEngine.h
+++ b/CheatEngineServer/CheatEngine.h
@@ -5,6 +5,8 @@
 #define CE_PORT "52736"
 #define MSG_WAITALL 0x8
 
+#pragma warning(push)
+#pragma warning(disable : 26812)
 typedef enum ce_command {
 	CMD_GETVERSION = 0,
 	CMD_CLOSECONNECTION,
@@ -45,9 +47,9 @@ typedef enum ce_command {
 	CMD_MAX
 } ce_command;
 
-static inline char const * ce_command_to_string(enum ce_command cmd)
+static inline char const* ce_command_to_string(enum ce_command cmd)
 {
-	static char const * const cmd_map[] = {
+	static char const* const cmd_map[] = {
 	"CMD_GETVERSION", "CMD_CLOSECONNECTION", "CMD_TERMINATESERVER", "CMD_OPENPROCESS",
 	"CMD_CREATETOOLHELP32SNAPSHOT", "CMD_PROCESS32FIRST", "CMD_PROCESS32NEXT", "CMD_CLOSEHANDLE",
 	"CMD_VIRTUALQUERYEX", "CMD_READPROCESSMEMORY", "CMD_WRITEPROCESSMEMORY", "CMD_STARTDEBUG",
@@ -64,26 +66,22 @@ static inline char const * ce_command_to_string(enum ce_command cmd)
 	}
 	return cmd_map[cmd];
 }
+#pragma warning(pop)
 
 #pragma pack(1)
 typedef struct {
 	DWORD dwFlags;
 	DWORD th32ProcessID;
-} CeCreateToolhelp32Snapshot, *PCeCreateToolhelp32Snapshot;
+} CeCreateToolhelp32Snapshot, * PCeCreateToolhelp32Snapshot;
 
 typedef struct {
 	int result;
 	int pid;
 	int processnamesize;
 	//processname
-} CeProcessEntry, *PCeProcessEntry;
+} CeProcessEntry, * PCeProcessEntry;
 #pragma pack()
 
-template <class T>
-class CEPacket {
-
-};
-
 class CEConnection {
 public:
 	explicit CEConnection(SOCKET s) : sock(s) {}
diff --git a/CheatEngineServer/CheatEngineServer.cpp b/CheatEngineServer/CheatEngineServer.cpp
index 436975b..3d9d36e 100644
--- a/CheatEngineServer/CheatEngineServer.cpp
+++ b/CheatEngineServer/CheatEngineServer.cpp
@@ -8,10 +8,10 @@
 #include "CheatEngine.h"
 #include "CommandDispatcher.h"
 
-static SOCKET make_accept_sock(const char *servspec) {
+static SOCKET make_accept_sock(const char* servspec) {
 	const int one = 1;
 	struct addrinfo hints = {};
-	struct addrinfo *res = 0, *ai = 0, *ai4 = 0;
+	struct addrinfo* res = 0, * ai = 0, * ai4 = 0;
 	SOCKET sock;
 
 	hints.ai_family = PF_UNSPEC;
@@ -31,8 +31,12 @@ static SOCKET make_accept_sock(const char *servspec) {
 	}
 	ai = ai ? ai : ai4;
 
+	if (ai == NULL) {
+		return NULL;
+	}
+
 	sock = socket(ai->ai_family, SOCK_STREAM, 0);
-	setsockopt(sock, SOL_SOCKET, SO_REUSEADDR, (const char *)&one, sizeof(one));
+	setsockopt(sock, SOL_SOCKET, SO_REUSEADDR, (const char*)&one, sizeof(one));
 	if (bind(sock, ai->ai_addr, (int)ai->ai_addrlen) != 0)
 	{
 		std::cout << "bind() failed" << std::endl;
@@ -59,9 +63,14 @@ static void new_connection(SOCKET sock) {
 	}
 }
 
-static void accept_loop(const char *servspec) {
+static void accept_loop(const char* servspec) {
 	SOCKET sock = make_accept_sock(servspec);
 
+	if (sock == NULL)
+	{
+		return;
+	}
+
 	for (;;) {
 		SOCKET new_sock = accept(sock, 0, 0);
 		new_connection(new_sock);