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

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().
---

fd7ddaebab6613627a070e8867ace2f2eb3d4cc3
diff --cc fd.c
index 1116f9e8,1116f9e8..db1825cd
--- a/fd.c
+++ b/fd.c
@@@ -163,7 -163,7 +163,9 @@@ void *para_mmap(size_t length, int prot
  	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 --cc mp3_afh.c
index 0c8efbdc,8ca319b4..9ef5dffb
--- a/mp3_afh.c
+++ b/mp3_afh.c
@@@ -116,9 -111,18 +111,18 @@@ static const char *header_mode(struct m
  	return mode_text[h->mode];
  }
  
+ static int header_channels(struct mp3header *h)
+ {
+ 	if (h->mode > 3)
+ 		return 0;
+ 	if (h->mode < 3)
+ 		return 2;
+ 	return 1;
+ }
+ 
  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];
  }