replace all %lld instances

src/internfile/mh_mbox.cpp

@@ -123,8 +123,8 @@ public:
             return -1;
         }
         if (fseeko(fp, cacheoffset(msgnum), SEEK_SET) != 0) {
-            LOGDEB0(("MboxCache::get_offsets: seek %lld errno %d\n",
-                     cacheoffset(msgnum), errno));
+            LOGDEB0(("MboxCache::get_offsets: seek %s errno %d\n",
+                     lltodecstr(cacheoffset(msgnum)).c_str(), errno));
             return -1;
         }
         mbhoff_type offset = -1;
@@ -135,7 +135,7 @@ public:
                      ret, errno));
             return -1;
         }
-        LOGDEB0(("MboxCache::get_offsets: ret %lld\n", (long long)offset));
+        LOGDEB0(("MboxCache::get_offsets: ret %s\n", lltodecstr(offset).c_str()));
         return offset;
     }
 

src/internfile/mh_text.cpp

@@ -43,8 +43,8 @@ const int KB = 1024;
 // Process a plain text file
 bool MimeHandlerText::set_document_file(const string& mt, const string &fn)
 {
-    LOGDEB(("MimeHandlerText::set_document_file: [%s] offs %lld\n",
-            fn.c_str(), m_offs));
+    LOGDEB(("MimeHandlerText::set_document_file: [%s] offs %s\n",
+            fn.c_str(), lltodecstr(m_offs).c_str()));
 
     RecollFilter::set_document_file(mt, fn);
 
@@ -109,8 +109,9 @@ bool MimeHandlerText::set_document_string(const string& mt, const string& otext)
 
 bool MimeHandlerText::skip_to_document(const string& ipath)
 {
-    long long t;
-    if (sscanf(ipath.c_str(), "%lld", &t) != 1) {
+    char *endptr;
+    long long t = strtoll(ipath.c_str(), &endptr, 10);
+    if (endptr == ipath.c_str()) {
 	LOGERR(("MimeHandlerText::skip_to_document: bad ipath offs [%s]\n",
 		ipath.c_str()));
 	return false;
@@ -156,8 +157,7 @@ bool MimeHandlerText::next_document()
         // first chunk). This is a hack. The right thing to do would
         // be to use a different mtype for files over the page size,
         // and keep text/plain only for smaller files.
-        char buf[30];
-        sprintf(buf, "%lld", (long long)(m_offs - srclen));
+        string buf = lltodecstr(m_offs - srclen);
         if (m_offs - srclen != 0)
             m_metaData[cstr_dj_keyipath] = buf;
         readnext();

src/internfile/uncomp.cpp

@@ -85,9 +85,10 @@ bool Uncomp::uncompressfile(const string& ifn,
         long long filembs = fsize / (1024 * 1024); 
         
         if (availmbs < 2 * filembs + 1) {
-            LOGERR(("uncompressfile. %lld MBs available in %s not enough "
-                    "to uncompress %s of size %lld mbs\n", availmbs,
-                    m_dir->dirname(), ifn.c_str(), filembs));
+            LOGERR(("uncompressfile. %s MBs available in %s not enough "
+                    "to uncompress %s of size %s mbs\n", 
+                    lltodecstr(availmbs).c_str(), m_dir->dirname(), 
+                    ifn.c_str(), lltodecstr(filembs).c_str()));
             return false;
         }
     }