vm: Use size_t and off_t in a couple of places. Found by Xcode.

diff --git a/vm/io.cpp b/vm/io.cpp
index b58e4a8d5e2ea3bd76f7ec6ca17a7bd6b7171c76..e299e9888607e392d5da89f5dd55a3c3134c48a3 100644 (file)
--- 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 e2b43c551840aabaa65a26410ed7d1bd072483ee..90a981ef31121c9692a8aa4ba6d1eb6b7a5a2845 100644 (file)
--- 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 dd10a05f6b1c7e154bcf43400fb0f6124e2f3559..4bacc4c077322eac297a761837c6ae5b6bf421bc 100644 (file)
--- 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();