summaryrefslogtreecommitdiff
path: root/lib/ss/error.c
diff options
context:
space:
mode:
authorTheodore Ts'o <tytso@mit.edu>2003-03-30 22:26:13 -0500
committerTheodore Ts'o <tytso@mit.edu>2003-03-30 22:26:13 -0500
commit91835c151fd48fd03bfe74133b8214486af18c12 (patch)
tree19f92b8260cea37d1db8f94f190c213175813fe2 /lib/ss/error.c
parentac6e94c16c5466e0fae9f35a70a6c0b96e5df2d4 (diff)
downloade2fsprogs-91835c151fd48fd03bfe74133b8214486af18c12.tar.gz
Change compile_et to generate header files that use <et/com_err.h>
instead of <com_err.h>, so the current version of the header file is used. Add a --build-tree option to compile_et to make sure that it uses the et_?.awk files from the build tree. Remove legacy support for varargs.h, K&R C, and pre-POSIX signal support. Also fixed gcc -Wall nits.
Diffstat (limited to 'lib/ss/error.c')
-rw-r--r--lib/ss/error.c33
1 files changed, 1 insertions, 32 deletions
diff --git a/lib/ss/error.c b/lib/ss/error.c
index 26f5ae79..14c0570f 100644
--- a/lib/ss/error.c
+++ b/lib/ss/error.c
@@ -14,28 +14,11 @@
#include <stdio.h>
-/*
- * I'm assuming that com_err.h includes varargs.h, which it does
- * (right now). There really ought to be a way for me to include the
- * file without worrying about whether com_err.h includes it or not,
- * but varargs.h doesn't define anything that I can use as a flag, and
- * gcc will lose if I try to include it twice and redefine stuff.
- */
-#if !defined(__STDC__) || !defined(ibm032) || !defined(NeXT)
-#define ss_error ss_error_external
-#endif
-
#include <com_err.h>
#include "ss_internal.h"
-#ifdef HAVE_STDARG_H
#include <stdarg.h>
-#else
-#include <vararg.h>
-#endif
-#undef ss_error
-
char * ss_name(sci_idx)
int sci_idx;
{
@@ -74,26 +57,12 @@ char * ss_name(sci_idx)
}
}
-#ifdef HAVE_STDARG_H
void ss_error (int sci_idx, long code, const char * fmt, ...)
-#else
-void ss_error (va_alist)
- va_dcl
-#endif
{
register char *whoami;
va_list pvar;
-#ifndef HAVE_STDARG_H
- int sci_idx;
- long code;
- char * fmt;
- va_start (pvar);
- sci_idx = va_arg (pvar, int);
- code = va_arg (pvar, long);
- fmt = va_arg (pvar, char *);
-#else
+
va_start (pvar, fmt);
-#endif
whoami = ss_name (sci_idx);
com_err_va (whoami, code, fmt, pvar);
free (whoami);