Use errcodes instead

Author: thegrb93

source/socket.cpp

@@ -3,15 +3,29 @@
 extern "C" int luaopen_socket_core( lua_State *state );
 
 int parseWhitelist(GarrysMod::Lua::ILuaBase* LUA);
+enum : int
+{
+	PARSE_SUCCESS = 0,
+	PARSE_CANT_READ = 1,
+	PARSE_NO_ENTRIES = 2
+};
 
 GMOD_MODULE_OPEN( )
 {
 	#ifdef USE_WHITELIST
-	// This might long-jump via lua error so watch out!
-	if (parseWhitelist(LUA))
-	{
-		return 0;
-	}
+		switch (parseWhitelist(LUA))
+		{
+		case PARSE_SUCCESS:
+			break;
+		case PARSE_CANT_READ:
+			LUA->ThrowError("Failed to read whitelist file!");
+			break;
+		case PARSE_NO_ENTRIES:
+			LUA->ThrowError("Didn't find any valid entries in whitelist file!");
+			break;
+		default:
+			break;
+		}
 	#endif
 
 	if( luaopen_socket_core( LUA->GetState( ) ) == 1 )

source/whitelist.cpp

@@ -12,35 +12,36 @@
 const char* whitelistDir = "../gm_socket_whitelist.txt";
 std::vector<std::pair<std::string, std::string> > whitelist;
 
+enum : int
+{
+	PARSE_SUCCESS = 0,
+	PARSE_CANT_READ = 1,
+	PARSE_NO_ENTRIES = 2
+};
+
 int parseWhitelist(GarrysMod::Lua::ILuaBase* LUA)
 {
+	std::ifstream input(whitelistDir);
+	if (input)
 	{
-		std::ifstream input(whitelistDir);
-		if (input)
+		std::stringstream filereader;
+		filereader << input.rdbuf();
+		std::string filedata = filereader.str();
+		std::regex line_parser("([\\w\\.-]+)\\s+(\\d+)(?:(?:\r?\n)+|$)");
+		for (std::regex_iterator<std::string::iterator> match = std::regex_iterator(filedata.begin(), filedata.end(), line_parser), end = std::regex_iterator<std::string::iterator>(); match != end; ++match)
 		{
-			std::stringstream filereader;
-			filereader << input.rdbuf();
-			std::string filedata = filereader.str();
-			std::regex line_parser("([\\w\\.-]+)\\s+(\\d+)(?:(?:\r?\n)+|$)");
-			for (std::regex_iterator<std::string::iterator> match = std::regex_iterator(filedata.begin(), filedata.end(), line_parser), end = std::regex_iterator<std::string::iterator>(); match != end; ++match)
-			{
-				whitelist.push_back(std::pair<std::string, std::string>(match->operator[](1).str(), match->operator[](2).str()));
-			}
-			if (whitelist.empty())
-			{
-				goto no_entries_error;
-			}
+			whitelist.push_back(std::pair<std::string, std::string>(match->operator[](1).str(), match->operator[](2).str()));
 		}
-		else
+		if (whitelist.empty())
 		{
-			goto cant_read_error;
+			return PARSE_NO_ENTRIES;
 		}
-		return 0;
 	}
-no_entries_error:
-	LUA->ThrowError("Didn't find any valid entries in whitelist file!");
-cant_read_error:
-	LUA->ThrowError("Failed to read whitelist file!");
+	else
+	{
+		return PARSE_CANT_READ;
+	}
+	return PARSE_SUCCESS;
 }
 
 bool isSafe(const char* pNodeName, const char* pServiceName)