[Debburn-changes] r463 - in cdrkit/trunk: libusal wodim
Eduard Bloch
blade at alioth.debian.org
Sat Nov 25 01:44:12 CET 2006
Author: blade
Date: 2006-11-25 01:44:12 +0100 (Sat, 25 Nov 2006)
New Revision: 463
Modified:
cdrkit/trunk/libusal/scsitransp.c
cdrkit/trunk/wodim/cue.c
Log:
Workarounds for some remaining cases of %r usage
Modified: cdrkit/trunk/libusal/scsitransp.c
===================================================================
--- cdrkit/trunk/libusal/scsitransp.c 2006-11-25 00:20:20 UTC (rev 462)
+++ cdrkit/trunk/libusal/scsitransp.c 2006-11-25 00:44:12 UTC (rev 463)
@@ -56,6 +56,9 @@
#include <usal/scsitransp.h>
#include "usaltimes.h"
+#include <stdarg.h>
+
+
/*
* Warning: you may change this source, but if you do that
* you need to change the _usal_version and _usal_auth* string below.
@@ -1288,8 +1291,6 @@
usal_fprintdev(stdout, ip);
}
-#include <vadefs.h>
-
/*
* print into the SCSI error buffer, adjust the next write pointer.
*/
@@ -1301,7 +1302,7 @@
va_list args;
va_start(args, form);
- cnt = snprintf(usalp->errptr, usal_errrsize(usalp), "%r", form, args);
+ cnt = vsnprintf(usalp->errptr, usal_errrsize(usalp), form, args);
va_end(args);
if (cnt < 0) {
Modified: cdrkit/trunk/wodim/cue.c
===================================================================
--- cdrkit/trunk/wodim/cue.c 2006-11-25 00:20:20 UTC (rev 462)
+++ cdrkit/trunk/wodim/cue.c 2006-11-25 00:44:12 UTC (rev 463)
@@ -1198,13 +1198,12 @@
}
/* VARARGS1 */
-static void
-cueabort(const char *fmt, ...)
+static void cueabort(const char *fmt, ...)
{
va_list args;
-
- va_start(args, fmt);
- comerrno(EX_BAD, "%r on line %d in '%s'.\n",
- fmt, args, lineno, fname);
+ va_start(args, fmt);
+ vfprintf(stderr, fmt, args);
va_end(args);
+ fprintf(stderr, " on line %d in '%s'.\n", lineno, fname);
+ exit(EXIT_FAILURE);
}
More information about the Debburn-changes
mailing list