pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2026-06-24 17:48:20 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[Repositories] Add more precise types to repository generator (#2391)

Browse Source 
* Make utils/scripts/generators/repository-generator.pl aware of more
datatypes

This adds support for unsigned and more integer types. It also avoids
using parsing functions that require casting (still needed in some
cases)

Having the data types in the Repository structs better map to the types
in the database will allow us to avoid casting when we pull data out of
them. And as a benefit, assume something is wrong if we do :)

Hopefully clean up some warnings due to casting too.

Co-authored-by: Akkadius <akkadius1@gmail.com>
This commit is contained in:
Michael Cook (mackal)
2022-08-31 01:04:27 -04:00
committed by GitHub
parent fcf01f6d87
commit 6f7fa98996
183 changed files with 7849 additions and 7818 deletions
Download Patch File Download Diff File Expand all files Collapse all files
common/repositories/base/base_object_contents_repository.h
+45 -45
View File
@@ -19,18 +19,18 @@
class BaseObjectContentsRepository {
public:
struct ObjectContents {
int zoneid;
int parentid;
int bagidx;
int itemid;
int charges;
time_t droptime;
int augslot1;
int augslot2;
int augslot3;
int augslot4;
int augslot5;
int augslot6;
uint32_t zoneid;
uint32_t parentid;
uint32_t bagidx;
uint32_t itemid;
int16_t charges;
time_t droptime;
uint32_t augslot1;
uint32_t augslot2;
uint32_t augslot3;
uint32_t augslot4;
uint32_t augslot5;
int32_t augslot6;
};
static std::string PrimaryKey()
@@ -158,18 +158,18 @@ public:
if (results.RowCount() == 1) {
ObjectContents e{};
e.zoneid = atoi(row[0]);
e.parentid = atoi(row[1]);
e.bagidx = atoi(row[2]);
e.itemid = atoi(row[3]);
e.charges = atoi(row[4]);
e.zoneid = static_cast<uint32_t>(strtoul(row[0], nullptr, 10));
e.parentid = static_cast<uint32_t>(strtoul(row[1], nullptr, 10));
e.bagidx = static_cast<uint32_t>(strtoul(row[2], nullptr, 10));
e.itemid = static_cast<uint32_t>(strtoul(row[3], nullptr, 10));
e.charges = static_cast<int16_t>(atoi(row[4]));
e.droptime = strtoll(row[5] ? row[5] : "-1", nullptr, 10);
e.augslot1 = atoi(row[6]);
e.augslot2 = atoi(row[7]);
e.augslot3 = atoi(row[8]);
e.augslot4 = atoi(row[9]);
e.augslot5 = atoi(row[10]);
e.augslot6 = atoi(row[11]);
e.augslot1 = static_cast<uint32_t>(strtoul(row[6], nullptr, 10));
e.augslot2 = static_cast<uint32_t>(strtoul(row[7], nullptr, 10));
e.augslot3 = static_cast<uint32_t>(strtoul(row[8], nullptr, 10));
e.augslot4 = static_cast<uint32_t>(strtoul(row[9], nullptr, 10));
e.augslot5 = static_cast<uint32_t>(strtoul(row[10], nullptr, 10));
e.augslot6 = static_cast<int32_t>(atoi(row[11]));
return e;
}
@@ -322,18 +322,18 @@ public:
for (auto row = results.begin(); row != results.end(); ++row) {
ObjectContents e{};
e.zoneid = atoi(row[0]);
e.parentid = atoi(row[1]);
e.bagidx = atoi(row[2]);
e.itemid = atoi(row[3]);
e.charges = atoi(row[4]);
e.zoneid = static_cast<uint32_t>(strtoul(row[0], nullptr, 10));
e.parentid = static_cast<uint32_t>(strtoul(row[1], nullptr, 10));
e.bagidx = static_cast<uint32_t>(strtoul(row[2], nullptr, 10));
e.itemid = static_cast<uint32_t>(strtoul(row[3], nullptr, 10));
e.charges = static_cast<int16_t>(atoi(row[4]));
e.droptime = strtoll(row[5] ? row[5] : "-1", nullptr, 10);
e.augslot1 = atoi(row[6]);
e.augslot2 = atoi(row[7]);
e.augslot3 = atoi(row[8]);
e.augslot4 = atoi(row[9]);
e.augslot5 = atoi(row[10]);
e.augslot6 = atoi(row[11]);
e.augslot1 = static_cast<uint32_t>(strtoul(row[6], nullptr, 10));
e.augslot2 = static_cast<uint32_t>(strtoul(row[7], nullptr, 10));
e.augslot3 = static_cast<uint32_t>(strtoul(row[8], nullptr, 10));
e.augslot4 = static_cast<uint32_t>(strtoul(row[9], nullptr, 10));
e.augslot5 = static_cast<uint32_t>(strtoul(row[10], nullptr, 10));
e.augslot6 = static_cast<int32_t>(atoi(row[11]));
all_entries.push_back(e);
}
@@ -358,18 +358,18 @@ public:
for (auto row = results.begin(); row != results.end(); ++row) {
ObjectContents e{};
e.zoneid = atoi(row[0]);
e.parentid = atoi(row[1]);
e.bagidx = atoi(row[2]);
e.itemid = atoi(row[3]);
e.charges = atoi(row[4]);
e.zoneid = static_cast<uint32_t>(strtoul(row[0], nullptr, 10));
e.parentid = static_cast<uint32_t>(strtoul(row[1], nullptr, 10));
e.bagidx = static_cast<uint32_t>(strtoul(row[2], nullptr, 10));
e.itemid = static_cast<uint32_t>(strtoul(row[3], nullptr, 10));
e.charges = static_cast<int16_t>(atoi(row[4]));
e.droptime = strtoll(row[5] ? row[5] : "-1", nullptr, 10);
e.augslot1 = atoi(row[6]);
e.augslot2 = atoi(row[7]);
e.augslot3 = atoi(row[8]);
e.augslot4 = atoi(row[9]);
e.augslot5 = atoi(row[10]);
e.augslot6 = atoi(row[11]);
e.augslot1 = static_cast<uint32_t>(strtoul(row[6], nullptr, 10));
e.augslot2 = static_cast<uint32_t>(strtoul(row[7], nullptr, 10));
e.augslot3 = static_cast<uint32_t>(strtoul(row[8], nullptr, 10));
e.augslot4 = static_cast<uint32_t>(strtoul(row[9], nullptr, 10));
e.augslot5 = static_cast<uint32_t>(strtoul(row[10], nullptr, 10));
e.augslot6 = static_cast<int32_t>(atoi(row[11]));
all_entries.push_back(e);
}