From e98d668fcb92ab1f5cdc75008add71125014aef4 Mon Sep 17 00:00:00 2001 From: Doug Coleman Date: Wed, 2 Dec 2020 16:37:22 -0600 Subject: [PATCH] vm: Use size_t and off_t in a couple of places. Found by Xcode. --- vm/io.cpp | 2 +- vm/os-genunix.cpp | 2 +- vm/vm.hpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/vm/io.cpp b/vm/io.cpp index b58e4a8d5e..e299e98886 100644 --- a/vm/io.cpp +++ b/vm/io.cpp @@ -109,7 +109,7 @@ size_t factor_vm::safe_fwrite(void* ptr, size_t size, size_t nitems, return items_written; } -int factor_vm::safe_ftell(FILE* stream) { +off_t factor_vm::safe_ftell(FILE* stream) { off_t offset; for (;;) { if ((offset = FTELL(stream)) == -1) diff --git a/vm/os-genunix.cpp b/vm/os-genunix.cpp index e2b43c5518..90a981ef31 100644 --- a/vm/os-genunix.cpp +++ b/vm/os-genunix.cpp @@ -19,7 +19,7 @@ const char* default_image_path() { if (!path) return strdup("factor.image"); - int len = strlen(path); + size_t len = strlen(path); char* new_path = (char *)malloc(len + SUFFIX_LEN + 1); memcpy(new_path, path, len); memcpy(new_path + len, SUFFIX, SUFFIX_LEN + 1); diff --git a/vm/vm.hpp b/vm/vm.hpp index dd10a05f6b..4bacc4c077 100644 --- a/vm/vm.hpp +++ b/vm/vm.hpp @@ -529,7 +529,7 @@ struct factor_vm { size_t safe_fread(void* ptr, size_t size, size_t nitems, FILE* stream); void safe_fputc(int c, FILE* stream); size_t safe_fwrite(void* ptr, size_t size, size_t nitems, FILE* stream); - int safe_ftell(FILE* stream); + off_t safe_ftell(FILE* stream); void safe_fseek(FILE* stream, off_t offset, int whence); void safe_fflush(FILE* stream); void primitive_fopen(); -- 2.34.1