summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFlavioJS <FlavioJS@54d463be-8e91-2dee-dedb-b68131a5f0ec>2007-01-12 20:28:11 +0000
committerFlavioJS <FlavioJS@54d463be-8e91-2dee-dedb-b68131a5f0ec>2007-01-12 20:28:11 +0000
commit4a1c96c506d236fd8f28e9c138dd9ee8547dca1c (patch)
treec7b772714a4370d3b6ade2eb7e121cfaa96289f1
parent3781f8c6fc018714c3a4fcac12b2cf7a3e6cf686 (diff)
downloadhercules-4a1c96c506d236fd8f28e9c138dd9ee8547dca1c.tar.gz
hercules-4a1c96c506d236fd8f28e9c138dd9ee8547dca1c.tar.bz2
hercules-4a1c96c506d236fd8f28e9c138dd9ee8547dca1c.tar.xz
hercules-4a1c96c506d236fd8f28e9c138dd9ee8547dca1c.zip
yup, i need to rest... (also, copy-paste is eeeevil)
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@9649 54d463be-8e91-2dee-dedb-b68131a5f0ec
-rw-r--r--src/common/malloc.h6
-rw-r--r--src/common/socket.c2
2 files changed, 4 insertions, 4 deletions
diff --git a/src/common/malloc.h b/src/common/malloc.h
index d6f6adb3c..2cef33982 100644
--- a/src/common/malloc.h
+++ b/src/common/malloc.h
@@ -145,11 +145,11 @@
////////////// Others //////////////////////////
// should be merged with any of above later
-#define CREATE(result, type, number) (result) = (type *) aCalloc ((number), sizeof(type));
+#define CREATE(result, type, number) (result) = (type *) aCalloc ((number), sizeof(type))
-#define CREATE_A(result, type, number) (result) = (type *) aCallocA ((number), sizeof(type));
+#define CREATE_A(result, type, number) (result) = (type *) aCallocA ((number), sizeof(type))
-#define RECREATE(result, type, number) (result) = (type *) aRealloc ((result), sizeof(type) * (number));
+#define RECREATE(result, type, number) (result) = (type *) aRealloc ((result), sizeof(type) * (number))
////////////////////////////////////////////////
diff --git a/src/common/socket.c b/src/common/socket.c
index c91903bca..51725a0a5 100644
--- a/src/common/socket.c
+++ b/src/common/socket.c
@@ -1026,7 +1026,7 @@ int socket_config_read(const char *cfgName) {
else if( strcmpi(w2,"mutual-failure") == 0 )
access_order=ACO_MUTUAL_FAILURE;
} else if( strcmpi(w1,"allow") == 0 ){
- RECREATE(access_allow, AccessControl, access_denynum+1);
+ RECREATE(access_allow, AccessControl, access_allownum+1);
if( access_ipmask(w2,&access_allow[access_allownum]) )
++access_allownum;
else