diff options
| author | Carlos Martín Nieto <carlos@cmartin.tk> | 2011-11-18 22:45:56 +0100 |
|---|---|---|
| committer | Carlos Martín Nieto <carlos@cmartin.tk> | 2011-11-18 22:45:56 +0100 |
| commit | bdd31dd5e832126b2f22fccbe244a1106c241ab0 (patch) | |
| tree | b08a2ad0fad57131563aa8c071221bea241128c1 /src/tsort.c | |
| parent | 277b7efe493887081ce1dafd91199d0ee9f676c9 (diff) | |
| parent | e4c93a392763a006d11e1c1dd01c12f85498dad5 (diff) | |
| download | libgit2-error-handling.tar.gz | |
Merge branch 'development' into error-handlingerror-handling
The code in this branch has been modified so it works with the global
state introduced in development.
Diffstat (limited to 'src/tsort.c')
| -rw-r--r-- | src/tsort.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/tsort.c b/src/tsort.c index 5dd99cc6e..df230b59d 100644 --- a/src/tsort.c +++ b/src/tsort.c @@ -178,7 +178,7 @@ static int check_invariant(struct tsort_run *stack, int stack_curr) static int resize(struct tsort_store *store, size_t new_size) { if (store->alloc < new_size) { - void **tempstore = realloc(store->storage, new_size * sizeof(void *)); + void **tempstore = git__realloc(store->storage, new_size * sizeof(void *)); /** * Do not propagate on OOM; this will abort the sort and @@ -319,7 +319,7 @@ static ssize_t collapse(void **dst, struct tsort_run *stack, ssize_t stack_curr, stack_curr--; \ } \ if (store->storage != NULL) {\ - free(store->storage);\ + git__free(store->storage);\ store->storage = NULL;\ }\ return;\ |