From e6017ec1bab99ef88b6ed0f8c5708c42b1e5cea1 Mon Sep 17 00:00:00 2001
From: Palana <palana@stunned.de>
Date: Sat, 7 Dec 2013 17:39:43 +0100
Subject: [PATCH] changed allocation counter to uint64_t

also avoids format string confusion for bnum_allocs
---
 libobs/util/bmem.c | 4 ++--
 libobs/util/bmem.h | 2 +-
 obs/obs-app.cpp    | 2 +-
 test/osx/test.mm   | 2 +-
 test/win/test.cpp  | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/libobs/util/bmem.c b/libobs/util/bmem.c
index b32ea603d..248ef9f7d 100644
--- a/libobs/util/bmem.c
+++ b/libobs/util/bmem.c
@@ -90,7 +90,7 @@ static void a_free(void *ptr)
 }
 
 static struct base_allocator alloc = {a_malloc, a_realloc, a_free};
-static size_t num_allocs = 0;
+static uint64_t num_allocs = 0;
 
 void base_set_allocator(struct base_allocator *defs)
 {
@@ -132,7 +132,7 @@ void bfree(void *ptr)
 	alloc.free(ptr);
 }
 
-size_t bnum_allocs(void)
+uint64_t bnum_allocs(void)
 {
 	return num_allocs;
 }
diff --git a/libobs/util/bmem.h b/libobs/util/bmem.h
index 535362bf9..8683d12bf 100644
--- a/libobs/util/bmem.h
+++ b/libobs/util/bmem.h
@@ -44,7 +44,7 @@ EXPORT void *bmalloc(size_t size);
 EXPORT void *brealloc(void *ptr, size_t size);
 EXPORT void bfree(void *ptr);
 
-EXPORT size_t bnum_allocs(void);
+EXPORT uint64_t bnum_allocs(void);
 
 EXPORT void *bmemdup(const void *ptr, size_t size);
 
diff --git a/obs/obs-app.cpp b/obs/obs-app.cpp
index 5050da066..3c98e1b70 100644
--- a/obs/obs-app.cpp
+++ b/obs/obs-app.cpp
@@ -31,7 +31,7 @@ IMPLEMENT_APP(OBSApp);
 
 OBSAppBase::~OBSAppBase()
 {
-	blog(LOG_INFO, "Number of memory leaks: " SIZE_T_FORMAT, bnum_allocs());
+	blog(LOG_INFO, "Number of memory leaks: %llu", bnum_allocs());
 }
 
 static void do_log(enum log_type type, const char *msg, va_list args)
diff --git a/test/osx/test.mm b/test/osx/test.mm
index e75d4b1e8..8b0f1913e 100644
--- a/test/osx/test.mm
+++ b/test/osx/test.mm
@@ -179,7 +179,7 @@ static void test()
 
 	obs_shutdown();
 
-	blog(LOG_INFO, "Number of memory leaks: %zu", bnum_allocs());
+	blog(LOG_INFO, "Number of memory leaks: %llu", bnum_allocs());
 }
 
 /* --------------------------------------------------- */
diff --git a/test/win/test.cpp b/test/win/test.cpp
index 886cae121..cfdcf4d1f 100644
--- a/test/win/test.cpp
+++ b/test/win/test.cpp
@@ -189,7 +189,7 @@ int WINAPI WinMain(HINSTANCE instance, HINSTANCE prevInstance, LPSTR cmdLine,
 
 	obs_shutdown();
 
-	blog(LOG_INFO, "Number of memory leaks: %u", bnum_allocs());
+	blog(LOG_INFO, "Number of memory leaks: %llu", bnum_allocs());
 	DestroyWindow(hwnd);
 
 	return 0;
-- 
GitLab