X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=error.h;h=4a885ec9e4b7078d43cd3cdb67507a1a0a39b754;hp=4bc9f1555e274049d041e2895d31c1263469845f;hb=36df09fbcf3f6e80cc0990bad92ec16a0d1b2a00;hpb=f0380a05616524b149fa34f4a0873d9063ca2a95 diff --git a/error.h b/error.h index 4bc9f155..4a885ec9 100644 --- a/error.h +++ b/error.h @@ -446,27 +446,48 @@ extern const char **para_errlist[]; */ #define ERRNUM_TO_INDEX(num) (((1 << SS_SHIFT) - 1) & (num)) +/** + * This bit indicates whether a number is considered a system error number + * If yes, the system errno is just the result of clearing this bit from + * the given number. + */ #define SYSTEM_ERROR_BIT 30 +/** Check whether the system error bit is set. */ #define IS_SYSTEM_ERROR(num) (!!((num) & (1 << SYSTEM_ERROR_BIT))) +/** Set the system error bit for the given number. */ #define ERRNO_TO_PARA_ERROR(num) ((num) | (1 << SYSTEM_ERROR_BIT)) -static inline int is_errno(int val, int _errno) +/** 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 paraslash's representation of the system + * error identified by \a _errno. + */ +_static_inline_ int is_errno(int num, int _errno) { - assert(val > 0 && _errno > 0); - return ERRNO_TO_PARA_ERROR(_errno) == val; + assert(num > 0 && _errno > 0); + return ERRNO_TO_PARA_ERROR(_errno) == num; } /** * Paraslash's version of strerror(3). * - * Expands to the error text of \a num (a string constant). + * \param num The error number. + * + * \return The error text of \a num. */ -#define PARA_STRERROR(num) IS_SYSTEM_ERROR(num)? \ - strerror((num) & ((1 << SYSTEM_ERROR_BIT) - 1)) : \ - para_errlist[ERRNUM_TO_SS(num)] [ERRNUM_TO_INDEX(num)] - +_static_inline_ const char *para_strerror(int num) +{ + assert(num > 0); + if (IS_SYSTEM_ERROR(num)) + return strerror((num) & ((1 << SYSTEM_ERROR_BIT) - 1)); + else + return para_errlist[ERRNUM_TO_SS(num)][ERRNUM_TO_INDEX(num)]; +} /** * Define the error list for one subsystem. #