diff options
| author | Andrei Karas <akaras@inbox.ru> | 2016-04-04 17:08:44 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2016-04-04 17:08:44 +0300 |
| commit | 3732bd4a6b708651f6b4bcd32d6beb2b7f49c478 (patch) | |
| tree | 83155915c35c72d018108231437248cc78d5060d /src/map/storage.c | |
| parent | 0bd30a0fac1db1b478b3173a22a81bd5249113f8 (diff) | |
| parent | 9147fe9473b26ee32aafed65fd02b03f11397629 (diff) | |
| download | hercules-3732bd4a6b708651f6b4bcd32d6beb2b7f49c478.tar.gz hercules-3732bd4a6b708651f6b4bcd32d6beb2b7f49c478.tar.bz2 hercules-3732bd4a6b708651f6b4bcd32d6beb2b7f49c478.tar.xz hercules-3732bd4a6b708651f6b4bcd32d6beb2b7f49c478.zip | |
Merge pull request #1210 from HerculesWS/wcast_qual
Added -Wcast-qual compiler flag
Diffstat (limited to 'src/map/storage.c')
| -rw-r--r-- | src/map/storage.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/map/storage.c b/src/map/storage.c index ceac85916..91b37eb19 100644 --- a/src/map/storage.c +++ b/src/map/storage.c @@ -52,8 +52,8 @@ struct guild_storage_interface *gstorage; *------------------------------------------*/ int storage_comp_item(const void *i1_, const void *i2_) { - const struct item *i1 = (const struct item *)i1_; - const struct item *i2 = (const struct item *)i2_; + const struct item *i1 = i1_; + const struct item *i2 = i2_; if (i1->nameid == i2->nameid) return 0; @@ -79,7 +79,7 @@ void storage_sortitem(struct item* items, unsigned int size) * Parses storage and saves 'dirty' ones upon reconnect. [Skotlex] * @see DBApply */ -int storage_reconnect_sub(DBKey key, DBData *data, va_list ap) +int storage_reconnect_sub(union DBKey key, struct DBData *data, va_list ap) { struct guild_storage *stor = DB->data2ptr(data); if (stor->dirty && stor->storage_status == 0) //Save closed storages. @@ -366,7 +366,7 @@ void storage_storage_quit(struct map_session_data* sd, int flag) { /** * @see DBCreateData */ -DBData create_guildstorage(DBKey key, va_list args) +struct DBData create_guildstorage(union DBKey key, va_list args) { struct guild_storage *gs = NULL; gs = (struct guild_storage *) aCalloc(sizeof(struct guild_storage), 1); |