mirror/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-11-18 17:23:49 +01:00
Code

Use strbuf API in cache-tree.c

Browse Source 
Should even be marginally faster.

Signed-off-by: Pierre Habouzit <madcoder@debian.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Pierre Habouzit 2007-09-06 13:20:11 +02:00 committed by Junio C Hamano
parent 19b358e8da
commit 5242bcbb63
1 changed files with 22 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
cache-tree.c
View File

@ -1,4 +1,5 @@
#include "cache.h"
#include "strbuf.h"
#include "tree.h"
#include "cache-tree.h"
@ -235,8 +236,7 @@ static int update_one(struct cache_tree *it,
int missing_ok,
int dryrun)
{
unsigned long size, offset;
char *buffer;
struct strbuf buffer;
int i;
if (0 <= it->entry_count && has_sha1_file(it->sha1))
@ -293,9 +293,8 @@ static int update_one(struct cache_tree *it,
/*
* Then write out the tree object for this level.
*/
size = 8192;
buffer = xmalloc(size);
offset = 0;
strbuf_init(&buffer);
strbuf_grow(&buffer, 8192);
for (i = 0; i < entries; i++) {
struct cache_entry *ce = cache[i];
@ -332,15 +331,9 @@ static int update_one(struct cache_tree *it,
if (!ce->ce_mode)
continue; /* entry being removed */
if (size < offset + entlen + 100) {
size = alloc_nr(offset + entlen + 100);
buffer = xrealloc(buffer, size);
}
offset += sprintf(buffer + offset,
"%o %.*s", mode, entlen, path + baselen);
buffer[offset++] = 0;
hashcpy((unsigned char*)buffer + offset, sha1);
offset += 20;
strbuf_grow(&buffer, entlen + 100);
strbuf_addf(&buffer, "%o %.*s%c", mode, entlen, path + baselen, '\0');
strbuf_add(&buffer, sha1, 20);
#if DEBUG
fprintf(stderr, "cache-tree update-one %o %.*s\n",
@ -349,10 +342,10 @@ static int update_one(struct cache_tree *it,
}
if (dryrun)
hash_sha1_file(buffer, offset, tree_type, it->sha1);
hash_sha1_file(buffer.buf, buffer.len, tree_type, it->sha1);
else
write_sha1_file(buffer, offset, tree_type, it->sha1);
free(buffer);
write_sha1_file(buffer.buf, buffer.len, tree_type, it->sha1);
strbuf_release(&buffer);
it->entry_count = i;
#if DEBUG
fprintf(stderr, "cache-tree update-one (%d ent, %d subtree) %s\n",
@ -378,12 +371,10 @@ int cache_tree_update(struct cache_tree *it,
return 0;
}
static void *write_one(struct cache_tree *it,
static void write_one(struct cache_tree *it,
char *path,
int pathlen,
char *buffer,
unsigned long *size,
unsigned long *offset)
struct strbuf *buffer)
{
int i;
@ -393,13 +384,9 @@ static void *write_one(struct cache_tree *it,
* tree-sha1 (missing if invalid)
* subtree_nr "cache-tree" entries for subtrees.
*/
if (*size < *offset + pathlen + 100) {
*size = alloc_nr(*offset + pathlen + 100);
buffer = xrealloc(buffer, *size);
}
*offset += sprintf(buffer + *offset, "%.*s%c%d %d\n",
pathlen, path, 0,
it->entry_count, it->subtree_nr);
strbuf_grow(buffer, pathlen + 100);
strbuf_add(buffer, path, pathlen);
strbuf_addf(buffer, "%c%d %d\n", 0, it->entry_count, it->subtree_nr);
#if DEBUG
if (0 <= it->entry_count)
@ -412,8 +399,7 @@ static void *write_one(struct cache_tree *it,
#endif
if (0 <= it->entry_count) {
hashcpy((unsigned char*)buffer + *offset, it->sha1);
*offset += 20;
strbuf_add(buffer, it->sha1, 20);
}
for (i = 0; i < it->subtree_nr; i++) {
struct cache_tree_sub *down = it->down[i];
@ -423,21 +409,20 @@ static void *write_one(struct cache_tree *it,
prev->name, prev->namelen) <= 0)
die("fatal - unsorted cache subtree");
}
buffer = write_one(down->cache_tree, down->name, down->namelen,
buffer, size, offset);
write_one(down->cache_tree, down->name, down->namelen, buffer);
}
return buffer;
}
void *cache_tree_write(struct cache_tree *root, unsigned long *size_p)
{
char path[PATH_MAX];
unsigned long size = 8192;
char *buffer = xmalloc(size);
struct strbuf buffer;
*size_p = 0;
path[0] = 0;
return write_one(root, path, 0, buffer, &size, size_p);
strbuf_init(&buffer);
write_one(root, path, 0, &buffer);
*size_p = buffer.len;
return strbuf_detach(&buffer);
}
static struct cache_tree *read_one(const char **buffer, unsigned long *size_p)