diff options
| author | Dmitry Ivankov <divanorama@gmail.com> | 2011-06-20 14:22:47 +0600 |
|---|---|---|
| committer | Jonathan Nieder <jrnieder@gmail.com> | 2011-06-21 05:02:57 -0500 |
| commit | c5f1fbe7bc6b29f3343a168461ee70816ddebec2 (patch) | |
| tree | 378bbc256a49756576dd40c24343fede945215d6 /vcs-svn | |
| parent | 3ac10b2e3fd6d858621f796160d251ad34affc20 (diff) | |
| download | git-c5f1fbe7bc6b29f3343a168461ee70816ddebec2.tar.gz git-c5f1fbe7bc6b29f3343a168461ee70816ddebec2.tar.xz | |
vcs-svn: do not initialize report_buffer twice
When importing from a dump with deltas, first fast_export_init calls
buffer_fdinit, and then init_report_buffer calls fdopen once again
when processing the first delta. The second initialization is
redundant and leaks a FILE *.
Remove the redundant on-demand initialization to fix this.
Initializing directly in fast_export_init is simpler and lets the
caller pass an int specifying which fd to use instead of hard-coding
REPORT_FILENO.
Signed-off-by: Dmitry Ivankov <divanorama@gmail.com>
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Diffstat (limited to 'vcs-svn')
| -rw-r--r-- | vcs-svn/fast_export.c | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/vcs-svn/fast_export.c b/vcs-svn/fast_export.c index 97f5fdf48..3efde20a0 100644 --- a/vcs-svn/fast_export.c +++ b/vcs-svn/fast_export.c @@ -14,7 +14,6 @@ #include "line_buffer.h" #define MAX_GITSVN_LINE_LEN 4096 -#define REPORT_FILENO 3 static uint32_t first_commit_done; static struct line_buffer postimage = LINE_BUFFER_INIT; @@ -30,15 +29,6 @@ static int init_postimage(void) return buffer_tmpfile_init(&postimage); } -static int init_report_buffer(int fd) -{ - static int report_buffer_initialized; - if (report_buffer_initialized) - return 0; - report_buffer_initialized = 1; - return buffer_fdinit(&report_buffer, fd); -} - void fast_export_init(int fd) { if (buffer_fdinit(&report_buffer, fd)) @@ -203,8 +193,6 @@ static long apply_delta(off_t len, struct line_buffer *input, if (init_postimage() || !(out = buffer_tmpfile_rewind(&postimage))) die("cannot open temporary file for blob retrieval"); - if (init_report_buffer(REPORT_FILENO)) - die("cannot open fd 3 for feedback from fast-import"); if (old_data) { const char *response; printf("cat-blob %s\n", old_data); |