From: Andre Noll <maan@systemlinux.org>
Date: Sat, 24 Dec 2011 17:30:07 +0000 (+0100)
Subject: Merge remote-tracking branch 's/master'
X-Git-Tag: v0.4.10~25
X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=commitdiff_plain;h=85094cd802bdb606d4e2bf7ed66dec51db2a0953;hp=25246b31dfd335959f24bebff84407efe105b196

Merge remote-tracking branch 's/master'
---

diff --git a/aacdec_filter.c b/aacdec_filter.c
index 95c13305..6c843799 100644
--- a/aacdec_filter.c
+++ b/aacdec_filter.c
@@ -11,7 +11,6 @@
 /** \file aacdec_filter.c paraslash's aac (m4a) decoder. */
 
 #include <regex.h>
-#include <stdbool.h>
 
 #include "para.h"
 #include "list.h"
diff --git a/alsa_write.c b/alsa_write.c
index e741578c..1ae26637 100644
--- a/alsa_write.c
+++ b/alsa_write.c
@@ -16,7 +16,6 @@
 #include <sys/types.h>
 #include <alsa/asoundlib.h>
 #include <sys/time.h>
-#include <stdbool.h>
 
 #include "para.h"
 #include "fd.h"
diff --git a/amp_filter.c b/amp_filter.c
index 21fd9fd1..e857e31a 100644
--- a/amp_filter.c
+++ b/amp_filter.c
@@ -7,7 +7,6 @@
 /** \file amp_filter.c Paraslash's amplify filter. */
 
 #include <regex.h>
-#include <stdbool.h>
 
 #include "para.h"
 #include "amp_filter.cmdline.h"
diff --git a/ao_write.c b/ao_write.c
index bb60e191..d36a53ab 100644
--- a/ao_write.c
+++ b/ao_write.c
@@ -9,7 +9,6 @@
 #include <pthread.h>
 #include <ao/ao.h>
 #include <regex.h>
-#include <stdbool.h>
 
 #include "para.h"
 #include "fd.h"
diff --git a/audiod.c b/audiod.c
index 29578726..88411af4 100644
--- a/audiod.c
+++ b/audiod.c
@@ -8,7 +8,6 @@
 #include <regex.h>
 #include <sys/types.h>
 #include <signal.h>
-#include <stdbool.h>
 
 #include "para.h"
 #include "error.h"
diff --git a/audiod_command.c b/audiod_command.c
index adfa07ed..9f867cce 100644
--- a/audiod_command.c
+++ b/audiod_command.c
@@ -8,7 +8,6 @@
 
 #include <regex.h>
 #include <sys/types.h>
-#include <stdbool.h>
 
 #include "para.h"
 #include "audiod.cmdline.h"
diff --git a/buffer_tree.c b/buffer_tree.c
index cb9d514f..3a1f3e23 100644
--- a/buffer_tree.c
+++ b/buffer_tree.c
@@ -6,7 +6,6 @@
 
 /** \file buffer_tree.c Buffer tree and buffer pool implementations. */
 #include <regex.h>
-#include <stdbool.h>
 
 #include "para.h"
 #include "list.h"
diff --git a/client.c b/client.c
index c6fde490..f4a4ad50 100644
--- a/client.c
+++ b/client.c
@@ -7,7 +7,6 @@
 /** \file client.c the client program used to connect to para_server */
 
 #include <regex.h>
-#include <stdbool.h>
 #include <signal.h>
 
 #include "para.h"
diff --git a/command.c b/command.c
index 932c9f3a..aa827f2b 100644
--- a/command.c
+++ b/command.c
@@ -11,7 +11,6 @@
 #include <sys/time.h>
 #include <sys/types.h>
 #include <osl.h>
-#include <stdbool.h>
 
 #include "para.h"
 #include "error.h"
diff --git a/compress_filter.c b/compress_filter.c
index d0816df4..f6ab8b12 100644
--- a/compress_filter.c
+++ b/compress_filter.c
@@ -11,7 +11,6 @@
  */
 
 #include <regex.h>
-#include <stdbool.h>
 
 #include "para.h"
 #include "compress_filter.cmdline.h"
diff --git a/crypt.c b/crypt.c
index 431de6fe..4762fddc 100644
--- a/crypt.c
+++ b/crypt.c
@@ -7,7 +7,6 @@
 /** \file crypt.c Openssl-based encryption/decryption routines. */
 
 #include <regex.h>
-#include <stdbool.h>
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <openssl/rand.h>
diff --git a/crypt_common.c b/crypt_common.c
index 8de346c7..a421641e 100644
--- a/crypt_common.c
+++ b/crypt_common.c
@@ -7,7 +7,6 @@
 /** \file crypt_common.c Crypto functions independent of openssl/libgcrypt. */
 
 #include <regex.h>
