diff options
author | ultramage <ultramage@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2011-06-30 09:14:21 +0000 |
---|---|---|
committer | ultramage <ultramage@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2011-06-30 09:14:21 +0000 |
commit | 09c4e2b26b2a7f1a06202b300f0dc1ce1fe04abf (patch) | |
tree | 9971dee8e7148436dcb49af51bb820d764f10c21 /src/login | |
parent | dd73c6ea546a8828653cdce38a52f575cbdd3b96 (diff) | |
download | hercules-09c4e2b26b2a7f1a06202b300f0dc1ce1fe04abf.tar.gz hercules-09c4e2b26b2a7f1a06202b300f0dc1ce1fe04abf.tar.bz2 hercules-09c4e2b26b2a7f1a06202b300f0dc1ce1fe04abf.tar.xz hercules-09c4e2b26b2a7f1a06202b300f0dc1ce1fe04abf.zip |
Replaced custom type 'intptr' with standard 'intptr_t'.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@14873 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/login')
-rw-r--r-- | src/login/account_txt.c | 6 | ||||
-rw-r--r-- | src/login/ipban_sql.c | 4 | ||||
-rw-r--r-- | src/login/login.c | 8 |
3 files changed, 9 insertions, 9 deletions
diff --git a/src/login/account_txt.c b/src/login/account_txt.c index 758a2c24e..821e26df5 100644 --- a/src/login/account_txt.c +++ b/src/login/account_txt.c @@ -58,7 +58,7 @@ static bool account_db_txt_iter_next(AccountDBIterator* self, struct mmo_account static bool mmo_auth_fromstr(struct mmo_account* acc, char* str, unsigned int version); static bool mmo_auth_tostr(const struct mmo_account* acc, char* str); static void mmo_auth_sync(AccountDB_TXT* self); -static int mmo_auth_sync_timer(int tid, unsigned int tick, int id, intptr data); +static int mmo_auth_sync_timer(int tid, unsigned int tick, int id, intptr_t data); /// public constructor AccountDB* account_db_txt(void) @@ -183,7 +183,7 @@ static bool account_db_txt_init(AccountDB* self) // initialize data saving timer add_timer_func_list(mmo_auth_sync_timer, "mmo_auth_sync_timer"); - db->save_timer = add_timer_interval(gettick() + AUTH_SAVING_INTERVAL, mmo_auth_sync_timer, 0, (intptr)db, AUTH_SAVING_INTERVAL); + db->save_timer = add_timer_interval(gettick() + AUTH_SAVING_INTERVAL, mmo_auth_sync_timer, 0, (intptr_t)db, AUTH_SAVING_INTERVAL); return true; } @@ -634,7 +634,7 @@ static void mmo_auth_sync(AccountDB_TXT* db) db->auths_before_save = AUTHS_BEFORE_SAVE; } -static int mmo_auth_sync_timer(int tid, unsigned int tick, int id, intptr data) +static int mmo_auth_sync_timer(int tid, unsigned int tick, int id, intptr_t data) { AccountDB_TXT* db = (AccountDB_TXT*)data; diff --git a/src/login/ipban_sql.c b/src/login/ipban_sql.c index ef463905e..c75a1f956 100644 --- a/src/login/ipban_sql.c +++ b/src/login/ipban_sql.c @@ -35,7 +35,7 @@ static Sql* sql_handle = NULL; static int cleanup_timer_id = INVALID_TIMER; static bool ipban_inited = false; -int ipban_cleanup(int tid, unsigned int tick, int id, intptr data); +int ipban_cleanup(int tid, unsigned int tick, int id, intptr_t data); // initialize @@ -246,7 +246,7 @@ void ipban_log(uint32 ip) } // remove expired bans -int ipban_cleanup(int tid, unsigned int tick, int id, intptr data) +int ipban_cleanup(int tid, unsigned int tick, int id, intptr_t data) { if( !login_config.ipban ) return 0;// ipban disabled diff --git a/src/login/login.c b/src/login/login.c index ad12e6c43..e57293a4c 100644 --- a/src/login/login.c +++ b/src/login/login.c @@ -101,7 +101,7 @@ struct online_login_data { }; static DBMap* online_db; // int account_id -> struct online_login_data* -static int waiting_disconnect_timer(int tid, unsigned int tick, int id, intptr data); +static int waiting_disconnect_timer(int tid, unsigned int tick, int id, intptr_t data); static void* create_online_user(DBKey key, va_list args) { @@ -138,7 +138,7 @@ void remove_online_user(int account_id) idb_remove(online_db, account_id); } -static int waiting_disconnect_timer(int tid, unsigned int tick, int id, intptr data) +static int waiting_disconnect_timer(int tid, unsigned int tick, int id, intptr_t data) { struct online_login_data* p = (struct online_login_data*)idb_get(online_db, id); if( p != NULL && p->waiting_disconnect == tid && p->account_id == id ) @@ -176,7 +176,7 @@ static int online_data_cleanup_sub(DBKey key, void *data, va_list ap) return 0; } -static int online_data_cleanup(int tid, unsigned int tick, int id, intptr data) +static int online_data_cleanup(int tid, unsigned int tick, int id, intptr_t data) { online_db->foreach(online_db, online_data_cleanup_sub); return 0; @@ -245,7 +245,7 @@ void chrif_on_disconnect(int id) //----------------------------------------------------- // periodic ip address synchronization //----------------------------------------------------- -static int sync_ip_addresses(int tid, unsigned int tick, int id, intptr data) +static int sync_ip_addresses(int tid, unsigned int tick, int id, intptr_t data) { uint8 buf[2]; ShowInfo("IP Sync in progress...\n"); |