Merge branch 't/releases_branch'

	18d2c3 Remove all release tarballs from the master branch.
	f82ac2 web: Rename tarball download directory.

Was cooking since 2012-07-28, tested also on athcx.

diff --git a/NEWS b/NEWS
index 84d68d82835f79a7156a17d1a661bc37e483ca54..65a5ca44dde9a92ac8e0b61ecf92397d1e19c933 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -2,6 +2,10 @@
 0.?.? (to be announced) "volatile relativity"
 ---------------------------------------------
 
+       - The "versions" directory has been removed from the master
+         branch. The tarballs of the old releases are now available
+         in the new "releases" branch.
+
 --------------------------------------
 0.4.11 (2012-07-20) "mutual diversity"
 --------------------------------------

diff --git a/exec.c b/exec.c
index 8eb0599fba5e3089057f83dcb717345c6e0194d5..89d96bb9afdaf9e3162ba908d835a57a35d4f0b2 100644 (file)
--- a/exec.c
+++ b/exec.c
@@ -9,7 +9,6 @@
 #include <regex.h>
 
 #include "para.h"
-#include "close_on_fork.h"
 #include "error.h"
 #include "fd.h"
 #include "string.h"

diff --git a/ggo/makefile b/ggo/makefile
index 9c01ae65f548b4756e8b52c4535b96451c5598e6..84a257c3b35b858e9468886304f70d18b38048d5 100644 (file)
--- a/ggo/makefile
+++ b/ggo/makefile
@@ -51,7 +51,8 @@ $(ggo_dir)/server.ggo $(ggo_dir)/audiod.ggo: \
        $(ggo_dir)/loglevel.m4 $(ggo_dir)/color.m4 \
        $(ggo_dir)/config_file.m4 $(ggo_dir)/logfile.m4 \
        $(ggo_dir)/daemon.m4 $(ggo_dir)/user.m4 \
-       $(ggo_dir)/group.m4 $(ggo_dir)/log_timing.m4
+       $(ggo_dir)/group.m4 $(ggo_dir)/log_timing.m4 \
+       $(ggo_dir)/config_file.m4
 
 $(ggo_dir)/afh.ggo: $(ggo_dir)/loglevel.m4
 $(ggo_dir)/audioc.ggo: $(ggo_dir)/loglevel.m4 $(ggo_dir)/history_file.m4 $(ggo_dir)/complete.m4

diff --git a/sideband.h b/sideband.h
index 4f4ed0ac219d826e6d76aa0fded9a9fa13dd57c0..8ae3e4ef35089e698f5eb81a4d1926e95f07ace5 100644 (file)
--- a/sideband.h
+++ b/sideband.h
@@ -114,7 +114,7 @@ typedef void (*sb_transformation)(struct iovec *src, struct iovec *dst,
 /** Initialize a sideband buffer. */
 #define SBB_INIT(_band, _buf, _numbytes) \
        { \
-               .band = band, \
+               .band = _band, \
                .iov = { \
                        .iov_base = _buf, \
                        .iov_len = _numbytes \

diff --git a/signal.c b/signal.c
index 0b7b47fa3d1401d57ae11ed107f487e9036a2870..b2317c9b3a51fefca4c490681424a2f8709563b2 100644 (file)
--- a/signal.c
+++ b/signal.c
@@ -22,15 +22,15 @@ static int signal_pipe[2];
  * during the application's startup part, followed by subsequent calls
  * to para_install_sighandler() for each signal that should be caught.
  *
- * para_signal_init() installs a generic signal handler which is used for all
- * signals simultaneously. When a signal arrives, this generic signal handler
- * writes the corresponding signal number to the signal pipe so that the
- * application can test for pending signals simply by checking the signal pipe
- * for reading, e.g. by using the select(2) system call.
- *
- * \return This function either succeeds or calls exit(2) to terminate
- * the current process. On success, the file descriptor of the signal pipe is
- * returned.
+ * A generic signal handler is used for all signals simultaneously. When a
+ * signal arrives, the signal handler writes the number of the signal received
+ * to one end of the signal pipe. The application can test for pending signals
+ * by checking if the file descriptor of the other end of the signal pipe is
+ * ready for reading, see select(2).
+ *
+ * \return This function either succeeds or calls exit(2) to terminate the
+ * current process. On success, the file descriptor of the read end of the
+ * signal pipe is returned.
  */
 int para_signal_init(void)
 {