-#include <stdbool.h>
 
 #include "para.h"
 #include "error.h"
diff --git a/daemon.c b/daemon.c
index f06cf2f5..03058619 100644
--- a/daemon.c
+++ b/daemon.c
@@ -11,7 +11,6 @@
 #include <sys/types.h> /* getgrnam() */
 #include <grp.h>
 #include <sys/time.h>
-#include <stdbool.h>
 #include <signal.h>
 
 #include "para.h"
diff --git a/dccp_send.c b/dccp_send.c
index 53fa54e3..b3bd6263 100644
--- a/dccp_send.c
+++ b/dccp_send.c
@@ -102,13 +102,12 @@ static int dccp_init_fec(struct sender_client *sc)
 	return mps;
 }
 
-static int dccp_send_fec(struct sender_client *sc, char *buf, size_t len)
+static void dccp_send_fec(struct sender_client *sc, char *buf, size_t len)
 {
 	int ret = write_nonblock(sc->fd, buf, len);
 
 	if (ret < 0)
 		dccp_shutdown_client(sc);
-	return ret;
 }
 
 static void dccp_post_select(fd_set *rfds, __a_unused fd_set *wfds)
diff --git a/fecdec_filter.c b/fecdec_filter.c
index 09a2fabd..950c1a1f 100644
--- a/fecdec_filter.c
+++ b/fecdec_filter.c
@@ -7,7 +7,6 @@
 /** \file fecdec_filter.c A filter that fec-decodes an audio stream. */
 
 #include <regex.h>
-#include <stdbool.h>
 
 #include "para.h"
 #include "error.h"
diff --git a/file_write.c b/file_write.c
index bfade187..debf0767 100644
--- a/file_write.c
+++ b/file_write.c
@@ -9,7 +9,6 @@
 #include <regex.h>
 #include <sys/types.h>
 #include <sys/time.h>
-#include <stdbool.h>
 
 #include "para.h"
 #include "list.h"
diff --git a/filter.c b/filter.c
index bc9952ae..8ef9ac1a 100644
--- a/filter.c
+++ b/filter.c
@@ -7,7 +7,6 @@
 /** \file filter.c The stand-alone filter program. */
 
 #include <regex.h>
-#include <stdbool.h>
 
 #include "para.h"
 #include "filter.cmdline.h"
diff --git a/filter_common.c b/filter_common.c
index 1233c9ad..461d88bb 100644
--- a/filter_common.c
+++ b/filter_common.c
@@ -8,7 +8,6 @@
 
 #include <regex.h>
 #include <sys/types.h>
-#include <stdbool.h>
 
 #include "para.h"
 #include "list.h"
diff --git a/flac_afh.c b/flac_afh.c
index b3a0f6e7..9efc4e0a 100644
--- a/flac_afh.c
+++ b/flac_afh.c
@@ -7,7 +7,6 @@
 /** \file flac_afh.c Audio format handler for flac files. */
 
 #include <regex.h>
-#include <stdbool.h>
 #include <FLAC/stream_decoder.h>
 #include <FLAC/metadata.h>
 
diff --git a/flacdec_filter.c b/flacdec_filter.c
index 02759643..9a83c599 100644
--- a/flacdec_filter.c
+++ b/flacdec_filter.c
@@ -7,7 +7,6 @@
 /** \file flacdec_filter.c The flac decoder. */
 
 #include <regex.h>
-#include <stdbool.h>
 #include <FLAC/stream_decoder.h>
 
 #include "para.h"
diff --git a/gcrypt.c b/gcrypt.c
index f825f6c6..8c0a4194 100644
--- a/gcrypt.c
+++ b/gcrypt.c
@@ -7,7 +7,6 @@
 /** \file gcrypt.c Libgrcypt-based encryption/decryption routines. */
 
 #include <regex.h>
-#include <stdbool.h>
 #include <gcrypt.h>
 
 #include "para.h"
diff --git a/grab_client.c b/grab_client.c
index e5f42416..de69f074 100644
--- a/grab_client.c
+++ b/grab_client.c
@@ -8,7 +8,6 @@
 
 #include <regex.h>
 #include <sys/types.h>
-#include <stdbool.h>
 
 #include "para.h"
 #include "list.h"
diff --git a/gui_theme.c b/gui_theme.c
index 4abc45ec..f3a3729e 100644
--- a/gui_theme.c
+++ b/gui_theme.c
@@ -4,7 +4,6 @@
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
 
