From 290ca7eec3ba05cd670f0a30c50ea942241792d0 Mon Sep 17 00:00:00 2001 From: ultramage Date: Wed, 18 Jun 2008 10:59:40 +0000 Subject: [PATCH] Fixed a bug in the timer code which made it impossible to delete a timer with id '0' (since pre-svn, still present in jAthena). Fixed wrong order of parameters in a ShowWarning call when freeing a locked DBMap, which caused a segfault when executed (since initial implementation in r4859). git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@12854 54d463be-8e91-2dee-dedb-b68131a5f0ec --- src/common/db.c | 2 +- src/common/timer.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/common/db.c b/src/common/db.c index be27146039..6506fb8894 100644 --- a/src/common/db.c +++ b/src/common/db.c @@ -2052,7 +2052,7 @@ static int db_obj_vdestroy(DBMap* self, DBApply func, va_list args) if (db->free_lock) ShowWarning("db_vdestroy: Database is still in use, %u lock(s) left. Continuing database destruction.\n" "Database allocated at %s:%d\n", - db->alloc_file, db->alloc_line, db->free_lock); + db->free_lock, db->alloc_file, db->alloc_line); #ifdef DB_ENABLE_STATS switch (db->type) { diff --git a/src/common/timer.c b/src/common/timer.c index b76a82da6d..2252a3da85 100644 --- a/src/common/timer.c +++ b/src/common/timer.c @@ -283,7 +283,7 @@ struct TimerData* get_timer(int tid) /// Returns 0 on success, < 0 on failure. int delete_timer(int tid, TimerFunc func) { - if( tid <= 0 || tid >= timer_data_num ) { + if( tid < 0 || tid >= timer_data_num ) { ShowError("delete_timer error : no such timer %d (%08x(%s))\n", tid, (int)func, search_timer_func_list(func)); return -1; }