diff options
| author | ultramage <ultramage@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2008-06-18 10:59:40 +0000 |
|---|---|---|
| committer | ultramage <ultramage@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2008-06-18 10:59:40 +0000 |
| commit | ce45058d3c54a4809128c310c8ec72216fa15d94 (patch) | |
| tree | 14435ea16bdf89f2a877451e743706d8ad8be5e1 | |
| parent | ab859094455fd375d0cb42523b13cf8367315be1 (diff) | |
| download | hercules-ce45058d3c54a4809128c310c8ec72216fa15d94.tar.gz hercules-ce45058d3c54a4809128c310c8ec72216fa15d94.tar.bz2 hercules-ce45058d3c54a4809128c310c8ec72216fa15d94.tar.xz hercules-ce45058d3c54a4809128c310c8ec72216fa15d94.zip | |
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://rathena.svn.sourceforge.net/svnroot/rathena/trunk@12854 54d463be-8e91-2dee-dedb-b68131a5f0ec
| -rw-r--r-- | src/common/db.c | 2 | ||||
| -rw-r--r-- | 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 be2714603..6506fb889 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 b76a82da6..2252a3da8 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; } |