Simplify calling of CR/LF conversion routines
[git/git.git] / entry.c
diff --git a/entry.c b/entry.c
index d72f811..3771209 100644 (file)
--- a/entry.c
+++ b/entry.c
@@ -79,7 +79,6 @@ static int write_entry(struct cache_entry *ce, char *path, struct checkout *stat
        }
        switch (ntohl(ce->ce_mode) & S_IFMT) {
                char *buf;
-               unsigned long nsize;
 
        case S_IFREG:
                if (to_tempfile) {
@@ -96,12 +95,10 @@ static int write_entry(struct cache_entry *ce, char *path, struct checkout *stat
                /*
                 * Convert from git internal format to working tree format
                 */
-               buf = new;
-               nsize = size;
-               if (convert_to_working_tree(ce->name, &buf, &nsize)) {
+               buf = convert_to_working_tree(ce->name, new, &size);
+               if (buf) {
                        free(new);
                        new = buf;
-                       size = nsize;
                }
 
                wrote = write_in_full(fd, new, size);