Browse Source

- Probably fixed a signed/unsigned mismatch warning on the new socket code.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@8848 54d463be-8e91-2dee-dedb-b68131a5f0ec
skotlex 18 năm trước cách đây
mục cha
commit
816e3fe096
2 tập tin đã thay đổi với 4 bổ sung2 xóa
  1. 2 0
      Changelog-Trunk.txt
  2. 2 2
      src/common/socket.c

+ 2 - 0
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]

+ 2 - 2
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);
 	}