Merge commit 'remotes/meins/v0.3' into v0.3

diff --combined error.h
index 98b702c4f3c89aa5c383e5b0a29d2ee487d6ddbd,ac8366dd45564a0e044b565a8137343128c494f7..7d2424cf3a626e27be056af432300be0911b76b9
--- 1/error.h
--- 2/error.h
+++ b/error.h
@@@ -74,6 -74,7 +74,7 @@@ enum para_subsystem 
        SS_PLAYLIST,
        SS_SHA1,
        SS_RBTREE,
+       SS_FSCK,
        NUM_SS
  };
  
@@@ -94,9 -95,13 +95,13 @@@
  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 +121,18 @@@
        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 +143,17 @@@
        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(ATOL, "failed to convert to long"), \
  
  
  #define MOOD_ERRORS \
@@@ -169,8 -163,6 +163,6 @@@
        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 +172,15 @@@
        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 \
@@@ -401,8 -393,6 +393,6 @@@
  
  #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 -484,17 +484,17 @@@
        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"), \
  
  
  #define WRITE_ERRORS \
@@@ -686,6 -687,7 +687,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 */