-#include <stdbool.h>
 #include "para.h"
 #include "gui.h"
 #include <curses.h>
diff --git a/http_send.c b/http_send.c
index 50211701..b78784b5 100644
--- a/http_send.c
+++ b/http_send.c
@@ -9,7 +9,6 @@
 #include <regex.h>
 #include <sys/types.h>
 #include <osl.h>
-#include <stdbool.h>
 
 #include "para.h"
 #include "error.h"
diff --git a/mp3dec_filter.c b/mp3dec_filter.c
index 5c4b1611..a6fb2bd4 100644
--- a/mp3dec_filter.c
+++ b/mp3dec_filter.c
@@ -8,7 +8,6 @@
 
 #include <mad.h>
 #include <regex.h>
-#include <stdbool.h>
 
 #include "para.h"
 #include "mp3dec_filter.cmdline.h"
diff --git a/net.h b/net.h
index 79c5994c..ee5116e4 100644
--- a/net.h
+++ b/net.h
@@ -3,8 +3,6 @@
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
-#include <stdbool.h>
-
 /** \file net.h exported symbols from net.c */
 
 /**
diff --git a/oggdec_filter.c b/oggdec_filter.c
index 07e4cec1..bba71c6c 100644
--- a/oggdec_filter.c
+++ b/oggdec_filter.c
@@ -8,7 +8,6 @@
 
 #include <regex.h>
 #include <vorbis/vorbisfile.h>
-#include <stdbool.h>
 
 #include "para.h"
 #include "list.h"
diff --git a/oss_write.c b/oss_write.c
index d583c233..05669bb7 100644
--- a/oss_write.c
+++ b/oss_write.c
@@ -10,7 +10,6 @@
 #include <sys/ioctl.h>
 #include <fcntl.h>
 #include <sys/soundcard.h>
-#include <stdbool.h>
 
 #include "para.h"
 #include "fd.h"
diff --git a/osx_write.c b/osx_write.c
index 429c7139..001c8176 100644
--- a/osx_write.c
+++ b/osx_write.c
@@ -13,7 +13,6 @@
 
 #include <regex.h>
 #include <sys/types.h>
-#include <stdbool.h>
 
 #include "para.h"
 #include "fd.h"
diff --git a/para.h b/para.h
index 96492baa..ac6a03fc 100644
--- a/para.h
+++ b/para.h
@@ -25,6 +25,7 @@
 #include <sys/un.h> /* needed by create_pf_socket */
 #include <string.h>
 #include <assert.h>
+#include <stdbool.h>
 #include "gcc-compat.h"
 
 /** used in various contexts */
diff --git a/prebuffer_filter.c b/prebuffer_filter.c
index e1b0390c..f0cd40c9 100644
--- a/prebuffer_filter.c
+++ b/prebuffer_filter.c
@@ -7,7 +7,6 @@
 /** \file prebuffer_filter.c Paraslash's prebuffering filter. */
 
 #include <regex.h>
-#include <stdbool.h>
 
 #include "para.h"
 #include "prebuffer_filter.cmdline.h"
diff --git a/recv.c b/recv.c
index 9b63f517..b915156a 100644
--- a/recv.c
+++ b/recv.c
@@ -8,7 +8,6 @@
 
 #include <regex.h>
 #include <sys/types.h>
-#include <stdbool.h>
 
 #include "para.h"
 #include "list.h"
diff --git a/recv_common.c b/recv_common.c
index 53a105df..9544420b 100644
--- a/recv_common.c
+++ b/recv_common.c
@@ -7,7 +7,6 @@
 /** \file recv_common.c common functions of para_recv and para_audiod */
 
 #include <regex.h>
-#include <stdbool.h>
 
 #include "para.h"
 #include "list.h"
diff --git a/sched.c b/sched.c
index 041cf417..4c94c423 100644
--- a/sched.c
+++ b/sched.c
@@ -9,7 +9,6 @@
 #include <regex.h>
 #include <assert.h>
 #include <sys/time.h>
-#include <stdbool.h>
 
 #include "para.h"
 #include "ipc.h"
diff --git a/send.h b/send.h
index 836babd5..d9575d3b 100644
--- a/send.h
+++ b/send.h
@@ -146,7 +146,7 @@ struct fec_client_parms {
 	 */
 	int (*init_fec)(struct sender_client *sc);
 	/** Push out FEC-encoded packets */
-	int (*send_fec)(struct sender_client *sc, char *buf, size_t len);
+	void (*send_fec)(struct sender_client *sc, char *buf, size_t len);
 };
 
 /** Describes the current status of one paraslash sender. */
