Ticket #886: read_file-integer-types-fix.diff

lib/util.h

@@ -71 +71 @@
 extern void mysql_timestamp(double, char*);
 
 extern void boinc_crash();
-extern int read_file_malloc(const char* path, char*&, int max_len=0, bool tail=false);
-extern int read_file_string(const char* path, std::string&, int max_len=0, bool tail=false);
+extern int read_file_malloc(const char* path, char*& buf, size_t max_len=0, bool tail=false);
+extern int read_file_string(const char* path, std::string& result, size_t max_len=0, bool tail=false);
 
 #ifdef _WIN32
 

lib/util.cpp

@@ -306 +306 @@
 
 // read file (at most max_len chars, if nonzero) into malloc'd buf
 //
-int read_file_malloc(const char* path, char*& buf, int max_len, bool tail) {
-    int retval, isize;
+int read_file_malloc(const char* path, char*& buf, size_t max_len, bool tail) {
+    int retval;
     double size;
 
     retval = file_size(path, size);
@@ -328 +328 @@
         size = max_len;
     }
 #endif
-    isize = (int) size;
+    size_t isize = size;
     buf = (char*)malloc(isize+1);
     size_t n = fread(buf, 1, isize, f);
     buf[n] = 0;
@@ -338 +338 @@
 
 // read file (at most max_len chars, if nonzero) into string
 //
-int read_file_string(const char* path, string& result, int max_len, bool tail) {
+int read_file_string(const char* path, string& result, size_t max_len, bool tail) {
     result.erase();
     int retval;
     char* buf;