mirror of
https://git.proxmox.com/git/libgit2
synced 2025-07-27 00:49:32 +00:00
94af9155cf
The `map_free` functions were not implemented as functions but instead
as macros which also set the map to NULL. While this is most certainly
sensible in most cases, we should prefer the more obvious behavior,
namingly leaving the map pointer intact.
Furthermore, this macro has been refactored incorrectly during the
map-refactorings: the two statements are not actually grouped together
by a `do { ... } while (0)` block, as it is required for macros to
match the behavior of functions more closely. This has led to at least
one subtle nesting error in `pack-objects.c`. The following code block
```
if (pb->object_ix)
git_oidmap_free(pb->object_ix);
```
would be expanded to
```
if (pb->object_ix)
git_oidmap__free(pb->object_ix); pb->object_ix = NULL;
```
which is not what one woudl expect. While it is not a bug here as it
would simply become a no-op, the wrong implementation could lead to bugs
in other occasions.
Fix this by simply removing the macro altogether and replacing it with
real function calls. This leaves the burden of setting the pointer to
NULL afterwards to the caller, but this is actually expected and behaves
like other `free` functions.
55 lines
1.9 KiB
C
55 lines
1.9 KiB
C
/*
|
|
* Copyright (C) the libgit2 contributors. All rights reserved.
|
|
*
|
|
* This file is part of libgit2, distributed under the GNU GPL v2 with
|
|
* a Linking Exception. For full terms see the included COPYING file.
|
|
*/
|
|
#ifndef INCLUDE_idxmap_h__
|
|
#define INCLUDE_idxmap_h__
|
|
|
|
#include <ctype.h>
|
|
#include "common.h"
|
|
#include "git2/index.h"
|
|
|
|
#define kmalloc git__malloc
|
|
#define kcalloc git__calloc
|
|
#define krealloc git__realloc
|
|
#define kreallocarray git__reallocarray
|
|
#define kfree git__free
|
|
#include "khash.h"
|
|
|
|
__KHASH_TYPE(idx, const git_index_entry *, git_index_entry *)
|
|
__KHASH_TYPE(idxicase, const git_index_entry *, git_index_entry *)
|
|
|
|
typedef khash_t(idx) git_idxmap;
|
|
typedef khash_t(idxicase) git_idxmap_icase;
|
|
|
|
typedef khiter_t git_idxmap_iter;
|
|
|
|
int git_idxmap_alloc(git_idxmap **map);
|
|
int git_idxmap_icase_alloc(git_idxmap_icase **map);
|
|
void git_idxmap_insert(git_idxmap *map, const git_index_entry *key, void *value, int *rval);
|
|
void git_idxmap_icase_insert(git_idxmap_icase *map, const git_index_entry *key, void *value, int *rval);
|
|
|
|
size_t git_idxmap_lookup_index(git_idxmap *map, const git_index_entry *key);
|
|
size_t git_idxmap_icase_lookup_index(git_idxmap_icase *map, const git_index_entry *key);
|
|
void *git_idxmap_value_at(git_idxmap *map, size_t idx);
|
|
int git_idxmap_valid_index(git_idxmap *map, size_t idx);
|
|
int git_idxmap_has_data(git_idxmap *map, size_t idx);
|
|
|
|
void git_idxmap_resize(git_idxmap *map, size_t size);
|
|
void git_idxmap_icase_resize(git_idxmap_icase *map, size_t size);
|
|
void git_idxmap_free(git_idxmap *map);
|
|
void git_idxmap_clear(git_idxmap *map);
|
|
|
|
void git_idxmap_delete_at(git_idxmap *map, size_t idx);
|
|
void git_idxmap_icase_delete_at(git_idxmap_icase *map, size_t idx);
|
|
|
|
void git_idxmap_delete(git_idxmap *map, const git_index_entry *key);
|
|
void git_idxmap_icase_delete(git_idxmap_icase *map, const git_index_entry *key);
|
|
|
|
#define git_idxmap_begin kh_begin
|
|
#define git_idxmap_end kh_end
|
|
|
|
#endif
|