pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2026-06-24 05:18:40 +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_spawn_events_repository.h
+48 -48
View File
@@ -19,20 +19,20 @@
class BaseSpawnEventsRepository {
public:
struct SpawnEvents {
int id;
uint32_t id;
std::string zone;
int cond_id;
uint32_t cond_id;
std::string name;
int period;
int next_minute;
int next_hour;
int next_day;
int next_month;
int next_year;
int enabled;
int action;
int argument;
int strict;
uint32_t period;
uint8_t next_minute;
uint8_t next_hour;
uint8_t next_day;
uint8_t next_month;
uint32_t next_year;
int8_t enabled;
uint8_t action;
int32_t argument;
int8_t strict;
};
static std::string PrimaryKey()
@@ -166,20 +166,20 @@ public:
if (results.RowCount() == 1) {
SpawnEvents e{};
e.id = atoi(row[0]);
e.id = static_cast<uint32_t>(strtoul(row[0], nullptr, 10));
e.zone = row[1] ? row[1] : "";
e.cond_id = atoi(row[2]);
e.cond_id = static_cast<uint32_t>(strtoul(row[2], nullptr, 10));
e.name = row[3] ? row[3] : "";
e.period = atoi(row[4]);
e.next_minute = atoi(row[5]);
e.next_hour = atoi(row[6]);
e.next_day = atoi(row[7]);
e.next_month = atoi(row[8]);
e.next_year = atoi(row[9]);
e.enabled = atoi(row[10]);
e.action = atoi(row[11]);
e.argument = atoi(row[12]);
e.strict = atoi(row[13]);
e.period = static_cast<uint32_t>(strtoul(row[4], nullptr, 10));
e.next_minute = static_cast<uint8_t>(strtoul(row[5], nullptr, 10));
e.next_hour = static_cast<uint8_t>(strtoul(row[6], nullptr, 10));
e.next_day = static_cast<uint8_t>(strtoul(row[7], nullptr, 10));
e.next_month = static_cast<uint8_t>(strtoul(row[8], nullptr, 10));
e.next_year = static_cast<uint32_t>(strtoul(row[9], nullptr, 10));
e.enabled = static_cast<int8_t>(atoi(row[10]));
e.action = static_cast<uint8_t>(strtoul(row[11], nullptr, 10));
e.argument = static_cast<int32_t>(atoi(row[12]));
e.strict = static_cast<int8_t>(atoi(row[13]));
return e;
}
@@ -337,20 +337,20 @@ public:
for (auto row = results.begin(); row != results.end(); ++row) {
SpawnEvents e{};
e.id = atoi(row[0]);
e.id = static_cast<uint32_t>(strtoul(row[0], nullptr, 10));
e.zone = row[1] ? row[1] : "";
e.cond_id = atoi(row[2]);
e.cond_id = static_cast<uint32_t>(strtoul(row[2], nullptr, 10));
e.name = row[3] ? row[3] : "";
e.period = atoi(row[4]);
e.next_minute = atoi(row[5]);
e.next_hour = atoi(row[6]);
e.next_day = atoi(row[7]);
e.next_month = atoi(row[8]);
e.next_year = atoi(row[9]);
e.enabled = atoi(row[10]);
e.action = atoi(row[11]);
e.argument = atoi(row[12]);
e.strict = atoi(row[13]);
e.period = static_cast<uint32_t>(strtoul(row[4], nullptr, 10));
e.next_minute = static_cast<uint8_t>(strtoul(row[5], nullptr, 10));
e.next_hour = static_cast<uint8_t>(strtoul(row[6], nullptr, 10));
e.next_day = static_cast<uint8_t>(strtoul(row[7], nullptr, 10));
e.next_month = static_cast<uint8_t>(strtoul(row[8], nullptr, 10));
e.next_year = static_cast<uint32_t>(strtoul(row[9], nullptr, 10));
e.enabled = static_cast<int8_t>(atoi(row[10]));
e.action = static_cast<uint8_t>(strtoul(row[11], nullptr, 10));
e.argument = static_cast<int32_t>(atoi(row[12]));
e.strict = static_cast<int8_t>(atoi(row[13]));
all_entries.push_back(e);
}
@@ -375,20 +375,20 @@ public:
for (auto row = results.begin(); row != results.end(); ++row) {
SpawnEvents e{};
e.id = atoi(row[0]);
e.id = static_cast<uint32_t>(strtoul(row[0], nullptr, 10));
e.zone = row[1] ? row[1] : "";
e.cond_id = atoi(row[2]);
e.cond_id = static_cast<uint32_t>(strtoul(row[2], nullptr, 10));
e.name = row[3] ? row[3] : "";
e.period = atoi(row[4]);
e.next_minute = atoi(row[5]);
e.next_hour = atoi(row[6]);
e.next_day = atoi(row[7]);
e.next_month = atoi(row[8]);
e.next_year = atoi(row[9]);
e.enabled = atoi(row[10]);
e.action = atoi(row[11]);
e.argument = atoi(row[12]);
e.strict = atoi(row[13]);
e.period = static_cast<uint32_t>(strtoul(row[4], nullptr, 10));
e.next_minute = static_cast<uint8_t>(strtoul(row[5], nullptr, 10));
e.next_hour = static_cast<uint8_t>(strtoul(row[6], nullptr, 10));
e.next_day = static_cast<uint8_t>(strtoul(row[7], nullptr, 10));
e.next_month = static_cast<uint8_t>(strtoul(row[8], nullptr, 10));
e.next_year = static_cast<uint32_t>(strtoul(row[9], nullptr, 10));
e.enabled = static_cast<int8_t>(atoi(row[10]));
e.action = static_cast<uint8_t>(strtoul(row[11], nullptr, 10));
e.argument = static_cast<int32_t>(atoi(row[12]));
e.strict = static_cast<int8_t>(atoi(row[13]));
all_entries.push_back(e);
}