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

diff --git a/aft.c b/aft.c
index 0013b2a2f52ce434a6826bd5a352a996ae28b875..423731f6b70e770f4b84924bbf9e3640b8e8ba51 100644 (file)
--- a/aft.c
+++ b/aft.c
@@ -827,7 +827,7 @@ static int ls_path_compare(const void *a, const void *b)
 static int sort_matching_paths(struct ls_options *options)
 {
        size_t nmemb = options->num_matching_paths;
-       size_t size = sizeof(uint32_t);
+       size_t size = sizeof(*options->data_ptr);
        int (*compar)(const void *, const void *);
        int i;
 

diff --git a/error.h b/error.h
index ac8366dd45564a0e044b565a8137343128c494f7..7d2424cf3a626e27be056af432300be0911b76b9 100644 (file)
--- a/error.h
+++ b/error.h
@@ -172,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 \