[Debburn-changes] r358 - in nonameyet/trunk: . include libschily
Eduard Bloch
blade at costa.debian.org
Tue Oct 3 13:01:13 UTC 2006
Author: blade
Date: 2006-10-03 13:01:12 +0000 (Tue, 03 Oct 2006)
New Revision: 358
Modified:
nonameyet/trunk/Changelog
nonameyet/trunk/include/schily.h
nonameyet/trunk/libschily/comerr.c
nonameyet/trunk/libschily/error.c
Log:
error -> schily_error renaming
Modified: nonameyet/trunk/Changelog
===================================================================
--- nonameyet/trunk/Changelog 2006-10-03 12:25:23 UTC (rev 357)
+++ nonameyet/trunk/Changelog 2006-10-03 13:01:12 UTC (rev 358)
@@ -15,6 +15,8 @@
* killing FIFO process on ungraceful termination
* scsi-linux-sg.c: skipping unallowed devices, cleanup/consolidation of the
old workaround(s) for ATA now for SCSI too
+ * renamed error function to schily_error because it started to wreak random
+ havoc after harmless header moving (conflict with incompatible GNU version)
[ Eugen Dedu ]
* corrections and constructive help on cdda2ogg
Modified: nonameyet/trunk/include/schily.h
===================================================================
--- nonameyet/trunk/include/schily.h 2006-10-03 12:25:23 UTC (rev 357)
+++ nonameyet/trunk/include/schily.h 2006-10-03 13:01:12 UTC (rev 358)
@@ -193,7 +193,7 @@
extern void comexit __PR((int));
extern char *errmsgstr __PR((int));
/*PRINTFLIKE1*/
-extern int error __PR((const char *, ...)) __printflike__(1, 2);
+extern int schily_error __PR((const char *, ...)) __printflike__(1, 2);
extern char *fillbytes __PR((void *, int, char));
extern char *findbytes __PR((const void *, int, char));
extern int findline __PR((const char *, char, const char *,
Modified: nonameyet/trunk/libschily/comerr.c
===================================================================
--- nonameyet/trunk/libschily/comerr.c 2006-10-03 12:25:23 UTC (rev 357)
+++ nonameyet/trunk/libschily/comerr.c 2006-10-03 13:01:12 UTC (rev 358)
@@ -186,7 +186,7 @@
* defined to a enum. ENODEV may work as ENODEV is defined to a number
* directly.
*/
-#define silent_error(e) ((e) < 0 && (e) >= -1024)
+#define silent_schily_error(e) ((e) < 0 && (e) >= -1024)
#else
/*
* On UNIX errno is a small non-negative number, so we assume that
@@ -194,7 +194,7 @@
* string in this case. However the value may still be used as exit()
* code if 'exflg' is set.
*/
-#define silent_error(e) ((e) < 0)
+#define silent_schily_error(e) ((e) < 0)
#endif
LOCAL int
_comerr(exflg, err, msg, args)
@@ -207,8 +207,8 @@
char *errnam;
char *prognam = get_progname();
- if (silent_error(err)) {
- error("%s: %r", prognam, msg, args);
+ if (silent_schily_error(err)) {
+ schily_error("%s: %r", prognam, msg, args);
} else {
errnam = errmsgstr(err);
if (errnam == NULL) {
@@ -216,7 +216,7 @@
"Error %d", err);
errnam = errbuf;
}
- error("%s: %s. %r", prognam, errnam, msg, args);
+ schily_error("%s: %s. %r", prognam, errnam, msg, args);
}
if (exflg) {
comexit(err);
Modified: nonameyet/trunk/libschily/error.c
===================================================================
--- nonameyet/trunk/libschily/error.c 2006-10-03 12:25:23 UTC (rev 357)
+++ nonameyet/trunk/libschily/error.c 2006-10-03 13:01:12 UTC (rev 358)
@@ -40,10 +40,10 @@
/* VARARGS1 */
#ifdef PROTOTYPES
EXPORT int
-error(const char *fmt, ...)
+schily_error(const char *fmt, ...)
#else
EXPORT int
-error(fmt, va_alist)
+schily_error(fmt, va_alist)
char *fmt;
va_dcl
#endif
More information about the Debburn-changes
mailing list