pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2026-06-25 14:38: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_guild_ranks_repository.h
+40 -40
View File
@@ -19,17 +19,17 @@
class BaseGuildRanksRepository {
public:
struct GuildRanks {
int guild_id;
int rank;
uint32_t guild_id;
uint8_t rank;
std::string title;
int can_hear;
int can_speak;
int can_invite;
int can_remove;
int can_promote;
int can_demote;
int can_motd;
int can_warpeace;
uint8_t can_hear;
uint8_t can_speak;
uint8_t can_invite;
uint8_t can_remove;
uint8_t can_promote;
uint8_t can_demote;
uint8_t can_motd;
uint8_t can_warpeace;
};
static std::string PrimaryKey()
@@ -154,17 +154,17 @@ public:
if (results.RowCount() == 1) {
GuildRanks e{};
e.guild_id = atoi(row[0]);
e.rank = atoi(row[1]);
e.guild_id = static_cast<uint32_t>(strtoul(row[0], nullptr, 10));
e.rank = static_cast<uint8_t>(strtoul(row[1], nullptr, 10));
e.title = row[2] ? row[2] : "";
e.can_hear = atoi(row[3]);
e.can_speak = atoi(row[4]);
e.can_invite = atoi(row[5]);
e.can_remove = atoi(row[6]);
e.can_promote = atoi(row[7]);
e.can_demote = atoi(row[8]);
e.can_motd = atoi(row[9]);
e.can_warpeace = atoi(row[10]);
e.can_hear = static_cast<uint8_t>(strtoul(row[3], nullptr, 10));
e.can_speak = static_cast<uint8_t>(strtoul(row[4], nullptr, 10));
e.can_invite = static_cast<uint8_t>(strtoul(row[5], nullptr, 10));
e.can_remove = static_cast<uint8_t>(strtoul(row[6], nullptr, 10));
e.can_promote = static_cast<uint8_t>(strtoul(row[7], nullptr, 10));
e.can_demote = static_cast<uint8_t>(strtoul(row[8], nullptr, 10));
e.can_motd = static_cast<uint8_t>(strtoul(row[9], nullptr, 10));
e.can_warpeace = static_cast<uint8_t>(strtoul(row[10], nullptr, 10));
return e;
}
@@ -314,17 +314,17 @@ public:
for (auto row = results.begin(); row != results.end(); ++row) {
GuildRanks e{};
e.guild_id = atoi(row[0]);
e.rank = atoi(row[1]);
e.guild_id = static_cast<uint32_t>(strtoul(row[0], nullptr, 10));
e.rank = static_cast<uint8_t>(strtoul(row[1], nullptr, 10));
e.title = row[2] ? row[2] : "";
e.can_hear = atoi(row[3]);
e.can_speak = atoi(row[4]);
e.can_invite = atoi(row[5]);
e.can_remove = atoi(row[6]);
e.can_promote = atoi(row[7]);
e.can_demote = atoi(row[8]);
e.can_motd = atoi(row[9]);
e.can_warpeace = atoi(row[10]);
e.can_hear = static_cast<uint8_t>(strtoul(row[3], nullptr, 10));
e.can_speak = static_cast<uint8_t>(strtoul(row[4], nullptr, 10));
e.can_invite = static_cast<uint8_t>(strtoul(row[5], nullptr, 10));
e.can_remove = static_cast<uint8_t>(strtoul(row[6], nullptr, 10));
e.can_promote = static_cast<uint8_t>(strtoul(row[7], nullptr, 10));
e.can_demote = static_cast<uint8_t>(strtoul(row[8], nullptr, 10));
e.can_motd = static_cast<uint8_t>(strtoul(row[9], nullptr, 10));
e.can_warpeace = static_cast<uint8_t>(strtoul(row[10], nullptr, 10));
all_entries.push_back(e);
}
@@ -349,17 +349,17 @@ public:
for (auto row = results.begin(); row != results.end(); ++row) {
GuildRanks e{};
e.guild_id = atoi(row[0]);
e.rank = atoi(row[1]);
e.guild_id = static_cast<uint32_t>(strtoul(row[0], nullptr, 10));
e.rank = static_cast<uint8_t>(strtoul(row[1], nullptr, 10));
e.title = row[2] ? row[2] : "";
e.can_hear = atoi(row[3]);
e.can_speak = atoi(row[4]);
e.can_invite = atoi(row[5]);
e.can_remove = atoi(row[6]);
e.can_promote = atoi(row[7]);
e.can_demote = atoi(row[8]);
e.can_motd = atoi(row[9]);
e.can_warpeace = atoi(row[10]);
e.can_hear = static_cast<uint8_t>(strtoul(row[3], nullptr, 10));
e.can_speak = static_cast<uint8_t>(strtoul(row[4], nullptr, 10));
e.can_invite = static_cast<uint8_t>(strtoul(row[5], nullptr, 10));
e.can_remove = static_cast<uint8_t>(strtoul(row[6], nullptr, 10));
e.can_promote = static_cast<uint8_t>(strtoul(row[7], nullptr, 10));
e.can_demote = static_cast<uint8_t>(strtoul(row[8], nullptr, 10));
e.can_motd = static_cast<uint8_t>(strtoul(row[9], nullptr, 10));
e.can_warpeace = static_cast<uint8_t>(strtoul(row[10], nullptr, 10));
all_entries.push_back(e);
}