Small cache_tree_write refactor.
This function cannot fail, make it void. Also make write_one act on a const char* instead of a char*. Signed-off-by: Pierre Habouzit <madcoder@debian.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Pierre Habouzit committed
Sep 25, 2007 at 10:22 UTC
1dffb8fa8056860e769f3a0c6e232d436f5a5c17
3 files changed
+15
-25
cache-tree.c
+5
-14
@@ -369,10 +369,8 @@ int cache_tree_update(struct cache_tree *it,
369
return 0;
370
}
371
372
-static void write_one(struct cache_tree *it,
373
- char *path,
374
- int pathlen,
375
- struct strbuf *buffer)
372
+static void write_one(struct strbuf *buffer, struct cache_tree *it,
373
+ const char *path, int pathlen)
374
{
375
int i;
376
@@ -407,20 +405,13 @@ static void write_one(struct cache_tree *it,
405
prev->name, prev->namelen) <= 0)
406
die("fatal - unsorted cache subtree");
407
}
410
- write_one(down->cache_tree, down->name, down->namelen, buffer);
408
+ write_one(buffer, down->cache_tree, down->name, down->namelen);
409
}
410
}
411
414
-void *cache_tree_write(struct cache_tree *root, unsigned long *size_p)
412
+void cache_tree_write(struct strbuf *sb, struct cache_tree *root)
413
{
416
- char path[PATH_MAX];
417
- struct strbuf buffer;
418
-
419
- path[0] = 0;
420
- strbuf_init(&buffer, 0);
421
- write_one(root, path, 0, &buffer);
422
- *size_p = buffer.len;
423
- return strbuf_detach(&buffer);
414
+ write_one(sb, root, "", 0);
415
}
416
417
static struct cache_tree *read_one(const char **buffer, unsigned long *size_p)
cache-tree.h
+1
-1
@@ -22,7 +22,7 @@ void cache_tree_free(struct cache_tree **);
22
void cache_tree_invalidate_path(struct cache_tree *, const char *);
23
struct cache_tree_sub *cache_tree_sub(struct cache_tree *, const char *);
24
25
-void *cache_tree_write(struct cache_tree *root, unsigned long *size_p);
25
+void cache_tree_write(struct strbuf *, struct cache_tree *root);
26
struct cache_tree *cache_tree_read(const char *buffer, unsigned long size);
27
28
int cache_tree_fully_valid(struct cache_tree *);
read-cache.c
+9
-10
@@ -1136,7 +1136,7 @@ int write_index(struct index_state *istate, int newfd)
1136
{
1137
SHA_CTX c;
1138
struct cache_header hdr;
1139
- int i, removed;
1139
+ int i, err, removed;
1140
struct cache_entry **cache = istate->cache;
1141
int entries = istate->cache_nr;
1142
@@ -1165,16 +1165,15 @@ int write_index(struct index_state *istate, int newfd)
1165
1166
/* Write extension data here */
1167
if (istate->cache_tree) {
1168
- unsigned long sz;
1169
- void *data = cache_tree_write(istate->cache_tree, &sz);
1170
- if (data &&
1171
- !write_index_ext_header(&c, newfd, CACHE_EXT_TREE, sz) &&
1172
- !ce_write(&c, newfd, data, sz))
1173
- free(data);
1174
- else {
1175
- free(data);
1168
+ struct strbuf sb;
1169
+
1170
+ strbuf_init(&sb, 0);
1171
+ cache_tree_write(&sb, istate->cache_tree);
1172
+ err = write_index_ext_header(&c, newfd, CACHE_EXT_TREE, sb.len) < 0
1173
+ || ce_write(&c, newfd, sb.buf, sb.len) < 0;
1174
+ strbuf_release(&sb);
1175
+ if (err)
1176
return -1;
1177
- }
1177
}
1178
return ce_flush(&c, newfd);
1179
}