freshlybakedca.ke
Git fork
Merge branch 'jk/oidmap-cleanup'
Code cleanup.
* jk/oidmap-cleanup:
raw_object_store: drop extra pointer to replace_map
oidmap: add size function
oidmap: rename oidmap_free() to oidmap_clear()
+1
-1
builtin/rev-list.c
+1
-1
builtin/rev-list.c
+1
-1
commit-graph.c
+1
-1
commit-graph.c
+1
-1
list-objects-filter.c
+1
-1
list-objects-filter.c
+1
-2
object-store.c
+1
-2
object-store.c
+2
-1
object-store.h
+2
-1
object-store.h
···
5
#include "object.h"
6
#include "list.h"
7
#include "oidset.h"
8
#include "thread-utils.h"
9
10
struct oidmap;
···
109
* Objects that should be substituted by other objects
110
* (see git-replace(1)).
111
*/
112
-
struct oidmap *replace_map;
113
unsigned replace_map_initialized : 1;
114
pthread_mutex_t replace_mutex; /* protect object replace functions */
115
···
5
#include "object.h"
6
#include "list.h"
7
#include "oidset.h"
8
+
#include "oidmap.h"
9
#include "thread-utils.h"
10
11
struct oidmap;
···
110
* Objects that should be substituted by other objects
111
* (see git-replace(1)).
112
*/
113
+
struct oidmap replace_map;
114
unsigned replace_map_initialized : 1;
115
pthread_mutex_t replace_mutex; /* protect object replace functions */
116
+1
-1
oidmap.c
+1
-1
oidmap.c
+7
-2
oidmap.h
+7
-2
oidmap.h
···
36
void oidmap_init(struct oidmap *map, size_t initial_size);
37
38
/*
39
-
* Frees an oidmap structure and allocated memory.
40
*
41
* If `free_entries` is true, each oidmap_entry in the map is freed as well
42
* using stdlibs free().
43
*/
44
-
void oidmap_free(struct oidmap *map, int free_entries);
45
46
/*
47
* Returns the oidmap entry for the specified oid, or NULL if not found.
···
66
*/
67
void *oidmap_remove(struct oidmap *map, const struct object_id *key);
68
69
70
struct oidmap_iter {
71
struct hashmap_iter h_iter;
···
36
void oidmap_init(struct oidmap *map, size_t initial_size);
37
38
/*
39
+
* Clear an oidmap, freeing any allocated memory. The map is empty and
40
+
* can be reused without another explicit init.
41
*
42
* If `free_entries` is true, each oidmap_entry in the map is freed as well
43
* using stdlibs free().
44
*/
45
+
void oidmap_clear(struct oidmap *map, int free_entries);
46
47
/*
48
* Returns the oidmap entry for the specified oid, or NULL if not found.
···
67
*/
68
void *oidmap_remove(struct oidmap *map, const struct object_id *key);
69
70
+
static inline unsigned int oidmap_get_size(struct oidmap *map)
71
+
{
72
+
return hashmap_get_size(&map->map);
73
+
}
74
75
struct oidmap_iter {
76
struct hashmap_iter h_iter;
+3
-5
replace-object.c
+3
-5
replace-object.c
···
31
oidcpy(&repl_obj->replacement, oid);
32
33
/* Register new object */
34
-
if (oidmap_put(r->objects->replace_map, repl_obj))
35
die(_("duplicate replace ref: %s"), refname);
36
37
return 0;
···
48
return;
49
}
50
51
-
r->objects->replace_map =
52
-
xmalloc(sizeof(*r->objects->replace_map));
53
-
oidmap_init(r->objects->replace_map, 0);
54
55
refs_for_each_replace_ref(get_main_ref_store(r),
56
register_replace_ref, r);
···
80
/* Try to recursively replace the object */
81
while (depth-- > 0) {
82
struct replace_object *repl_obj =
83
-
oidmap_get(r->objects->replace_map, cur);
84
if (!repl_obj)
85
return cur;
86
cur = &repl_obj->replacement;
···
31
oidcpy(&repl_obj->replacement, oid);
32
33
/* Register new object */
34
+
if (oidmap_put(&r->objects->replace_map, repl_obj))
35
die(_("duplicate replace ref: %s"), refname);
36
37
return 0;
···
48
return;
49
}
50
51
+
oidmap_init(&r->objects->replace_map, 0);
52
53
refs_for_each_replace_ref(get_main_ref_store(r),
54
register_replace_ref, r);
···
78
/* Try to recursively replace the object */
79
while (depth-- > 0) {
80
struct replace_object *repl_obj =
81
+
oidmap_get(&r->objects->replace_map, cur);
82
if (!repl_obj)
83
return cur;
84
cur = &repl_obj->replacement;
+1
-1
replace-object.h
+1
-1
replace-object.h
+2
-2
sequencer.c
+2
-2
sequencer.c