From: Andre Noll <maan@systemlinux.org>
Date: Sun, 26 Feb 2012 13:23:59 +0000 (+0100)
Subject: Merge branch 't/mmap_sanity'
X-Git-Tag: v0.4.10~10
X-Git-Url: http://git.tue.mpg.de/?a=commitdiff_plain;h=26a0b7e457d1dd7e0e40d866d28de00c5d1cfa54;p=paraslash.git

Merge branch 't/mmap_sanity'

Conflicts:
	error.h
---

26a0b7e457d1dd7e0e40d866d28de00c5d1cfa54
diff --cc NEWS
index f14f2879,16e8e4e8..e5ae590e
--- a/NEWS
+++ b/NEWS
@@@ -2,13 -2,6 +2,15 @@@
  0.4.10 (to be announced) "heterogeneous vacuum"
  -----------------------------------------------
  
 +	- The --no_default_filters option of para_filter has been
 +	  depricated. It still works but has no effect and will be
 +	  removed in the next version.
- 
- 	 - Cleanup and consolidation of the various wrappers for
- 	   write(), writev(), send() and friends.
++	- Cleanup and consolidation of the various wrappers for
++	  write(), writev(), send() and friends.
++	- The obscure error messages on mmap() failures have been
++	  replaced by meaningful messages. This affects mainly
++	  para_afh.
 +
  -------------------------------------
  0.4.9 (2011-12-06) "hybrid causality"
  -------------------------------------
diff --cc error.h
index f7216ea3,39c109f9..e34d8094
--- a/error.h
+++ b/error.h
@@@ -441,7 -441,7 +441,8 @@@ extern const char **para_errlist[]
  	PARA_ERROR(FGETS, "fgets error"), \
  	PARA_ERROR(EOF, "end of file"), \
  	PARA_ERROR(READ_PATTERN, "did not read expected pattern"), \
 +	PARA_ERROR(SHORT_WRITE, "unexpected short write"), \
+ 	PARA_ERROR(EMPTY, "file is empty"), \
  
  
  #define ALSA_WRITE_ERRORS \