From: Andre Noll <maan@systemlinux.org>
Date: Fri, 21 Sep 2007 09:01:13 +0000 (+0200)
Subject: Merge commit 'remotes/meins/v0.3' into v0.3
X-Git-Tag: v0.3.0~383
X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=commitdiff_plain;h=2c679eeb8bbc93220f85403eca6e9380dc624a6a;hp=3689799ede7bba230ca544ac953392b428c3d662

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

diff --git a/aft.c b/aft.c
index 0013b2a2..423731f6 100644
--- 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 ac8366dd..7d2424cf 100644
--- 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 \