Thread (15 messages) flat view 15 messages, 1 author, 2016-06-15
DORMANTno replies

[PATCH v4 14/14] sha1_file.c: use ALLOC_GROW() in pretend_sha1_file()

From: Dmitry S. Dolzhenko <hidden>
Date: 2016-06-15 23:00:10
Subsystem: the rest · Maintainer: Linus Torvalds

Helped-by: He Sun [off-list ref]
Signed-off-by: Dmitry S. Dolzhenko <redacted>
---
 sha1_file.c | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)
diff --git a/sha1_file.c b/sha1_file.c
index 019628a..3cb17b8 100644
--- a/sha1_file.c
+++ b/sha1_file.c
@@ -2624,12 +2624,7 @@ int pretend_sha1_file(void *buf, unsigned long len, enum object_type type,
 	hash_sha1_file(buf, len, typename(type), sha1);
 	if (has_sha1_file(sha1) || find_cached_object(sha1))
 		return 0;
-	if (cached_object_alloc <= cached_object_nr) {
-		cached_object_alloc = alloc_nr(cached_object_alloc);
-		cached_objects = xrealloc(cached_objects,
-					  sizeof(*cached_objects) *
-					  cached_object_alloc);
-	}
+	ALLOC_GROW(cached_objects, cached_object_nr + 1, cached_object_alloc);
 	co = &cached_objects[cached_object_nr++];
 	co->size = len;
 	co->type = type;
-- 
1.8.3.2
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help