From: Andre Noll <maan@systemlinux.org>
Date: Mon, 26 Mar 2007 12:51:03 +0000 (+0200)
Subject: Merge /fml/ag-raetsch/home/maan/scm/paraslash_meins/paraslash
X-Git-Tag: v0.2.16~7
X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=commitdiff_plain;h=fd7ddaebab6613627a070e8867ace2f2eb3d4cc3;hp=970247623b17124a5aacb14a8061da56e1f3b0be

Merge /fml/ag-raetsch/home/maan/scm/paraslash_meins/paraslash

Conflicts:

	mp3_afh.c

Fix the conflict and add more detailed error message to para_mmap().
---

diff --git a/fd.c b/fd.c
index 1116f9e8..db1825cd 100644
--- a/fd.c
+++ b/fd.c
@@ -163,7 +163,9 @@ void *para_mmap(size_t length, int prot, int flags, int fd, off_t offset)
 	void *ret = mmap(NULL, length, prot, flags, fd, offset);
 	if (ret != MAP_FAILED)
 		return ret;
-	PARA_EMERG_LOG("mmap failed: %s", strerror(errno));
+	PARA_EMERG_LOG("mmap failed: %s\n", strerror(errno));
+	PARA_EMERG_LOG("length: %zu, flags: %d, fd: %d, offset: %zu\n",
+		length, flags, fd, offset);
 	exit(EXIT_FAILURE);
 }
 
diff --git a/mp3_afh.c b/mp3_afh.c
index 8ca319b4..9ef5dffb 100644
--- a/mp3_afh.c
+++ b/mp3_afh.c
@@ -122,7 +122,7 @@ static int header_channels(struct mp3header *h)
 
 static int header_bitrate(struct mp3header *h)
 {
-	if (h->layer > 3 || h->bitrate > 14)
+	if (!h->layer || h->layer > 3 || h->bitrate > 14 || !h->bitrate)
 		return -E_HEADER_BITRATE;
 	return mp3info_bitrate[h->version & 1][3 - h->layer][h->bitrate - 1];
 }
diff --git a/server.h b/server.h
index b33ba1dd..3f01e05e 100644
--- a/server.h
+++ b/server.h
@@ -20,7 +20,6 @@
 
 #include "para.h"
 #include "afh.h"
-#include <openssl/pem.h>
 
 /** size of the selector_info and audio_file info strings of struct misc_meta_data */
 #define MMD_INFO_SIZE 16384