X-Git-Url: http://git.tuebingen.mpg.de/?p=dss.git;a=blobdiff_plain;f=error.h;h=ade1a8ec25ea40a0c5a9a96ee622fbfcc7583ff2;hp=b9cbfec373e060059d8c65ed7be5b5751527853c;hb=2b4f4c85be13bb26a230df6669a7138d123c1a7d;hpb=c418d2188c9c2c542270023d6fc3bc6cf34f8d29

diff --git a/error.h b/error.h
index b9cbfec..ade1a8e 100644
--- a/error.h
+++ b/error.h
@@ -1,3 +1,8 @@
+/*
+ * Copyright (C) 2006-2010 Andre Noll <maan@systemlinux.org>
+ *
+ * Licensed under the GPL v2. For licencing details see COPYING.
+ */
 extern char *dss_errlist[];
 extern char *dss_error_txt;
 
@@ -16,20 +21,6 @@ __printf_2_3 void dss_log(int ll, const char* fmt,...);
 /** Set the system error bit for the given number. */
 #define ERRNO_TO_DSS_ERROR(num) ((num) | (1 << SYSTEM_ERROR_BIT))
 
-/** Check whether a given number is a system error number.
- *
- * \param num The value to be checked.
- * \param _errno The system error number.
- *
- * \return True if \a num is dss' representation of the system
- * error identified by \a _errno.
- */
-static inline int is_errno(int num, int _errno)
-{
-	assert(num > 0 && _errno > 0);
-	return ERRNO_TO_DSS_ERROR(_errno) == num;
-}
-
 /**
  * dss' version of strerror(3).
  *
@@ -46,15 +37,9 @@ static inline char *dss_strerror(int num)
 		return dss_errlist[num];
 }
 
-static inline void log_err_msg(int loglevel, int num)
-{
-	dss_log(loglevel, "%s (%s)\n", dss_error_txt, dss_strerror(num));
-}
-
 #define DSS_ERRORS \
 	DSS_ERROR(SUCCESS, "success") \
 	DSS_ERROR(SYNTAX, "syntax error") \
-	DSS_ERROR(INVALID_COMMAND, "invalid command") \
 	DSS_ERROR(ATOI_OVERFLOW, "value too large") \
 	DSS_ERROR(STRTOLL, "unknown strtoll error") \
 	DSS_ERROR(ATOI_NO_DIGITS, "no digits found in string") \
@@ -66,7 +51,10 @@ static inline void log_err_msg(int loglevel, int num)
 	DSS_ERROR(DUP_PIPE, "exec error: can not create pipe") \
 	DSS_ERROR(INVOLUNTARY_EXIT, "unexpected termination cause") \
 	DSS_ERROR(BAD_EXIT_CODE, "unexpected exit code") \
-	DSS_ERROR(SIGNAL_SIG_ERR, "signal() returned SIG_ERR")
+	DSS_ERROR(SIGNAL_SIG_ERR, "signal() returned SIG_ERR") \
+	DSS_ERROR(SIGNAL, "caught terminating signal") \
+	DSS_ERROR(BUG, "values of beta might cause dom!") \
+
 
 /**
  * This is temporarily defined to expand to its first argument (prefixed by