pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2026-05-19 13:28:25 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[Strings] Add more number formatters (#2873)

Browse Source 
* [Strings] Add more number formatters

# Notes
- Adds `Strings::ToUnsignedInt` for `uint32` support.
- Adds `Strings::ToBigInt` for `int64` support.
- Adds `Strings::ToUnsignedBigInt` for `uint64` support.
- Adds `Strings::ToFloat` for `float` support.
- Replaces all `std::stoi` references with `Strings::ToInt`.
- Replaces all `atoi` references with `Strings::ToInt`.
- Replaces all `std::stoul` references with `Strings::ToUnsignedInt`.
- Replaces all `atoul` references with `Strings::ToUnsignedInt`.
- Replaces all `std::stoll` references with `Strings::ToBigInt`.
- Replaces all `atoll` references with `Strings::ToBigInt`.
- Replaces all `std::stoull` references with `Strings::ToUnsignedBigInt`.
- Replaces all `atoull` references with `Strings::ToUnsignedBigInt`.
- Replaces all `std::stof` references with `Strings::ToFloat`.

* [Strings] Add more number formatters

- Adds `Strings::ToUnsignedInt` for `uint32` support.
- Adds `Strings::ToBigInt` for `int64` support.
- Adds `Strings::ToUnsignedBigInt` for `uint64` support.
- Adds `Strings::ToFloat` for `float` support.
- Replaces all `std::stoi` references with `Strings::ToInt`.
- Replaces all `atoi` references with `Strings::ToInt`.
- Replaces all `std::stoul` references with `Strings::ToUnsignedInt`.
- Replaces all `atoul` references with `Strings::ToUnsignedInt`.
- Replaces all `std::stoll` references with `Strings::ToBigInt`.
- Replaces all `atoll` references with `Strings::ToBigInt`.
- Replaces all `std::stoull` references with `Strings::ToUnsignedBigInt`.
- Replaces all `atoull` references with `Strings::ToUnsignedBigInt`.
- Replaces all `std::stof` references with `Strings::ToFloat`.

* Rebase cleanup

* Changes/benchmarks/tests

---------

Co-authored-by: Akkadius <akkadius1@gmail.com>
This commit is contained in:
Alex King
2023-03-04 18:01:19 -05:00
committed by GitHub
parent be567af70d
commit 2a6cf8c8e7
261 changed files with 3178 additions and 3012 deletions
Download Patch File Download Diff File Expand all files Collapse all files
utils/deprecated/ppconvert/ppconvert.cpp
+36 -36
View File
@@ -16,30 +16,30 @@ using namespace std;
int convert_profile_once(char *src, char *dst, int len);
int main() {
char host[200], user[200], passwd[200], database[200];
int32 port=0;
bool compression = false;
bool items[6] = {false, false, false, false, false, false};
if(!DBcore::ReadDBINI(host, user, passwd, database, port, compression, items)) {
exit(1);
}
if (!items[0] || !items[1] || !items[2] || !items[3])
{
printf ("Incomplete DB.INI file.\n");
exit (1);
}
vector<char *> updates;
MYSQL m;
MYSQL out;
mysql_init(&m);
mysql_init(&out);
if(!mysql_real_connect(&m, host, user, passwd, database, 0, NULL, 0)) {
printf("Unable to connect 1: %s.\n", mysql_error(&m));
return(1);
@@ -53,53 +53,53 @@ int main() {
printf("Unable to query.\n");
return(1);
}
MYSQL_RES *res = mysql_use_result(&m);
if(res == NULL) {
printf("Unable to use res.\n");
return(1);
}
char *inbuffer = new char[sizeof(PlayerProfile_Struct)];
MYSQL_ROW row;
unsigned long *lengths;
int convert_count = 0;
int correct_count = 0;
int failed_count = 0;
while((row = mysql_fetch_row(res))) {
lengths = mysql_fetch_lengths(res);
unsigned long id = atoi(row[0]);
unsigned long id = Strings::ToInt(row[0]);
int curlen = lengths[2];
if(curlen == sizeof(PlayerProfile_Struct)) {
correct_count++;
continue; //allready current.
}
fprintf(stderr, "Converting char %lu: %s...", id, row[1]);
//make a copy of the version in the DB
memcpy(inbuffer, row[2], curlen);
char *outbuffer = new char[2*sizeof(PlayerProfile_Struct) + 512];
int steps;
for(steps = 0; steps < MAX_CONVERT_STEPS && curlen != sizeof(PlayerProfile_Struct); steps++) {
//clear outbuffer
memset(outbuffer, 0, sizeof(PlayerProfile_Struct));
fprintf(stderr, " |");
fflush(stderr);
//convert inbuffer one step closer to the current profile, into outbuffer
curlen = convert_profile_once(inbuffer, outbuffer, curlen);
if(curlen == 0)
break;
//copy outbuffer into inbuffer for the next convert step
memcpy(inbuffer, outbuffer, curlen);
}
@@ -111,26 +111,26 @@ int main() {
}
fprintf(stderr, " *");
fflush(stderr);
//the correct profile ends up in inbuffer, so we can escape it into outbuffer
char *bptr = outbuffer;
bptr += snprintf(bptr, 128, "UPDATE character_ SET profile='");
bptr += mysql_real_escape_string(&m, bptr, (const char *) inbuffer, sizeof(PlayerProfile_Struct));
snprintf(bptr, 128, "' WHERE id=%lu", id);
// printf("Query: '%s'\n", outbuffer);
/* if(mysql_query(&out, outbuffer) != 0) {
failed_count++;
printf(" Error updating char id %lu: %s\n", id, mysql_error(&m));
continue;
}
*/
*/
updates.push_back(outbuffer);
fprintf(stderr, " done.\n");
// convert_count++;
}
// mysql_free_result(res);
vector<char *>::iterator cur, end;
cur = updates.begin();
@@ -145,12 +145,12 @@ updates.push_back(outbuffer);
printf(".");
fflush(stdout);
delete[] *cur;
convert_count++;
}
fprintf(stderr, "%d chars converted, %d errors, %d chars were up to date.\n", convert_count, failed_count, correct_count);
mysql_close(&m);
mysql_close(&out);
return(0);
@@ -217,11 +217,11 @@ int convert_profile_once(char *src, char *dst, int len) {
s_ptr+=8;
ptr+=12;
memcpy(ptr,s_ptr,3700);
pp->bind_x=((Before_Sep14th_PlayerProfile_Struct*)newpps)->bind_x;
pp->bind_y=((Before_Sep14th_PlayerProfile_Struct*)newpps)->bind_y;
pp->bind_z=((Before_Sep14th_PlayerProfile_Struct*)newpps)->bind_z;
len = sizeof(Before_Sep14th_PlayerProfile_Struct);
break;
}
@@ -249,7 +249,7 @@ int convert_profile_once(char *src, char *dst, int len) {
pp->bind_x[0]=oldpp->bind_x;
pp->bind_y[0]=oldpp->bind_y;
pp->bind_z[0]=oldpp->bind_z;
len = sizeof(Before_Dec15th_PlayerProfile_Struct);
break;
}
@@ -257,10 +257,10 @@ int convert_profile_once(char *src, char *dst, int len) {
#define StructDist(in, f1, f2) (uint32(&in->f2)-uint32(&in->f1))
Before_Dec15th_PlayerProfile_Struct* ops = (Before_Dec15th_PlayerProfile_Struct*)src;
Before_June29th_PlayerProfile_Struct* pp = (Before_June29th_PlayerProfile_Struct*)dst;
//start with the basics
memcpy(dst, ops, sizeof(Before_June29th_PlayerProfile_Struct));
pp->anon = ops->anon;
pp->guildrank = ops->guildrank;
memcpy(pp->unknown0245, &ops->fatigue, StructDist(ops, fatigue, guildid2));
@@ -270,24 +270,24 @@ int convert_profile_once(char *src, char *dst, int len) {
memcpy(pp->unknown6392, &ops->unknown5248, StructDist(ops, unknown5248, unknown11376));
//put the tribute block in the right place
memcpy(&pp->tribute_time_remaining, &ops->tribute_time_remaining, StructDist(ops, tribute_time_remaining, unknown5764));
//copy over things that maybe moved, but I havent figure out how yet
pp->aapoints = ops->aapoints;
pp->aapoints_spent = ops->aapoints_spent;
len = sizeof(Before_June29th_PlayerProfile_Struct);
}
case sizeof(Before_June29th_PlayerProfile_Struct): {
Before_June29th_PlayerProfile_Struct* ops = (Before_June29th_PlayerProfile_Struct*)src;
memcpy(dst, ops, sizeof(Before_June29th_PlayerProfile_Struct));
len = sizeof(Before_May12_PlayerProfile_Struct);
}
case sizeof(Before_May12_PlayerProfile_Struct): {
Before_May12_PlayerProfile_Struct* ops = (Before_May12_PlayerProfile_Struct*)src;
PlayerProfile_Struct* pp = (PlayerProfile_Struct*)dst;
memcpy(dst, ops, sizeof(Before_May12_PlayerProfile_Struct));
memcpy(&pp->checksum, &ops->checksum, StructDist(ops, checksum, haircolor));
memcpy(&pp->haircolor, &ops->haircolor, StructDist(ops, haircolor, unknown0310[0]));
memcpy(&pp->item_material[0], &ops->item_material[0], StructDist(ops, item_material[0], servername[0]));
@@ -300,7 +300,7 @@ int convert_profile_once(char *src, char *dst, int len) {
memcpy(&pp->tribute_time_remaining, &ops->tribute_time_remaining, StructDist(ops, tribute_time_remaining, unknown6860));
memcpy(&pp->leader_abilities, &ops->leader_abilities, StructDist(ops, leader_abilities, unknown6932[0]));
memcpy(&pp->air_remaining, &ops->air_remaining, StructDist(ops, air_remaining, unknown18492));
/*
* This is the last statement in this switch.
*/