fast-import pull request

[thirdparty/git.git] / fast-import.c

diff --git a/fast-import.c b/fast-import.c
index 5085fbf116e57a59f488afa3f0055c9427efb3c9..2d5224c1867a081c592d21af1573264455a92aff 100644 (file)
--- a/fast-import.c
+++ b/fast-import.c
@@ -442,16 +442,18 @@ static void write_crash_report(const char *err, va_list params)
 static NORETURN void die_nicely(const char *err, va_list params)
 {
        static int zombie;
+       va_list x_params;
 
+       va_copy(x_params, params);
        fputs("fatal: ", stderr);
        vfprintf(stderr, err, params);
        fputc('\n', stderr);
 
        if (!zombie) {
                zombie = 1;
-               write_crash_report(err, params);
+               write_crash_report(err, x_params);
        }
-
+       va_end(x_params);
        exit(128);
 }
 
@@ -1618,7 +1620,7 @@ static void read_next_command(void)
        } while (command_buf.buf[0] == '#');
 }
 
-static void skip_optional_lf()
+static void skip_optional_lf(void)
 {
        int term_char = fgetc(stdin);
        if (term_char != '\n' && term_char != EOF)