Avoid using va_copy in fast-import: it seems to be unportable.
[sp: minor change to use fputs, thus reducing the patch size] Signed-off-by: Alex Riesen <raa.lkml@gmail.com> Signed-off-by: Shawn O. Pearce <spearce@spearce.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Alex Riesen committed
Aug 20, 2007 at 23:38 UTC
4bf53833dbca666f61b5177977e96d453527db20
1 file changed
+6
-7
fast-import.c
+6
-7
@@ -375,7 +375,7 @@ static void write_branch_report(FILE *rpt, struct branch *b)
375
fputc('\n', rpt);
376
}
377
378
-static void write_crash_report(const char *err, va_list params)
378
+static void write_crash_report(const char *err)
379
{
380
char *loc = git_path("fast_import_crash_%d", getpid());
381
FILE *rpt = fopen(loc, "w");
@@ -397,7 +397,7 @@ static void write_crash_report(const char *err, va_list params)
397
fputc('\n', rpt);
398
399
fputs("fatal: ", rpt);
400
- vfprintf(rpt, err, params);
400
+ fputs(err, rpt);
401
fputc('\n', rpt);
402
403
fputc('\n', rpt);
@@ -442,18 +442,17 @@ static void write_crash_report(const char *err, va_list params)
442
static NORETURN void die_nicely(const char *err, va_list params)
443
{
444
static int zombie;
445
- va_list x_params;
445
+ char message[2 * PATH_MAX];
446
447
- va_copy(x_params, params);
447
+ vsnprintf(message, sizeof(message), err, params);
448
fputs("fatal: ", stderr);
449
- vfprintf(stderr, err, params);
449
+ fputs(message, stderr);
450
fputc('\n', stderr);
451
452
if (!zombie) {
453
zombie = 1;
454
- write_crash_report(err, x_params);
454
+ write_crash_report(message);
455
}
456
- va_end(x_params);
456
exit(128);
457
}
458