X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=error.h;h=40cccd5691ab537eb3cdd227e76971be68c4ef6a;hb=9ae4e1bcaf7bdcc902b70428afa766ab332a5b23;hp=2d03585a953f811c5d85cc1cea0cb474a18589c3;hpb=d1a194d437608fd036f6eb22ab7db284ee7c07f4;p=paraslash.git diff --git a/error.h b/error.h index 2d03585a..40cccd56 100644 --- a/error.h +++ b/error.h @@ -264,8 +264,6 @@ extern const char **para_errlist[]; #define SIGNAL_ERRORS \ PARA_ERROR(SIGNAL_SIG_ERR, "signal() retured SIG_ERR"), \ PARA_ERROR(SIGNAL_READ, "read error from signal pipe"), \ - PARA_ERROR(WAITPID, "waitpid error"), \ - PARA_ERROR(SIGNAL_PIPE, "failed to setup signal pipe"), \ #define STRING_ERRORS \ @@ -408,20 +406,8 @@ extern const char **para_errlist[]; #define FD_ERRORS \ - PARA_ERROR(NOTDIR, "error: not a directory"), \ - PARA_ERROR(F_GETFL, "failed to get fd flags"), \ - PARA_ERROR(F_SETFL, "failed to set fd flags"), \ PARA_ERROR(FGETS, "fgets error"), \ - PARA_ERROR(EXIST, "file or directory already exists"), \ - PARA_ERROR(ISDIR, "error: is a directory"), \ - PARA_ERROR(NOENT, "no such file or directory"), \ - PARA_ERROR(OPEN_PERM, "open error (permission denied)"), \ - PARA_ERROR(MKDIR_PERM, "mkdir error (permission denied)"), \ - PARA_ERROR(MKDIR, "failed to create directory"), \ PARA_ERROR(CHDIR, "failed to change directory"), \ - PARA_ERROR(FCHDIR, "fchdir failed"), \ - PARA_ERROR(OPENDIR, "can not open directory"), \ - PARA_ERROR(NOSPC, "no space left on device"), \ PARA_ERROR(OPEN, "failed to open file"), \ PARA_ERROR(CHDIR_PERM, "insufficient permissions to chdir"), \ @@ -522,7 +508,11 @@ extern const char **para_errlist[]; #define ERRNO_TO_PARA_ERROR(num) ((num) | (1 << SYSTEM_ERROR_BIT)) -#define IS_SYSTEM_ERRNO(val, _errno) (ERRNO_TO_PARA_ERROR(_errno) == (val)) +static inline int is_errno(int val, int _errno) +{ + assert(val > 0 && _errno > 0); + return ERRNO_TO_PARA_ERROR(_errno) == val; +} /** * paraslash's version of strerror(3)