From 2c8e1d86149246bcd84e3708c2dbf7efe832d2ac Mon Sep 17 00:00:00 2001 From: skotlex Date: Fri, 22 Sep 2006 19:22:21 +0000 Subject: - Probably fixed a signed/unsigned mismatch warning on the new socket code. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@8848 54d463be-8e91-2dee-dedb-b68131a5f0ec --- Changelog-Trunk.txt | 2 ++ src/common/socket.c | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt index 474f91271..626e0d350 100644 --- a/Changelog-Trunk.txt +++ b/Changelog-Trunk.txt @@ -4,6 +4,8 @@ AS OF SVN REV. 5091, WE ARE NOW USING TRUNK. ALL UNTESTED BUGFIXES/FEATURES GO IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK. 2006/09/22 + * Probably fixed a signed/unsigned mismatch warning on the new socket code. + [Skotlex] * Fixed the "map server claims to have char online, but this other map server also has it tagged as online" message triggering in some cases where it shouldn't. [Skotlex] diff --git a/src/common/socket.c b/src/common/socket.c index 014ef9272..65c85a48b 100644 --- a/src/common/socket.c +++ b/src/common/socket.c @@ -63,7 +63,7 @@ int ip_rules = 1; #endif static int mode_neg=1; -static int frame_size=TCP_FRAME_LEN; +static unsigned int frame_size=TCP_FRAME_LEN; #ifndef MINICORE enum { @@ -1148,7 +1148,7 @@ int socket_config_read(const char *cfgName) { mode_neg = 0; else mode_neg = atoi(w2); } else if (strcmpi(w1, "frame_size") == 0) - frame_size = atoi(w2); + frame_size = strtoul(w2, NULL, 10); else if (strcmpi(w1, "import") == 0) socket_config_read(w2); } -- cgit v1.2.3-70-g09d2