@matheusbsbs / matheus-bagliano / commits / 5242bcbb63
Fork 0

Use strbuf API in cache-tree.c

Should even be marginally faster. Signed-off-by: Pierre Habouzit <madcoder@debian.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Pierre Habouzit committed Sep 6, 2007 at 13:20 UTC 5242bcbb638f031818e9ebd4467c8e55d5a06bfb
1 file changed +22 -37
cache-tree.c
+22 -37
@@ -1,4 +1,5 @@
1 #include "cache.h"
2 +#include "strbuf.h"
3 #include "tree.h"
4 #include "cache-tree.h"
5
@@ -235,8 +236,7 @@ static int update_one(struct cache_tree *it,
236 int missing_ok,
237 int dryrun)
238 {
238 - unsigned long size, offset;
239 - char *buffer;
239 + struct strbuf buffer;
240 int i;
241
242 if (0 <= it->entry_count && has_sha1_file(it->sha1))
@@ -293,9 +293,8 @@ static int update_one(struct cache_tree *it,
293 /*
294 * Then write out the tree object for this level.
295 */
296 - size = 8192;
297 - buffer = xmalloc(size);
298 - offset = 0;
296 + strbuf_init(&buffer);
297 + strbuf_grow(&buffer, 8192);
298
299 for (i = 0; i < entries; i++) {
300 struct cache_entry *ce = cache[i];
@@ -332,15 +331,9 @@ static int update_one(struct cache_tree *it,
331 if (!ce->ce_mode)
332 continue; /* entry being removed */
333
335 - if (size < offset + entlen + 100) {
336 - size = alloc_nr(offset + entlen + 100);
337 - buffer = xrealloc(buffer, size);
338 - }
339 - offset += sprintf(buffer + offset,
340 - "%o %.*s", mode, entlen, path + baselen);
341 - buffer[offset++] = 0;
342 - hashcpy((unsigned char*)buffer + offset, sha1);
343 - offset += 20;
334 + strbuf_grow(&buffer, entlen + 100);
335 + strbuf_addf(&buffer, "%o %.*s%c", mode, entlen, path + baselen, '\0');
336 + strbuf_add(&buffer, sha1, 20);
337
338 #if DEBUG
339 fprintf(stderr, "cache-tree update-one %o %.*s\n",
@@ -349,10 +342,10 @@ static int update_one(struct cache_tree *it,
342 }
343
344 if (dryrun)
352 - hash_sha1_file(buffer, offset, tree_type, it->sha1);
345 + hash_sha1_file(buffer.buf, buffer.len, tree_type, it->sha1);
346 else
354 - write_sha1_file(buffer, offset, tree_type, it->sha1);
355 - free(buffer);
347 + write_sha1_file(buffer.buf, buffer.len, tree_type, it->sha1);
348 + strbuf_release(&buffer);
349 it->entry_count = i;
350 #if DEBUG
351 fprintf(stderr, "cache-tree update-one (%d ent, %d subtree) %s\n",
@@ -378,12 +371,10 @@ int cache_tree_update(struct cache_tree *it,
371 return 0;
372 }
373
381 -static void *write_one(struct cache_tree *it,
374 +static void write_one(struct cache_tree *it,
375 char *path,
376 int pathlen,
384 - char *buffer,
385 - unsigned long *size,
386 - unsigned long *offset)
377 + struct strbuf *buffer)
378 {
379 int i;
380
@@ -393,13 +384,9 @@ static void *write_one(struct cache_tree *it,
384 * tree-sha1 (missing if invalid)
385 * subtree_nr "cache-tree" entries for subtrees.
386 */
396 - if (*size < *offset + pathlen + 100) {
397 - *size = alloc_nr(*offset + pathlen + 100);
398 - buffer = xrealloc(buffer, *size);
399 - }
400 - *offset += sprintf(buffer + *offset, "%.*s%c%d %d\n",
401 - pathlen, path, 0,
402 - it->entry_count, it->subtree_nr);
387 + strbuf_grow(buffer, pathlen + 100);
388 + strbuf_add(buffer, path, pathlen);
389 + strbuf_addf(buffer, "%c%d %d\n", 0, it->entry_count, it->subtree_nr);
390
391 #if DEBUG
392 if (0 <= it->entry_count)
@@ -412,8 +399,7 @@ static void *write_one(struct cache_tree *it,
399 #endif
400
401 if (0 <= it->entry_count) {
415 - hashcpy((unsigned char*)buffer + *offset, it->sha1);
416 - *offset += 20;
402 + strbuf_add(buffer, it->sha1, 20);
403 }
404 for (i = 0; i < it->subtree_nr; i++) {
405 struct cache_tree_sub *down = it->down[i];
@@ -423,21 +409,20 @@ static void *write_one(struct cache_tree *it,
409 prev->name, prev->namelen) <= 0)
410 die("fatal - unsorted cache subtree");
411 }
426 - buffer = write_one(down->cache_tree, down->name, down->namelen,
427 - buffer, size, offset);
412 + write_one(down->cache_tree, down->name, down->namelen, buffer);
413 }
429 - return buffer;
414 }
415
416 void *cache_tree_write(struct cache_tree *root, unsigned long *size_p)
417 {
418 char path[PATH_MAX];
435 - unsigned long size = 8192;
436 - char *buffer = xmalloc(size);
419 + struct strbuf buffer;
420
438 - *size_p = 0;
421 path[0] = 0;
440 - return write_one(root, path, 0, buffer, &size, size_p);
422 + strbuf_init(&buffer);
423 + write_one(root, path, 0, &buffer);
424 + *size_p = buffer.len;
425 + return strbuf_detach(&buffer);
426 }
427
428 static struct cache_tree *read_one(const char **buffer, unsigned long *size_p)