Browse Source

changed allocation counter to uint64_t

also avoids format string confusion for bnum_allocs
Palana 12 years ago
parent
commit
e6017ec1ba
5 changed files with 6 additions and 6 deletions
  1. 2 2
      libobs/util/bmem.c
  2. 1 1
      libobs/util/bmem.h
  3. 1 1
      obs/obs-app.cpp
  4. 1 1
      test/osx/test.mm
  5. 1 1
      test/win/test.cpp

+ 2 - 2
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;
 }

+ 1 - 1
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);
 

+ 1 - 1
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)

+ 1 - 1
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());
 }
 
 /* --------------------------------------------------- */

+ 1 - 1
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;