Skip to content

Commit cb4b3bd

Browse files
committed
win32: "crtdbg" is now "leakcheck"
msvc crtdbg is a mouthfull that is not particularly indicative of what it does. Let's rename it to "win32 leakcheck".
1 parent a6d151b commit cb4b3bd

File tree

9 files changed

+513
-536
lines changed

9 files changed

+513
-536
lines changed

src/alloc.c

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,7 @@
1212
#include "allocators/win32_crtdbg.h"
1313

1414
#if defined(GIT_MSVC_CRTDBG)
15-
# include "win32/w32_stack.h"
16-
# include "win32/w32_crtdbg_stacktrace.h"
15+
# include "win32/w32_leakcheck.h"
1716
#endif
1817

1918
git_allocator git__allocator;
@@ -30,16 +29,16 @@ static int setup_default_allocator(void)
3029
#if defined(GIT_MSVC_CRTDBG)
3130
static void allocator_global_shutdown(void)
3231
{
33-
git_win32__crtdbg_stacktrace_cleanup();
34-
git_win32__stack_cleanup();
32+
git_win32_leakcheck_stacktrace_cleanup();
33+
git_win32_leakcheck_stack_cleanup();
3534
}
3635
#endif
3736

3837
int git_allocator_global_init(void)
3938
{
4039
#if defined(GIT_MSVC_CRTDBG)
41-
git_win32__crtdbg_stacktrace_init();
42-
git_win32__stack_init();
40+
git_win32_leakcheck_stacktrace_init();
41+
git_win32_leakcheck_stack_init();
4342

4443
if (git_runtime_shutdown_register(allocator_global_shutdown) < 0)
4544
return -1;

src/allocators/win32_crtdbg.c

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,26 +9,25 @@
99

1010
#if defined(GIT_MSVC_CRTDBG)
1111

12-
#include "win32/w32_stack.h"
13-
#include "win32/w32_crtdbg_stacktrace.h"
12+
#include "win32/w32_leakcheck.h"
1413

1514
static void *crtdbg__malloc(size_t len, const char *file, int line)
1615
{
17-
void *ptr = _malloc_dbg(len, _NORMAL_BLOCK, git_win32__crtdbg_stacktrace(1,file), line);
16+
void *ptr = _malloc_dbg(len, _NORMAL_BLOCK, git_win32_leakcheck_stacktrace(1,file), line);
1817
if (!ptr) git_error_set_oom();
1918
return ptr;
2019
}
2120

2221
static void *crtdbg__calloc(size_t nelem, size_t elsize, const char *file, int line)
2322
{
24-
void *ptr = _calloc_dbg(nelem, elsize, _NORMAL_BLOCK, git_win32__crtdbg_stacktrace(1,file), line);
23+
void *ptr = _calloc_dbg(nelem, elsize, _NORMAL_BLOCK, git_win32_leakcheck_stacktrace(1,file), line);
2524
if (!ptr) git_error_set_oom();
2625
return ptr;
2726
}
2827

2928
static char *crtdbg__strdup(const char *str, const char *file, int line)
3029
{
31-
char *ptr = _strdup_dbg(str, _NORMAL_BLOCK, git_win32__crtdbg_stacktrace(1,file), line);
30+
char *ptr = _strdup_dbg(str, _NORMAL_BLOCK, git_win32_leakcheck_stacktrace(1,file), line);
3231
if (!ptr) git_error_set_oom();
3332
return ptr;
3433
}
@@ -68,7 +67,7 @@ static char *crtdbg__substrdup(const char *start, size_t n, const char *file, in
6867

6968
static void *crtdbg__realloc(void *ptr, size_t size, const char *file, int line)
7069
{
71-
void *new_ptr = _realloc_dbg(ptr, size, _NORMAL_BLOCK, git_win32__crtdbg_stacktrace(1,file), line);
70+
void *new_ptr = _realloc_dbg(ptr, size, _NORMAL_BLOCK, git_win32_leakcheck_stacktrace(1,file), line);
7271
if (!new_ptr) git_error_set_oom();
7372
return new_ptr;
7473
}

src/libgit2.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@
3131
#include "transports/smart.h"
3232
#include "transports/http.h"
3333
#include "transports/ssh.h"
34-
#include "win32/w32_stack.h"
3534

3635
#ifdef GIT_OPENSSL
3736
# include <openssl/err.h>

src/win32/w32_crtdbg_stacktrace.h

Lines changed: 0 additions & 127 deletions
This file was deleted.

0 commit comments

Comments
 (0)