summaryrefslogtreecommitdiff
path: root/entry.c
diff options
context:
space:
mode:
authorRené Scharfe <rene.scharfe@lsrfire.ath.cx>2007-10-21 11:23:49 +0200
committerShawn O. Pearce <spearce@spearce.org>2007-10-22 00:00:40 -0400
commitc32f749fec69f92ce3b076128e6322f8130bd881 (patch)
tree0ada7de6f324a57dccd4b7bba9eaa05091a252cc /entry.c
parent5be507fc955bd14643cac1162cfaa592d0e236ba (diff)
downloadgit-c32f749fec69f92ce3b076128e6322f8130bd881.tar.gz
Correct some sizeof(size_t) != sizeof(unsigned long) typing errors
Fix size_t vs. unsigned long pointer mismatch warnings introduced with the addition of strbuf_detach(). Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx> Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Diffstat (limited to 'entry.c')
-rw-r--r--entry.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/entry.c b/entry.c
index 98f5f6d4ec..cfadc6a292 100644
--- a/entry.c
+++ b/entry.c
@@ -119,8 +119,10 @@ static int write_entry(struct cache_entry *ce, char *path, const struct checkout
*/
strbuf_init(&buf, 0);
if (convert_to_working_tree(ce->name, new, size, &buf)) {
+ size_t newsize = 0;
free(new);
- new = strbuf_detach(&buf, &size);
+ new = strbuf_detach(&buf, &newsize);
+ size = newsize;
}
if (to_tempfile) {