From 83c07892463a72a31c0b66306998b00adf2706ff Mon Sep 17 00:00:00 2001 From: HttrckCldHKS Date: Sat, 7 Feb 2015 18:34:46 -0800 Subject: [PATCH 1/4] >> RENAMED maxminddb.cpp (VCXPROJ) >> RENAMED maxminddb.cpp TO maxminddb.c (VCXPROJ) --- dlls/geoip/msvc12/geoip.vcxproj | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/geoip/msvc12/geoip.vcxproj b/dlls/geoip/msvc12/geoip.vcxproj index 49ce2678..0e315478 100644 --- a/dlls/geoip/msvc12/geoip.vcxproj +++ b/dlls/geoip/msvc12/geoip.vcxproj @@ -98,7 +98,7 @@ - + @@ -120,4 +120,4 @@ - \ No newline at end of file + From 2bc6ced671f1f1e8b60e5ae469cb91bbc250f84c Mon Sep 17 00:00:00 2001 From: HttrckCldHKS Date: Sat, 7 Feb 2015 18:39:21 -0800 Subject: [PATCH 2/4] >> RENAMED maxminddb.cpp (MAKEFILE) RENAMED maxminddb.cpp TO maxminddb.c (MAKEFILE) --- dlls/geoip/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/geoip/Makefile b/dlls/geoip/Makefile index 5ec18dec..2decbcb3 100755 --- a/dlls/geoip/Makefile +++ b/dlls/geoip/Makefile @@ -15,7 +15,7 @@ PUBLIC_ROOT = ../../public PROJECT = geoip -OBJECTS = amxxmodule.cpp GeoIP2/maxminddb.cpp geoip_main.cpp geoip_natives.cpp geoip_util.cpp +OBJECTS = amxxmodule.cpp GeoIP2/maxminddb.c geoip_main.cpp geoip_natives.cpp geoip_util.cpp ############################################## ### CONFIGURE ANY OTHER FLAGS/OPTIONS HERE ### From 47b5ff9a937727c6009f12183427e5f139a10fdb Mon Sep 17 00:00:00 2001 From: HttrckCldHKS Date: Sat, 7 Feb 2015 18:40:52 -0800 Subject: [PATCH 3/4] >> FIXED lookupString() LENGTH ISSUE In (const char *) lookupString() : For (const char *) NULL result : Length must be ZERO, if defined. --- dlls/geoip/geoip_util.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/geoip/geoip_util.cpp b/dlls/geoip/geoip_util.cpp index 16d95cf3..a805ae62 100644 --- a/dlls/geoip/geoip_util.cpp +++ b/dlls/geoip/geoip_util.cpp @@ -166,6 +166,9 @@ const char *lookupString(const char *ip, const char **path, int *length) if (!lookupByIp(ip, path, &result)) { + if (length) + *length = 0; + return NULL; } From 780ce669d0abeb84b43d46055aa7e876fec93f87 Mon Sep 17 00:00:00 2001 From: HttrckCldHKS Date: Sat, 7 Feb 2015 18:42:01 -0800 Subject: [PATCH 4/4] >> RENAMED maxminddb.cpp (FILTERS) RENAMED maxminddb.cpp TO maxminddb.c (FILTERS) --- dlls/geoip/msvc12/geoip.vcxproj.filters | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/geoip/msvc12/geoip.vcxproj.filters b/dlls/geoip/msvc12/geoip.vcxproj.filters index 3d3251a0..01d95974 100644 --- a/dlls/geoip/msvc12/geoip.vcxproj.filters +++ b/dlls/geoip/msvc12/geoip.vcxproj.filters @@ -23,7 +23,7 @@ - + GeoIP2 @@ -70,4 +70,4 @@ Pawn Includes - \ No newline at end of file +