X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=error.h;h=e8920d29ee8afe4d518534711a58c937d873928d;hp=ee8cff348820fccf584d34f9e1e19a62c08a8ac7;hb=cf1e416e5db97f1673521a63dacaa1487fb875d7;hpb=70de5747997ee637dba6f817abccc56ec1340875 diff --git a/error.h b/error.h index ee8cff34..e8920d29 100644 --- a/error.h +++ b/error.h @@ -74,6 +74,7 @@ enum para_subsystem { SS_PLAYLIST, SS_SHA1, SS_RBTREE, + SS_FSCK, NUM_SS }; @@ -94,9 +95,13 @@ enum para_subsystem { extern const char **para_errlist[]; /** \endcond */ +#define FSCK_ERRORS \ + PARA_ERROR(FSCK_SYNTAX, "fsck syntax error"), \ + PARA_ERROR(RANGE_VIOLATION, "range violation detected, very bad"), \ + PARA_ERROR(NOT_A_REGULAR_FILE, "not a regular file"), \ + + #define OSL_ERRORS \ - PARA_ERROR(OSL_OPENDIR, "can not open directory"), \ - PARA_ERROR(OSL_CHDIR, "failed to change directory"), \ PARA_ERROR(BAD_DB_DIR, "invalid database directory"), \ PARA_ERROR(NO_COLUMN_DESC, "missing column description"), \ PARA_ERROR(BAD_NAME, "invalid name for a column/table"), \ @@ -116,26 +121,18 @@ extern const char **para_errlist[]; PARA_ERROR(BAD_SIZE, "invalid size specified"), \ PARA_ERROR(TRUNC, "failed to truncate file"), \ PARA_ERROR(UNLINK, "failed to remove file"), \ - PARA_ERROR(EXIST, "file or directory already exists"), \ - PARA_ERROR(ISDIR, "error: is a directory"), \ PARA_ERROR(NOTDIR, "error: not a directory"), \ - PARA_ERROR(NOENT, "no such file or directory"), \ - PARA_ERROR(OSL_PERM, "permission denied"), \ PARA_ERROR(BAD_TABLE, "table not open"), \ - PARA_ERROR(BAD_TABLE_HEADER, "table header corruption"), \ PARA_ERROR(BAD_TABLE_DESC, "invalid table description"), \ PARA_ERROR(RB_KEY_EXISTS, "key already exists in rbtree"), \ PARA_ERROR(RB_KEY_NOT_FOUND, "key not found in rbtree"), \ PARA_ERROR(BAD_ROW_NUM, "invalid row number"), \ PARA_ERROR(INDEX_CORRUPTION, "index corruption detected"), \ PARA_ERROR(INVALID_OBJECT, "reference to invalid object"), \ - PARA_ERROR(MKDIR, "failed to create directory"), \ - PARA_ERROR(OPEN, "failed to open file"), \ PARA_ERROR(STAT, "can not stat file"), \ PARA_ERROR(FSTAT, "fstat error"), \ PARA_ERROR(RENAME, "rename failed"), \ PARA_ERROR(EMPTY, "file empty"), \ - PARA_ERROR(NOSPC, "no space left on device"), \ PARA_ERROR(MMAP, "mmap error"), \ PARA_ERROR(MUNMAP, "munmap failed"), \ PARA_ERROR(WRITE, "write error"), \ @@ -146,20 +143,17 @@ extern const char **para_errlist[]; PARA_ERROR(VERSION_MISMATCH, "table version not suppoerted"), \ PARA_ERROR(BAD_COLUMN_NUM, "invalid column number"), \ PARA_ERROR(BAD_TABLE_FLAGS, "invalid flags in table description"), \ - PARA_ERROR(RBTREE_EMPTY, "rbtree is empty"), \ PARA_ERROR(BAD_ROW, "invalid row"), \ - PARA_ERROR(OSL_GETCWD, "can not get current working directory"), \ - PARA_ERROR(OSL_LSTAT, "lstat error"), \ #define RBTREE_ERRORS \ #define AFS_ERRORS \ - PARA_ERROR(AFS_SYNTAX, "afs syntax error"), \ - PARA_ERROR(FORK, "fork error"), \ PARA_ERROR(BAD_TABLE_NAME, "invalid table"), \ PARA_ERROR(INPUT_TOO_LARGE, "input too large for stdin command"), \ + PARA_ERROR(READ, "read error"), \ + PARA_ERROR(AFS_SYNTAX, "afs syntax error"), \ #define MOOD_ERRORS \ @@ -169,8 +163,6 @@ extern const char **para_errlist[]; PARA_ERROR(MOOD_LOADED, "mood loaded"), \ PARA_ERROR(MOOD_BUSY, "mood is in use"), \ PARA_ERROR(NOT_ADMISSIBLE, "file is not admussible"), \ - PARA_ERROR(READ, "read error"), \ - PARA_ERROR(ATOL, "failed to convert to long"), \ #define ATTRIBUTE_ERRORS \ @@ -180,15 +172,15 @@ extern const char **para_errlist[]; PARA_ERROR(NO_ATTRIBUTES, "no attributes defined yet"), \ #define BLOB_ERRORS \ - PARA_ERROR(BLOB_SYNTAX, "fixme"), \ - PARA_ERROR(DUMMY_ROW, "fixme"), \ + PARA_ERROR(BLOB_SYNTAX, "blob syntax error"), \ + PARA_ERROR(DUMMY_ROW, "attempted to access blob dummy object"), \ #define PLAYLIST_ERRORS \ - PARA_ERROR(PLAYLIST_SYNTAX, "fixme"), \ - PARA_ERROR(NO_PLAYLIST, "fixme"), \ - PARA_ERROR(PLAYLIST_LOADED, "fixme"), \ - PARA_ERROR(PLAYLIST_EMPTY, "fixme"), \ + PARA_ERROR(PLAYLIST_SYNTAX, "playlist syntax error"), \ + PARA_ERROR(NO_PLAYLIST, "no valid playlist found"), \ + PARA_ERROR(PLAYLIST_LOADED, ""), /* not really an error */ \ + PARA_ERROR(PLAYLIST_EMPTY, "attempted to load empty playlist"), \ #define AFT_ERRORS \ @@ -356,6 +348,10 @@ extern const char **para_errlist[]; #define STRING_ERRORS \ PARA_ERROR(MKSTEMP, "mkstemp error: unable to create tmp file"), \ PARA_ERROR(FCHMOD, "fchmod error: can not set mode"), \ + PARA_ERROR(ATOI_OVERFLOW, "value too large"), \ + PARA_ERROR(STRTOLL, "unknown strtoll error"), \ + PARA_ERROR(ATOI_NO_DIGITS, "no digits found in string"), \ + PARA_ERROR(ATOI_JUNK_AT_END, "further characters after number"), \ #define EXEC_ERRORS \ @@ -395,14 +391,13 @@ extern const char **para_errlist[]; #define VSS_ERRORS \ + PARA_ERROR(BAD_AUDIO_FILE_SUFFIX, "unknown suffix"), \ PARA_ERROR(AUDIO_FORMAT, "audio format not recognized"), \ PARA_ERROR(CHUNK, "unable to get chunk"), \ #define AFS_COMMON_ERRORS \ PARA_ERROR(GETCWD, "can not get current working directory"), \ - PARA_ERROR(CHDIR, "can not change directory"), \ - PARA_ERROR(OPENDIR, "can not open directory"), \ PARA_ERROR(LSTAT, "lstat error"), \ @@ -494,6 +489,18 @@ extern const char **para_errlist[]; 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"), \ #define WRITE_ERRORS \ @@ -686,6 +693,7 @@ SS_ENUM(BLOB); SS_ENUM(PLAYLIST); SS_ENUM(SHA1); SS_ENUM(RBTREE); +SS_ENUM(FSCK); /** \endcond */ #undef PARA_ERROR /* rest of the world only sees the error text */