tris/recoll
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

replace all %lld instances

Browse Source
This commit is contained in:
Jean-Francois Dockes
2015-10-03 17:25:17 +02:00
parent fed748b190
commit d942242047
10 changed files with 35 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/utils/circache.cpp
+9 -7
View File
@@ -653,8 +653,8 @@ public:
{
headoffs = offs;
padsize = d.padsize;
LOGDEB2(("CCScanHookRecord::takeone: offs %lld padsize %lld\n",
headoffs, padsize));
LOGDEB2(("CCScanHookRecord::takeone: offs %s padsize %s\n",
lltodecstr(headoffs).c_str(), lltodecstr(padsize).c_str()));
return Continue;
}
};
@@ -666,8 +666,8 @@ string CirCache::getpath()
bool CirCache::create(off_t maxsize, int flags)
{
LOGDEB(("CirCache::create: [%s] maxsz %lld flags 0x%x\n",
m_dir.c_str(), maxsize, flags));
LOGDEB(("CirCache::create: [%s] maxsz %s flags 0x%x\n",
m_dir.c_str(), lltodecstr((long long)maxsize).c_str(), flags));
if (m_d == 0) {
LOGERR(("CirCache::create: null data\n"));
return false;
@@ -708,10 +708,12 @@ bool CirCache::create(off_t maxsize, int flags)
}
m_d->m_maxsize = maxsize;
m_d->m_uniquentries = ((flags & CC_CRUNIQUE) != 0);
LOGDEB(("CirCache::create: rewriting header with "
"maxsize %lld oheadoffs %lld nheadoffs %lld "
LOGDEB2(("CirCache::create: rewriting header with "
"maxsize %s oheadoffs %s nheadoffs %s "
"npadsize %d unient %d\n",
m_d->m_maxsize, m_d->m_oheadoffs, m_d->m_nheadoffs,
lltodecstr(m_d->m_maxsize).c_str(),
lltodecstr(m_d->m_oheadoffs).c_str(),
lltodecstr(m_d->m_nheadoffs).c_str(),
m_d->m_npadsize, int(m_d->m_uniquentries)));
return m_d->writefirstblock();
}
src/utils/smallut.cpp
+1 -4
View File
@@ -633,7 +633,6 @@ inline static void ullcopyreverse(const char *rbuf, string& buf, int idx)
for (int i = idx - 1; i >= 0; i--) {
buf.push_back(rbuf[i]);
}
buf.push_back(0);
}
void ulltodecstr(unsigned long long val, string& buf)
@@ -691,7 +690,6 @@ string ulltodecstr(unsigned long long val)
// Convert byte count into unit (KB/MB...) appropriate for display
string displayableBytes(off_t size)
{
char sizebuf[50];
const char *unit;
double roundable = 0;
@@ -709,8 +707,7 @@ string displayableBytes(off_t size)
roundable = double(size) / 1E9;
}
size = off_t(round(roundable));
sprintf(sizebuf, "%lld" "%s", (long long)size, unit);
return string(sizebuf);
return lltodecstr(size).append(unit);
}
string breakIntoLines(const string& in, unsigned int ll,