meta: Fix up format string type specifiers

32-bit platforms (in this case armv6l) had trouble with my haphazard
use of type specifiers. We now use %zu for size_t, and PRI* for
other integer types.

%zu is a POSIX C99 addition, so that should be fine, but I do recall
having issues with PRI* on different platforms. I need to check that
this builds on all platforms before rebasing it on master.

Author: vkoskiv

src/common/json_loader.c

@@ -298,7 +298,7 @@ static void parse_mesh(struct cr_renderer *r, const cJSON *data, int idx, int me
 	long us = timer_get_us(timer);
 	free(full_path);
 	long ms = us / 1000;
-	logr(debug, "Parsing file %-35s took %zu %s\n", file_name, ms > 0 ? ms : us, ms > 0 ? "ms" : "μs");
+	logr(debug, "Parsing file %-35s took %li %s\n", file_name, ms > 0 ? ms : us, ms > 0 ? "ms" : "μs");
 
 	if (!result.meshes.count) return;
 

src/common/loaders/formats/gltf/gltf.c

@@ -63,7 +63,7 @@ unsigned char *parse_buffer(const cJSON *data) {
 		size_t decoded_length = 0;
 		buffer = b64decode(base64data, encoded_length, &decoded_length);
 		if (decoded_length != expected_bytes) {
-			logr(warning, "Invalid buffer while parsing glTF. base64 decoded length of %lu, expected %lu\n", decoded_length, expected_bytes);
+			logr(warning, "Invalid buffer while parsing glTF. base64 decoded length of %zu, expected %zu\n", decoded_length, expected_bytes);
 			free(buffer);
 			return NULL;
 		}
@@ -76,7 +76,7 @@ unsigned char *parse_buffer(const cJSON *data) {
 		}
 		file_data data = file_load(uri_string);
 		if (data.count != expected_bytes) {
-			logr(warning, "Invalid buffer while parsing glTF. Loaded file %s length %lu, expected %lu", uri_string, data.count, expected_bytes);
+			logr(warning, "Invalid buffer while parsing glTF. Loaded file %s length %zu, expected %zu", uri_string, data.count, expected_bytes);
 		}
 		return data.items;
 	}

src/common/logging.h

@@ -8,6 +8,7 @@
 
 #pragma once
 
+#include <inttypes.h>
 #include <c-ray/c-ray.h>
 
 struct renderer;

src/common/mempool.c

@@ -56,6 +56,6 @@ void destroyBlocks(struct block *head) {
 		head = prev;
 	}
 	char *size = human_file_size(bytesfreed, NULL);
-	logr(debug, "Destroyed %lu blocks, %s\n", numDestroyed, size);
+	logr(debug, "Destroyed %zu blocks, %s\n", numDestroyed, size);
 	free(size);
 }

src/common/networking.c

