Fix compile warnings on 32bit

diff --git a/heaptrack_interpret.cpp b/heaptrack_interpret.cpp
index 1392b98..931d81b 100644 (file)
--- a/heaptrack_interpret.cpp
+++ b/heaptrack_interpret.cpp
@@ -165,7 +165,7 @@ struct AccumulatedTraceData
 
     ~AccumulatedTraceData()
     {
-        fprintf(stdout, "# strings: %lu\n# ips: %lu\n",
+        fprintf(stdout, "# strings: %zu\n# ips: %zu\n",
                 m_internedData.size(), m_encounteredIps.size());
     }
 
@@ -259,11 +259,11 @@ struct AccumulatedTraceData
         m_encounteredIps.insert(it, make_pair(instructionPointer, ipId));
 
         const auto ip = resolve(instructionPointer);
-        fprintf(stdout, "i %lx %lx", instructionPointer, ip.moduleIndex);
+        fprintf(stdout, "i %zx %zx", instructionPointer, ip.moduleIndex);
         if (ip.functionIndex || ip.fileIndex) {
-            fprintf(stdout, " %lx", ip.functionIndex);
+            fprintf(stdout, " %zx", ip.functionIndex);
             if (ip.fileIndex) {
-                fprintf(stdout, " %lx %x", ip.fileIndex, ip.line);
+                fprintf(stdout, " %zx %x", ip.fileIndex, ip.line);
             }
         }
         fputc('\n', stdout);
@@ -380,7 +380,7 @@ int main(int /*argc*/, char** /*argv*/)
             // ensure ip is encountered
             const auto ipId = data.addIp(instructionPointer);
             // trace point, map current output index to parent index
-            fprintf(stdout, "t %lx %lx\n", ipId, parentIndex);
+            fprintf(stdout, "t %zx %zx\n", ipId, parentIndex);
         } else {
             fputs(reader.line().c_str(), stdout);
             fputc('\n', stdout);

diff --git a/heaptrack_preload.cpp b/heaptrack_preload.cpp
index 6c877b5..125fef9 100644 (file)
--- a/heaptrack_preload.cpp
+++ b/heaptrack_preload.cpp
@@ -95,7 +95,7 @@ void* dummy_calloc(size_t num, size_t size) noexcept
     size_t oldOffset = offset;
     offset += num * size;
     if (offset >= MAX_SIZE) {
-        fprintf(stderr, "failed to initialize, dummy calloc buf size exhausted: %lu requested, %lu available\n", offset, MAX_SIZE);
+        fprintf(stderr, "failed to initialize, dummy calloc buf size exhausted: %zu requested, %zu available\n", offset, MAX_SIZE);
         abort();
     }
     return buf + oldOffset;

diff --git a/libheaptrack.cpp b/libheaptrack.cpp
index 32598ae..5f5bc69 100644 (file)
--- a/libheaptrack.cpp
+++ b/libheaptrack.cpp
@@ -293,9 +293,9 @@ public:
 
         auto elapsed = chrono::duration_cast<chrono::milliseconds>(clock::now() - s_data->start);
 
-        debugLog<VeryVerboseOutput>("writeTimestamp(%lx)", elapsed.count());
+        debugLog<VeryVerboseOutput>("writeTimestamp(%" PRIx64 ")", elapsed.count());
 
-        if (fprintf(s_data->out, "c %lx\n", elapsed.count()) < 0) {
+        if (fprintf(s_data->out, "c %" PRIx64 "\n", elapsed.count()) < 0) {
             writeError();
             return;
         }
@@ -315,7 +315,7 @@ public:
         s_data->known.insert(ptr);
 #endif
 
-        if (fprintf(s_data->out, "+ %lx %lx %lx\n", size, index, reinterpret_cast<uintptr_t>(ptr)) < 0) {
+        if (fprintf(s_data->out, "+ %zx %zx %" PRIxPTR "\n", size, index, reinterpret_cast<uintptr_t>(ptr)) < 0) {
             writeError();
             return;
         }
@@ -333,7 +333,7 @@ public:
         s_data->known.erase(it);
 #endif
 
-        if (fprintf(s_data->out, "- %lx\n", reinterpret_cast<uintptr_t>(ptr)) < 0) {
+        if (fprintf(s_data->out, "- %" PRIxPTR "\n", reinterpret_cast<uintptr_t>(ptr)) < 0) {
             writeError();
             return;
         }
@@ -348,9 +348,9 @@ private:
             fileName = "x";
         }
 
-        debugLog<VerboseOutput>("dlopen_notify_callback: %s %lx", fileName, info->dlpi_addr);
+        debugLog<VerboseOutput>("dlopen_notify_callback: %s %zx", fileName, info->dlpi_addr);
 
-        if (fprintf(heaptrack->s_data->out, "m %s %lx", fileName, info->dlpi_addr) < 0) {
+        if (fprintf(heaptrack->s_data->out, "m %s %zx", fileName, info->dlpi_addr) < 0) {
             heaptrack->writeError();
             return 1;
         }
@@ -358,7 +358,7 @@ private:
         for (int i = 0; i < info->dlpi_phnum; i++) {
             const auto& phdr = info->dlpi_phdr[i];
             if (phdr.p_type == PT_LOAD) {
-                if (fprintf(heaptrack->s_data->out, " %lx %lx", phdr.p_vaddr, phdr.p_memsz) < 0) {
+                if (fprintf(heaptrack->s_data->out, " %zx %zx", phdr.p_vaddr, phdr.p_memsz) < 0) {
                     heaptrack->writeError();
                     return 1;
                 }
@@ -540,7 +540,7 @@ void heaptrack_malloc(void* ptr, size_t size)
     if (ptr && !RecursionGuard::isActive) {
         RecursionGuard guard;
 
-        debugLog<VeryVerboseOutput>("heaptrack_malloc(%p, %lu)", ptr, size);
+        debugLog<VeryVerboseOutput>("heaptrack_malloc(%p, %zu)", ptr, size);
 
         Trace trace;
         trace.fill(2 + HEAPTRACK_DEBUG_BUILD);
@@ -567,7 +567,7 @@ void heaptrack_realloc(void* ptr_in, size_t size, void* ptr_out)
     if (ptr_out && !RecursionGuard::isActive) {
         RecursionGuard guard;
 
-        debugLog<VeryVerboseOutput>("heaptrack_realloc(%p, %lu, %p)", ptr_in, size, ptr_out);
+        debugLog<VeryVerboseOutput>("heaptrack_realloc(%p, %zu, %p)", ptr_in, size, ptr_out);
 
         Trace trace;
         trace.fill(2 + HEAPTRACK_DEBUG_BUILD);

diff --git a/tracetree.h b/tracetree.h
index 914d94c..5b697ba 100644 (file)
--- a/tracetree.h
+++ b/tracetree.h
@@ -76,7 +76,7 @@ public:
             if (it == parent->children.end() || it->instructionPointer != ip) {
                 index = m_index++;
                 it = parent->children.insert(it, {ip, index, {}});
-                fprintf(out, "t %lx %lx\n", reinterpret_cast<uintptr_t>(ip), parent->index);
+                fprintf(out, "t %" PRIxPTR " %zu\n", reinterpret_cast<uintptr_t>(ip), parent->index);
             }
             index = it->index;
             parent = &(*it);