alloc: rename the win32 leakcheck allocator

The win32 leakchecking system is now named win32_leakcheck.  Update the
allocator to match.

src/alloc.c

@@ -9,14 +9,14 @@
 #include "runtime.h"
 
 #include "allocators/stdalloc.h"
-#include "allocators/win32_crtdbg.h"
+#include "allocators/win32_leakcheck.h"
 
 git_allocator git__allocator;
 
 static int setup_default_allocator(void)
 {
 #if defined(GIT_MSVC_CRTDBG)
-	return git_win32_crtdbg_init_allocator(&git__allocator);
+	return git_win32_leakcheck_init_allocator(&git__allocator);
 #else
 	return git_stdalloc_init_allocator(&git__allocator);
 #endif

src/allocators/win32_crtdbg.c → src/allocators/win32_leakcheck.c

@@ -5,34 +5,34 @@
  * a Linking Exception. For full terms see the included COPYING file.
  */
 
-#include "win32_crtdbg.h"
+#include "win32_leakcheck.h"
 
 #if defined(GIT_MSVC_CRTDBG)
 
 #include "win32/w32_leakcheck.h"
 
-static void *crtdbg__malloc(size_t len, const char *file, int line)
+static void *leakcheck_malloc(size_t len, const char *file, int line)
 {
 	void *ptr = _malloc_dbg(len, _NORMAL_BLOCK, git_win32_leakcheck_stacktrace(1,file), line);
 	if (!ptr) git_error_set_oom();
 	return ptr;
 }
 
-static void *crtdbg__calloc(size_t nelem, size_t elsize, const char *file, int line)
+static void *leakcheck_calloc(size_t nelem, size_t elsize, const char *file, int line)
 {
 	void *ptr = _calloc_dbg(nelem, elsize, _NORMAL_BLOCK, git_win32_leakcheck_stacktrace(1,file), line);
 	if (!ptr) git_error_set_oom();
 	return ptr;
 }
 
-static char *crtdbg__strdup(const char *str, const char *file, int line)
+static char *leakcheck_strdup(const char *str, const char *file, int line)
 {
 	char *ptr = _strdup_dbg(str, _NORMAL_BLOCK, git_win32_leakcheck_stacktrace(1,file), line);
 	if (!ptr) git_error_set_oom();
 	return ptr;
 }
 
-static char *crtdbg__strndup(const char *str, size_t n, const char *file, int line)
+static char *leakcheck_strndup(const char *str, size_t n, const char *file, int line)
 {
 	size_t length = 0, alloclength;
 	char *ptr;
@@ -40,7 +40,7 @@ static char *crtdbg__strndup(const char *str, size_t n, const char *file, int li
 	length = p_strnlen(str, n);
 
 	if (GIT_ADD_SIZET_OVERFLOW(&alloclength, length, 1) ||
-		!(ptr = crtdbg__malloc(alloclength, file, line)))
+		!(ptr = leakcheck_malloc(alloclength, file, line)))
 		return NULL;
 
 	if (length)
@@ -51,13 +51,13 @@ static char *crtdbg__strndup(const char *str, size_t n, const char *file, int li
 	return ptr;
 }
 
-static char *crtdbg__substrdup(const char *start, size_t n, const char *file, int line)
+static char *leakcheck_substrdup(const char *start, size_t n, const char *file, int line)
 {
 	char *ptr;
 	size_t alloclen;
 
 	if (GIT_ADD_SIZET_OVERFLOW(&alloclen, n, 1) ||
-		!(ptr = crtdbg__malloc(alloclen, file, line)))
+		!(ptr = leakcheck_malloc(alloclen, file, line)))
 		return NULL;
 
 	memcpy(ptr, start, n);
@@ -65,53 +65,53 @@ static char *crtdbg__substrdup(const char *start, size_t n, const char *file, in
 	return ptr;
 }
 
-static void *crtdbg__realloc(void *ptr, size_t size, const char *file, int line)
+static void *leakcheck_realloc(void *ptr, size_t size, const char *file, int line)
 {
 	void *new_ptr = _realloc_dbg(ptr, size, _NORMAL_BLOCK, git_win32_leakcheck_stacktrace(1,file), line);
 	if (!new_ptr) git_error_set_oom();
 	return new_ptr;
 }
 
-static void *crtdbg__reallocarray(void *ptr, size_t nelem, size_t elsize, const char *file, int line)
+static void *leakcheck_reallocarray(void *ptr, size_t nelem, size_t elsize, const char *file, int line)
 {
 	size_t newsize;
 
 	if (GIT_MULTIPLY_SIZET_OVERFLOW(&newsize, nelem, elsize))
 		return NULL;
 
-	return crtdbg__realloc(ptr, newsize, file, line);
+	return leakcheck_realloc(ptr, newsize, file, line);
 }
 
-static void *crtdbg__mallocarray(size_t nelem, size_t elsize, const char *file, int line)
+static void *leakcheck_mallocarray(size_t nelem, size_t elsize, const char *file, int line)
 {
-	return crtdbg__reallocarray(NULL, nelem, elsize, file, line);
+	return leakcheck_reallocarray(NULL, nelem, elsize, file, line);
 }
 
-static void crtdbg__free(void *ptr)
+static void leakcheck_free(void *ptr)
 {
 	free(ptr);
 }
 
-int git_win32_crtdbg_init_allocator(git_allocator *allocator)
+int git_win32_leakcheck_init_allocator(git_allocator *allocator)
 {
-	allocator->gmalloc = crtdbg__malloc;
-	allocator->gcalloc = crtdbg__calloc;
-	allocator->gstrdup = crtdbg__strdup;
-	allocator->gstrndup = crtdbg__strndup;
-	allocator->gsubstrdup = crtdbg__substrdup;
-	allocator->grealloc = crtdbg__realloc;
-	allocator->greallocarray = crtdbg__reallocarray;
-	allocator->gmallocarray = crtdbg__mallocarray;
-	allocator->gfree = crtdbg__free;
+	allocator->gmalloc = leakcheck_malloc;
+	allocator->gcalloc = leakcheck_calloc;
+	allocator->gstrdup = leakcheck_strdup;
+	allocator->gstrndup = leakcheck_strndup;
+	allocator->gsubstrdup = leakcheck_substrdup;
+	allocator->grealloc = leakcheck_realloc;
+	allocator->greallocarray = leakcheck_reallocarray;
+	allocator->gmallocarray = leakcheck_mallocarray;
+	allocator->gfree = leakcheck_free;
 	return 0;
 }
 
 #else
 
-int git_win32_crtdbg_init_allocator(git_allocator *allocator)
+int git_win32_leakcheck_init_allocator(git_allocator *allocator)
 {
 	GIT_UNUSED(allocator);
-	git_error_set(GIT_EINVALID, "crtdbg memory allocator not available");
+	git_error_set(GIT_EINVALID, "leakcheck memory allocator not available");
 	return -1;
 }
 

src/allocators/win32_crtdbg.h → src/allocators/win32_leakcheck.h

@@ -5,13 +5,13 @@
  * a Linking Exception. For full terms see the included COPYING file.
  */
 
-#ifndef INCLUDE_allocators_crtdbg_h
-#define INCLUDE_allocators_crtdbg_h
+#ifndef INCLUDE_allocators_win32_leakcheck_h
+#define INCLUDE_allocators_win32_leakcheck_h
 
 #include "common.h"
 
 #include "alloc.h"
 
-int git_win32_crtdbg_init_allocator(git_allocator *allocator);
+int git_win32_leakcheck_init_allocator(git_allocator *allocator);
 
 #endif