diff options
| author | gepard1984 <gepard1984@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2012-03-13 15:20:58 +0000 |
|---|---|---|
| committer | gepard1984 <gepard1984@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2012-03-13 15:20:58 +0000 |
| commit | d09a65227657845550ba2ea310c5cf669646d433 (patch) | |
| tree | ccadc7a28c93df704d269717cd29aa68098b9fa4 /src/common/db.h | |
| parent | dc5babf8c3fb943a22c440f5afd6957b121926c5 (diff) | |
| download | hercules-d09a65227657845550ba2ea310c5cf669646d433.tar.gz hercules-d09a65227657845550ba2ea310c5cf669646d433.tar.bz2 hercules-d09a65227657845550ba2ea310c5cf669646d433.tar.xz hercules-d09a65227657845550ba2ea310c5cf669646d433.zip | |
- Added missing parameter to `db_iput` and `db_uiput` macros (follow-up to r15682).
- Numeric global variables (mapreg) now utilize `DBMap`'s ability to store integer-type data (follow-up to r15682).
- Minor code cleanup: replaced some `DBMap` function calls with macros.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@15683 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/common/db.h')
| -rw-r--r-- | src/common/db.h | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/common/db.h b/src/common/db.h index 49a95a135..4fe6a93d6 100644 --- a/src/common/db.h +++ b/src/common/db.h @@ -628,16 +628,16 @@ struct DBMap { #define strdb_put(db,k,d) ( (db)->put((db),db_str2key(k),db_ptr2data(d),NULL) ) // Put int-type data into DBMaps of various key types -#define db_iput(db,k,d) ( (db)->put((db),(k),db_i2data(d)) ) -#define idb_iput(db,k,d) ( (db)->put((db),db_i2key(k),db_i2data(d)) ) -#define uidb_iput(db,k,d) ( (db)->put((db),db_ui2key(k),db_i2data(d)) ) -#define strdb_iput(db,k,d) ( (db)->put((db),db_str2key(k),db_i2data(d)) ) +#define db_iput(db,k,d) ( (db)->put((db),(k),db_i2data(d),NULL) ) +#define idb_iput(db,k,d) ( (db)->put((db),db_i2key(k),db_i2data(d),NULL) ) +#define uidb_iput(db,k,d) ( (db)->put((db),db_ui2key(k),db_i2data(d),NULL) ) +#define strdb_iput(db,k,d) ( (db)->put((db),db_str2key(k),db_i2data(d),NULL) ) // Put uint-type data into DBMaps of various key types -#define db_uiput(db,k,d) ( (db)->put((db),(k),db_ui2data(d)) ) -#define idb_uiput(db,k,d) ( (db)->put((db),db_i2key(k),db_ui2data(d)) ) -#define uidb_uiput(db,k,d) ( (db)->put((db),db_ui2key(k),db_ui2data(d)) ) -#define strdb_uiput(db,k,d) ( (db)->put((db),db_str2key(k),db_ui2data(d)) ) +#define db_uiput(db,k,d) ( (db)->put((db),(k),db_ui2data(d),NULL) ) +#define idb_uiput(db,k,d) ( (db)->put((db),db_i2key(k),db_ui2data(d),NULL) ) +#define uidb_uiput(db,k,d) ( (db)->put((db),db_ui2key(k),db_ui2data(d),NULL) ) +#define strdb_uiput(db,k,d) ( (db)->put((db),db_str2key(k),db_ui2data(d),NULL) ) // Remove entry from DBMaps of various key types #define db_remove(db,k) ( (db)->remove((db),(k),NULL) ) |