Thread (130 messages) 130 messages, 5 authors, 2018-03-26
STALE3109d

[PATCH 04/27] object-store: free alt_odb_list

From: Nguyễn Thái Ngọc Duy <hidden>
Date: 2018-03-23 17:21:59
Subsystem: the rest · Maintainer: Linus Torvalds

From: Stefan Beller <redacted>

Free the memory and reset alt_odb_{list, tail} to NULL.

Signed-off-by: Stefan Beller <redacted>
Signed-off-by: Nguyễn Thái Ngọc Duy <redacted>
---
 object.c | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)
diff --git a/object.c b/object.c
index 6ddd61242c..581347b535 100644
--- a/object.c
+++ b/object.c
@@ -454,8 +454,30 @@ struct raw_object_store *raw_object_store_new(void)
 	memset(o, 0, sizeof(*o));
 	return o;
 }
+
+static void free_alt_odb(struct alternate_object_database *alt)
+{
+	strbuf_release(&alt->scratch);
+	oid_array_clear(&alt->loose_objects_cache);
+	free(alt);
+}
+
+static void free_alt_odbs(struct raw_object_store *o)
+{
+	while (o->alt_odb_list) {
+		struct alternate_object_database *next;
+
+		next = o->alt_odb_list->next;
+		free_alt_odb(o->alt_odb_list);
+		o->alt_odb_list = next;
+	}
+}
+
 void raw_object_store_clear(struct raw_object_store *o)
 {
 	FREE_AND_NULL(o->objectdir);
 	FREE_AND_NULL(o->alternate_db);
+
+	free_alt_odbs(o);
+	o->alt_odb_tail = NULL;
 }
-- 
2.17.0.rc0.348.gd5a49e0b6f
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help