Merge branch 't/mmap_sanity'

Conflicts:
	error.h

diff --cc NEWS
index f14f2879a8f61726f1c2464d4498b2f771e510c7,16e8e4e8cf2dba2709b75b612d386434838609ff..e5ae590e22605236ada049eb5d758eb293ba901e
--- 1/NEWS
--- 2/NEWS
+++ b/NEWS
@@@ -2,13 -2,6 +2,15 @@@
  0.4.10 (to be announced) "heterogeneous vacuum"
  -----------------------------------------------
  
- 
-        - Cleanup and consolidation of the various wrappers for
-          write(), writev(), send() and friends.
 +      - 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.
++      - 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 afh.c
Simple merge

diff --cc error.h
index f7216ea35ee031795a0bf2e916aa8c5bb5b788a9,39c109f9ca5f15670158ad4eb6eb45d19a050898..e34d8094ccd60215fccdf566b3c4cb592060c6ad
--- 1/error.h
--- 2/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 \

diff --cc fd.c
Simple merge