diff --git a/server.c b/server.c
index ef79a2e8..d322dd47 100644
--- a/server.c
+++ b/server.c
@@ -67,7 +67,6 @@
 #include <sys/time.h>
 #include <regex.h>
 #include <osl.h>
-#include <stdbool.h>
 
 #include "para.h"
 #include "error.h"
diff --git a/spx_afh.c b/spx_afh.c
index a95f234c..dcd8e2d6 100644
--- a/spx_afh.c
+++ b/spx_afh.c
@@ -38,7 +38,6 @@
 */
 /** \file spx_afh.c Audio format handler for ogg/speex files. */
 
-#include <stdbool.h>
 #include <ogg/ogg.h>
 #include <regex.h>
 #include <speex/speex.h>
diff --git a/spxdec_filter.c b/spxdec_filter.c
index 41b66c51..a48d8695 100644
--- a/spxdec_filter.c
+++ b/spxdec_filter.c
@@ -43,7 +43,6 @@
 #include <regex.h>
 #include <ogg/ogg.h>
 #include <speex/speex.h>
-#include <stdbool.h>
 #include <speex/speex_header.h>
 #include <speex/speex_stereo.h>
 #include <speex/speex_callbacks.h>
diff --git a/stdin.c b/stdin.c
index c4ab323d..4b77a3d8 100644
--- a/stdin.c
+++ b/stdin.c
@@ -7,7 +7,6 @@
 /** \file stdin.c Functions that deal with reading from stdin. */
 
 #include <assert.h>
-#include <stdbool.h>
 #include <regex.h>
 
 #include "para.h"
diff --git a/stdout.c b/stdout.c
index a2ee2aca..33770c46 100644
--- a/stdout.c
+++ b/stdout.c
@@ -7,7 +7,6 @@
 /** \file stdout.c Functions that deal with writing to stdout. */
 
 #include <assert.h>
-#include <stdbool.h>
 
 #include "para.h"
 #include "list.h"
diff --git a/udp_send.c b/udp_send.c
index 880d7957..bc238311 100644
--- a/udp_send.c
+++ b/udp_send.c
@@ -13,7 +13,6 @@
 #include <netinet/udp.h>
 #include <net/if.h>
 #include <osl.h>
-#include <stdbool.h>
 
 #include "server.cmdline.h"
 #include "para.h"
@@ -278,14 +277,14 @@ static int udp_check_socket_state(struct sender_client *sc)
 	return -ERRNO_TO_PARA_ERROR(ret);
 }
 
-static int udp_send_fec(struct sender_client *sc, char *buf, size_t len)
+static void udp_send_fec(struct sender_client *sc, char *buf, size_t len)
 {
 	int ret;
 
 	if (sender_status == SENDER_OFF)
-		return 0;
+		return;
 	if (len == 0)
-		return 0;
+		return;
 	ret = udp_check_socket_state(sc);
 	if (ret < 0)
 		goto fail;
@@ -299,10 +298,9 @@ static int udp_send_fec(struct sender_client *sc, char *buf, size_t len)
 	}
 	if (ret < 0)
 		goto fail;
-	return 1;
+	return;
 fail:
 	udp_delete_target(sc, para_strerror(-ret));
-	return ret;
 }
 
 static int udp_com_add(struct sender_command_data *scd)
diff --git a/wav_filter.c b/wav_filter.c
index 8408034d..3149e5b4 100644
--- a/wav_filter.c
+++ b/wav_filter.c
@@ -7,7 +7,6 @@
 /** \file wav_filter.c A filter that inserts a wave header. */
 
 #include <regex.h>
-#include <stdbool.h>
 
 #include "para.h"
 #include "error.h"
diff --git a/wmadec_filter.c b/wmadec_filter.c
index c6eb0b1c..7d89d112 100644
--- a/wmadec_filter.c
+++ b/wmadec_filter.c
@@ -25,7 +25,6 @@
 #include <string.h>
 #include <regex.h>
 #include <sys/select.h>
-#include <stdbool.h>
 
 #include "para.h"
 #include "error.h"
diff --git a/write.c b/write.c
index afaad951..946653f6 100644
--- a/write.c
+++ b/write.c
@@ -8,7 +8,6 @@
 
 #include <regex.h>
 #include <sys/types.h>
-#include <stdbool.h>
 
 #include "para.h"
 #include "string.h"
diff --git a/write_common.c b/write_common.c
index 71b6664d..91c84775 100644
--- a/write_common.c
+++ b/write_common.c
@@ -7,7 +7,6 @@
 /** \file write_common.c common functions of para_audiod and para_write */
 
 #include <regex.h>
-#include <stdbool.h>
 
 #include "para.h"
 #include "string.h"