summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorQuipyowert2 <38995150+Quipyowert2@users.noreply.github.com>2020-02-12 21:04:53 -0800
committerMichael Lutz <michi@icosahedron.de>2020-02-13 21:36:37 +0100
commitacb3d10832c92c9f93c3a4d50b00774274bac8c7 (patch)
treeb7d61ff3e9ca61c124fe74831f48e0e00f35ca29
parent2196cd3cf87f2fa164ad746b87e2686e2b207158 (diff)
downloadopenttd-acb3d10832c92c9f93c3a4d50b00774274bac8c7.tar.xz
Codechange: Format unsigned integers with %u instead of %i or %d.
-rw-r--r--src/fios.cpp2
-rw-r--r--src/newgrf_profiling.cpp2
-rw-r--r--src/pathfinder/npf/queue.cpp10
-rw-r--r--src/strgen/strgen.cpp2
4 files changed, 8 insertions, 8 deletions
diff --git a/src/fios.cpp b/src/fios.cpp
index 24487174b..61f08d93a 100644
--- a/src/fios.cpp
+++ b/src/fios.cpp
@@ -697,7 +697,7 @@ public:
if (f == nullptr) return false;
ScenarioIdentifier id;
- int fret = fscanf(f, "%i", &id.scenid);
+ int fret = fscanf(f, "%u", &id.scenid);
FioFCloseFile(f);
if (fret != 1) return false;
strecpy(id.filename, filename, lastof(id.filename));
diff --git a/src/newgrf_profiling.cpp b/src/newgrf_profiling.cpp
index e9a0dd92d..17f32384d 100644
--- a/src/newgrf_profiling.cpp
+++ b/src/newgrf_profiling.cpp
@@ -109,7 +109,7 @@ uint32 NewGRFProfiler::Finish()
fputs("Tick,Sprite,Feature,Item,CallbackID,Microseconds,Depth,Result\n", f);
for (const Call &c : this->calls) {
- fprintf(f, "%u,%u,0x%X,%d,0x%X,%u,%u,%u\n", c.tick, c.root_sprite, c.feat, c.item, (uint)c.cb, c.time, c.subs, c.result);
+ fprintf(f, "%u,%u,0x%X,%u,0x%X,%u,%u,%u\n", c.tick, c.root_sprite, c.feat, c.item, (uint)c.cb, c.time, c.subs, c.result);
total_microseconds += c.time;
}
diff --git a/src/pathfinder/npf/queue.cpp b/src/pathfinder/npf/queue.cpp
index 64ea3bfca..960cda8e5 100644
--- a/src/pathfinder/npf/queue.cpp
+++ b/src/pathfinder/npf/queue.cpp
@@ -305,16 +305,16 @@ void Hash::PrintStatistics() const
}
printf(
"---\n"
- "Hash size: %d\n"
- "Nodes used: %d\n"
- "Non empty buckets: %d\n"
- "Max collision: %d\n",
+ "Hash size: %u\n"
+ "Nodes used: %u\n"
+ "Non empty buckets: %u\n"
+ "Max collision: %u\n",
this->num_buckets, this->size, used_buckets, max_collision
);
printf("{ ");
for (i = 0; i <= max_collision; i++) {
if (usage[i] > 0) {
- printf("%d:%d ", i, usage[i]);
+ printf("%u:%u ", i, usage[i]);
#if 0
if (i > 0) {
uint j;
diff --git a/src/strgen/strgen.cpp b/src/strgen/strgen.cpp
index c59be0021..87bac5ab6 100644
--- a/src/strgen/strgen.cpp
+++ b/src/strgen/strgen.cpp
@@ -310,7 +310,7 @@ struct HeaderFileWriter : HeaderWriter, FileWriter {
fprintf(this->fh,
"\n"
"static const uint LANGUAGE_PACK_VERSION = 0x%X;\n"
- "static const uint LANGUAGE_MAX_PLURAL = %d;\n"
+ "static const uint LANGUAGE_MAX_PLURAL = %u;\n"
"static const uint LANGUAGE_MAX_PLURAL_FORMS = %d;\n\n",
(uint)data.Version(), (uint)lengthof(_plural_forms), max_plural_forms
);