X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=db.c;h=cb6f692a74cd136a712f961294b3b9fbc735729c;hp=a1cc1aebc09e18c01d2685919bd6c407447d4c8b;hb=f6c929d9e580bb1f2666236b16de1e3fe73878d3;hpb=1f556ae88bd8c85d4452f689f532f5a6abeabe92

diff --git a/db.c b/db.c
index a1cc1aeb..cb6f692a 100644
--- a/db.c
+++ b/db.c
@@ -33,19 +33,20 @@
  */
 static int match_audio_file_name(char *name)
 {
-	int i, len = strlen(name);
-	const char *pattern[] = {SUPPORTED_AUDIO_FORMATS_ARRAY};
+	int i,j, len = strlen(name);
 
-	for (i = 0; pattern[i]; i++) {
-		const char *p = pattern[i];
-		int plen = strlen(p);
-		if (len < plen + 1)
-			continue;
-		if (name[len - plen - 1] != '.')
-			continue;
-		if (strcasecmp(name + len - plen, p))
-			continue;
-		return 1;
+	FOR_EACH_AUDIO_FORMAT(i) {
+		for (j = 0; afl[i].suffixes[j]; j++) {
+			const char *p = afl[i].suffixes[j];
+			int plen = strlen(p);
+			if (len < plen + 1)
+				continue;
+			if (name[len - plen - 1] != '.')
+				continue;
+			if (strcasecmp(name + len - plen, p))
+				continue;
+			return 1;
+		}
 	}
 	return 0;
 }
@@ -123,6 +124,6 @@ out:
 		ret = -E_CHDIR;
 	close(cwd_fd);
 	if (ret < 0)
-		PARA_ERROR_LOG("ret = %x\n", -ret);
+		PARA_ERROR_LOG("%s\n", PARA_STRERROR(-ret));
 	return ret;
 }