@@ -124,7 +124,8 @@ ssize_t chunkedReceive(int socket, char **data, size_t *length) {
 bail:
 	ASSERT(leftToReceive == 0);
 	size_t finalLength = strlen(recvBuf) + 1; // +1 for null byte
-	if (finalLength < msgLen) logr(error, "Chunked transfer failed. Header size of %lu != %lu. This shouldn't happen.\n", msgLen, finalLength);
+	if (finalLength < msgLen)
+		logr(error, "Chunked transfer failed. Header size of %zu != %zu. This shouldn't happen.\n", msgLen, finalLength);
 	*data = recvBuf;
 	free(currentChunk);
 	free(scratchBuf);

src/common/platform/thread_pool.c

@@ -93,7 +93,7 @@ static void *cr_worker(void *arg) {
 struct cr_thread_pool *thread_pool_create(size_t threads) {
 	if (!threads) threads = 2;
 	struct cr_thread_pool *pool = calloc(1, sizeof(*pool));
-	logr(debug, "Spawning thread pool (%lut, %p)\n", threads, (void *)pool);
+	logr(debug, "Spawning thread pool (%zut, %p)\n", threads, (void *)pool);
 	pool->alive_threads = threads;
 	pool->threads = calloc(pool->alive_threads, sizeof(*pool->threads));
 
@@ -113,7 +113,7 @@ struct cr_thread_pool *thread_pool_create(size_t threads) {
 
 void thread_pool_destroy(struct cr_thread_pool *pool) {
 	if (!pool) return;
-	logr(debug, "Closing thread pool (%lut, %p)\n", pool->alive_threads, (void *)pool);
+	logr(debug, "Closing thread pool (%zut, %p)\n", pool->alive_threads, (void *)pool);
 	mutex_lock(pool->mutex);
 	// Clear work queue
 	struct cr_task *head = pool->first;

src/driver/main.c

@@ -168,7 +168,7 @@ int main(int argc, char *argv[]) {
 			goto done;
 		}
 	}
-	logr(info, "JSON parse took %lums\n", json_ms);
+	logr(info, "JSON parse took %zums\n", json_ms);
 
 	file_free(&input_bytes);
 
@@ -280,11 +280,11 @@ int main(int argc, char *argv[]) {
 	uint64_t samples = cr_renderer_get_num_pref(renderer, cr_renderer_samples);
 	uint64_t bounces = cr_renderer_get_num_pref(renderer, cr_renderer_bounces);
 
-	logr(info, "Starting c-ray renderer for frame %zu\n", out_num);
+	logr(info, "Starting c-ray renderer for frame %"PRIu64"\n", out_num);
 	bool sys_thread = threads == (size_t)sys_get_cores() + 2;
-	logr(info, "Rendering at %s%lu%s x %s%lu%s\n", KWHT, width, KNRM, KWHT, height, KNRM);
-	logr(info, "Rendering %s%zu%s samples with %s%zu%s bounces.\n", KBLU, samples, KNRM, KGRN, bounces, KNRM);
-	logr(info, "Rendering with %s%zu%s%s local thread%s.\n",
+	logr(info, "Rendering at %s%"PRIu64"%s x %s%"PRIu64"%s\n", KWHT, width, KNRM, KWHT, height, KNRM);
+	logr(info, "Rendering %s%"PRIu64"%s samples with %s%"PRIu64"%s bounces.\n", KBLU, samples, KNRM, KGRN, bounces, KNRM);
+	logr(info, "Rendering with %s%"PRIu64"%s%s local thread%s.\n",
 		KRED,
 		sys_thread ? threads - 2 : threads,
 		sys_thread ? "+2" : "",

src/lib/nodes/textures/image.c

@@ -67,7 +67,7 @@ static void dump(const void *node, char *dumpbuf, int len) {
 		snprintf(dumpbuf, len, "imageTexture { tex: pending }");
 		return;
 	}
-	snprintf(dumpbuf, len, "imageTexture { tex: { %lux%lu, %lu channels, %s, %s }, options: %s %s }",
+	snprintf(dumpbuf, len, "imageTexture { tex: { %zux%zu, %zu channels, %s, %s }, options: %s %s }",
 		self->tex->width,
 		self->tex->height,
 		self->tex->channels,

src/lib/protocol/server.c

@@ -385,7 +385,7 @@ struct render_client_arr clients_sync(const struct renderer *r) {
 	char *serialized = serialize_renderer(r);
 	size_t transfer_bytes = strlen(serialized);
 	char buf[64];
-	logr(info, "Sending %s to %lu client%s...\n", human_file_size(transfer_bytes, buf), clients.count, PLURAL(clients.count));
+	logr(info, "Sending %s to %zu client%s...\n", human_file_size(transfer_bytes, buf), clients.count, PLURAL(clients.count));
 
 	struct sync_thread *params = calloc(clients.count, sizeof(*params));
 	logr(debug, "Client list:\n");

src/lib/renderer/renderer.c

@@ -57,7 +57,7 @@ static void print_stats(const struct world *scene) {
 			normals += mesh->vbuf.normals.count;
 		}
 	}
-	logr(info, "Totals: %liV, %liN, %zuI, %liP, %zuS, %zuM\n",
+	logr(info, "Totals: %"PRIu64"V, %"PRIu64"N, %zuI, %"PRIu64"P, %zuS, %zuM\n",
 		   vertices,
 		   normals,
 		   scene->instances.count,
@@ -241,7 +241,8 @@ void renderer_render(struct renderer *r) {
 
 	r->state.s = r_rendering;
 
-	if (r->state.clients.count) logr(info, "Using %lu render worker%s totaling %lu thread%s.\n", r->state.clients.count, PLURAL(r->state.clients.count), r->state.clients.count, PLURAL(r->state.clients.count));
+	if (r->state.clients.count)
+		logr(info, "Using %zu render worker%s totaling %zu thread%s.\n", r->state.clients.count, PLURAL(r->state.clients.count), r->state.clients.count, PLURAL(r->state.clients.count));
 
 	// Select the appropriate renderer type for local use
 	void *(*local_render_thread)(void *) = render_thread;