Sanitized and improved several macros through the code

- Sanitized all potentially unsafe macros (related eA:15259)
- Improved some function-like macros to evaluate their argument only
  once and keep it in a temporary variable.  This improves performance
  in the damage calculation related code.

Signed-off-by: Haru <haru@dotalux.com>

1 files changed, 6 insertions, 6 deletions

diff --git a/src/common/db.h b/src/common/db.h
index dffd2356d..b9d6af382 100644
--- a/src/common/db.h
+++ b/src/common/db.h
@@ -659,14 +659,14 @@ struct DBMap {
 #define stridb_alloc(opt,maxlen)  DB->alloc(__FILE__,__func__,__LINE__,DB_ISTRING,(opt),(maxlen))
 #define db_destroy(db)            ( (db)->destroy((db),NULL) )
 // Other macros
-#define db_clear(db)        ( (db)->clear(db,NULL) )
+#define db_clear(db)        ( (db)->clear((db),NULL) )
 #define db_size(db)         ( (db)->size(db) )
 #define db_iterator(db)     ( (db)->iterator(db) )
-#define dbi_first(dbi)      ( DB->data2ptr((dbi)->first(dbi,NULL)) )
-#define dbi_last(dbi)       ( DB->data2ptr((dbi)->last(dbi,NULL)) )
-#define dbi_next(dbi)       ( DB->data2ptr((dbi)->next(dbi,NULL)) )
-#define dbi_prev(dbi)       ( DB->data2ptr((dbi)->prev(dbi,NULL)) )
-#define dbi_remove(dbi)     ( (dbi)->remove(dbi,NULL) )
+#define dbi_first(dbi)      ( DB->data2ptr((dbi)->first((dbi),NULL)) )
+#define dbi_last(dbi)       ( DB->data2ptr((dbi)->last((dbi),NULL)) )
+#define dbi_next(dbi)       ( DB->data2ptr((dbi)->next((dbi),NULL)) )
+#define dbi_prev(dbi)       ( DB->data2ptr((dbi)->prev((dbi),NULL)) )
+#define dbi_remove(dbi)     ( (dbi)->remove((dbi),NULL) )
 #define dbi_exists(dbi)     ( (dbi)->exists(dbi) )
 #define dbi_destroy(dbi)    ( (dbi)->destroy(dbi) )