Commit Diff

Commit:
c33ebc60244337a117933351d3565dd850925d06
From:
Stefan Sperling <stsp@stsp.name>
Date:
Message:
reallocate line_offsets array less often in got_object_blob_dump_to_file()
Actions:
Patch | Tree
commit - cca5682ee944c46413628161f13e2779718f0536
commit + c33ebc60244337a117933351d3565dd850925d06
blob - a74eaa79aa8bbba7182e603f859139548a3255cc
blob + b88554667888b99b82673683673307ae8c631fa6
--- lib/object.c
+++ lib/object.c
@@ -1281,7 +1281,8 @@ got_object_blob_dump_to_file(size_t *filesize, int *nl
 	size_t n, len, hdrlen;
 	const uint8_t *buf;
 	int i;
-	size_t noffsets = 0;
+	const int alloc_chunksz = 512;
+	size_t nalloc = 0;
 	off_t off = 0, total_len = 0;
 
 	if (line_offsets)
@@ -1303,9 +1304,10 @@ got_object_blob_dump_to_file(size_t *filesize, int *nl
 		if (nlines) {
 			if (line_offsets && *line_offsets == NULL) {
 				/* Have some data but perhaps no '\n'. */
-				noffsets = 1;
 				*nlines = 1;
-				*line_offsets = calloc(1, sizeof(**line_offsets));
+				nalloc = alloc_chunksz;
+				*line_offsets = calloc(nalloc,
+				    sizeof(**line_offsets));
 				if (*line_offsets == NULL)
 					return got_error_from_errno("calloc");
 
@@ -1323,10 +1325,10 @@ got_object_blob_dump_to_file(size_t *filesize, int *nl
 					continue;
 				}
 				(*nlines)++;
-				if (line_offsets && noffsets < *nlines) {
+				if (line_offsets && nalloc < *nlines) {
+					size_t n = *nlines + alloc_chunksz;
 					off_t *o = recallocarray(*line_offsets,
-					    noffsets, *nlines,
-					    sizeof(**line_offsets));
+					    nalloc, n, sizeof(**line_offsets));
 					if (o == NULL) {
 						free(*line_offsets);
 						*line_offsets = NULL;
@@ -1334,7 +1336,7 @@ got_object_blob_dump_to_file(size_t *filesize, int *nl
 						    "recallocarray");
 					}
 					*line_offsets = o;
-					noffsets = *nlines;
+					nalloc = n;
 				}
 				if (line_offsets) {
 					off = total_len + i - hdrlen + 1;