recoll / Code / Diff of /src/utils/readfile.cpp

Diff of /src/utils/readfile.cpp [fcc62b] .. [88685d]

Switch to side-by-side view

--- a/src/utils/readfile.cpp
+++ b/src/utils/readfile.cpp
@@ -78,7 +78,7 @@
 public:
     FileToString(string& data) : m_data(data) {}
     string& m_data;
-    bool init(unsigned int size, string *reason) {
+    bool init(size_t size, string *reason) {
 	if (size > 0)
 	    m_data.reserve(size); 
 	return true;
@@ -135,10 +135,10 @@
 	noclosing = false;
     }
 
-    if (st.st_size > 0) {
+    if (cnttoread != (size_t)-1 && cnttoread) {
+	doer->init(cnttoread+1, reason);
+    } else if (st.st_size > 0) {
 	doer->init(st.st_size+1, reason);
-    } else if (cnttoread) {
-	doer->init(cnttoread+1, reason);
     } else {
 	doer->init(0, reason);
     }