From: Andre Noll <maan@systemlinux.org>
Date: Fri, 6 Nov 2009 14:19:32 +0000 (+0100)
Subject: Merge commit 'meins/maint' into maint
X-Git-Tag: v0.4.0~3^2
X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=commitdiff_plain;h=ee3b1c1b7eb824a533f59f4cf573f0dcc980d477;hp=06c82519ac27d0c34e1b6e0c1a1f088fe34e61b3

Merge commit 'meins/maint' into maint
---

diff --git a/afh_common.c b/afh_common.c
index 8c0eed27..7d4ab089 100644
--- a/afh_common.c
+++ b/afh_common.c
@@ -208,9 +208,9 @@ int compute_afhi(const char *path, char *data, size_t size, int fd,
  */
 const char *audio_format_name(int i)
 {
-	//PARA_NOTICE_LOG("array size: %u¸ requested: %d\n", ARRAY_SIZE(afl), i);
-	assert(i < 0 || i < ARRAY_SIZE(afl) - 1);
-	return i >= 0?  afl[i].name : "(none)";
+	if (i < 0 || i >= ARRAY_SIZE(afl) - 1)
+		return "???";
+	return afl[i].name;
 }
 
 /**
diff --git a/configure.ac b/configure.ac
index 85a32729..74a3c742 100644
--- a/configure.ac
+++ b/configure.ac
@@ -498,7 +498,7 @@ AC_CHECK_HEADER(sys/soundcard.h, [
 	],
 	[
 		have_oss="no"
-		AC_MSG_WARN([no linux/soundcard.h $msg])
+		AC_MSG_WARN([no sys/soundcard.h $msg])
 	]
 )
 CPPFLAGS="$OLD_CPPFLAGS"