Merge remote-tracking branch 's/master'

diff --git a/aacdec_filter.c b/aacdec_filter.c
index 95c13305519e39a86eff3cbe5cdf06b280ef8d04..6c843799ba04446e6d6a14357e96c1cf7d6c5465 100644 (file)
--- 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 e741578c66378d74926c28bea86a56c084bde255..1ae266371c2215ee3400d459b9a1854f98d63e15 100644 (file)
--- 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 21fd9fd179a3885e7f25664fbfae60029922536b..e857e31a5e3d01586c0bc4fe3a261b5040e9196f 100644 (file)
--- 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 bb60e191f4ddb748bbc80aa683c7c8d79fe68122..d36a53ab90db2fcfd24845e98671690330597509 100644 (file)
--- 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 295787262ae66589ceb6dc2d56da258e77943ef8..88411af46616879040a8691308ed4ca639fc5475 100644 (file)
--- 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 adfa07edfc6c603b936cb52df4615323b5d62bb0..9f867ccefaf58e257ea609f2a8fff2e9b80807e4 100644 (file)
--- 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 cb9d514f1aa5adfc501d5eee89150b7aa31821bc..3a1f3e23eb75c7efc4df34942e9afdc7eda9af91 100644 (file)
--- 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 c6fde49000b3e0844414c979bf6cc5541cff4eed..f4a4ad50769cafcdd4ec0d0f0806e20b4ee13fcc 100644 (file)
--- 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 932c9f3a2c7ef51014c9630514513ee427f0280b..aa827f2b1cdc9ffd9984379b55c02223addcca1b 100644 (file)
--- 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 d0816df44198ae11d1f3b076b262ab16b51e255b..f6ab8b12a74a0aeb3311d5fc4f99e0882d36d08d 100644 (file)
--- 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 431de6fe807f5a08acb8d4e62e0e6e3c160b6e1c..4762fddcf018b27ee365931c22151c2216a29e86 100644 (file)
--- 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 8de346c74b47468a15c566cae29a4ff484b056c6..a421641e6bac63786609b45e3076cb2f1242f731 100644 (file)
--- 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 f06cf2f5a12d57015f3b66982a9aaab4f7e96622..03058619a880c4ef5435032b8dc0da3e19deefb8 100644 (file)
--- 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 53fa54e3fbac6fca71ea6005c10a6fa2e707dd3f..b3bd6263ab39acdddee033053c92f2432e801123 100644 (file)
--- 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 09a2fabd7bb418d7e94f8bea2cac4fb5d9826bfa..950c1a1f2af3731023c302b3ae5758ff876d7dda 100644 (file)
--- 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 bfade187a8b215ff74fb5baecee845149f360528..debf07671f17ed132690b74e3cde2246428889d0 100644 (file)
--- 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 bc9952ae95d9c08d3df61a2bbc8e3ecd4329487f..8ef9ac1afa2db2860d12eec33c68f18581fbeb11 100644 (file)
--- 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 1233c9ad80ac5c76d8d50c7b52a6abfe0f4a1219..461d88bb8d59bf4b4e075ee3383561b84a4b3ae6 100644 (file)
--- 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 b3a0f6e7abab9e6529bfda805f454e737485d30d..9efc4e0ac24e152dfe7eca606fe7f8aa5f4e9c3d 100644 (file)
--- 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 027596438b6a7d61ea31c30facffdb2932bdd9f3..9a83c599744b6b632d95a0e42f607ee15e9a3614 100644 (file)
--- 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 f825f6c6a3de6388959d7b900f31ef9d48e6397b..8c0a4194fd8e186608e98168375ce717a5bf330e 100644 (file)
--- 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 e5f42416f57e87256d3e8e77eb94fa26c384046a..de69f074efceb6869b61b76391b38077d0061662 100644 (file)
--- 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 4abc45ec6e7a0cd60872d840a04d4f2659ca5119..f3a3729e57c5df8189664d4158ad43ad11c8b6e0 100644 (file)
--- 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 50211701b2f3df2c5fd8e919b352b7c967961b3a..b78784b5995c2380be36e23d28e92894ed651ea3 100644 (file)
--- 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 5c4b16119d969d984b3eadba5a8654e1ea2ea690..a6fb2bd4f95aeb14feec9f7c0e80f3a619e073e1 100644 (file)
--- 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 79c5994c43ec2b0b6ae8fee1933b492c9f97a20d..ee5116e49b110d922bd3a12a84ac7c61eaf66c45 100644 (file)
--- 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 07e4cec1c1d6ac99fcc482beedf77914d1d157b7..bba71c6ca45d4ab801bd38c5cf29e782135c4a4a 100644 (file)
--- 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 d583c2338bb1dc0dc96d274d49824d45a3b75c6e..05669bb7df4f2eed850d20227d9b8c1225ecb4de 100644 (file)
--- 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 429c713945dc799011efeaeb68a9670408067430..001c8176433661480cb6408f44b1adaefba4c8f4 100644 (file)
--- 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 96492baaf35ce666c37e31c6a60e8af5a6573333..ac6a03fc5de8c0f0290ea0b621a4caa59bcbaf53 100644 (file)
--- 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 e1b0390c8a0f1c7a76b1f1c4fd26b1d1ae106b4a..f0cd40c9be5fd73f420402144200eebaf7f6f9d0 100644 (file)
--- 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 9b63f517cd77cccd27db0cd4ddcc1dae99c8e082..b915156ab69da3725088f5b4a59ca1f3c96e7234 100644 (file)
--- 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 53a105dfb107e2feab388fbe29729fa210e6306a..9544420bab23bda4d8a742320ec58f56d00a9eca 100644 (file)
--- 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 041cf417723bd848ea56d2c7eb4935943abeeaef..4c94c423a548a8ddec894f1fcef4b28b14a6a003 100644 (file)
--- 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 836babd50845088be08a2061fe39cc6ffd7760cb..d9575d3bfc816237cc85302aa0dcc55ecbec05e4 100644 (file)
--- 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 ef79a2e88d7577dc882fba229d9141a0c55a1549..d322dd478b92aa4ba7bdc9f803531446e3bceb92 100644 (file)
--- 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 a95f234c5e318322a436ad07d74dd78acf169d05..dcd8e2d64bc5c90792627af1e247a5041f6ac798 100644 (file)
--- 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 41b66c519f9509d3837355854be95e8760f79648..a48d869596205508315db808b5895ce7e1223056 100644 (file)
--- 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 c4ab323d488da7dc4e1aa1b6fc05af9e88b4b717..4b77a3d8e739a49793b06773993ba4396b05bb27 100644 (file)
--- 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 a2ee2aca6af8114eadf92539092bcca9bb7d0e09..33770c46d36e0ea772a84abbdda9babb9f271fc3 100644 (file)
--- 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 880d7957dbd4430819c917cb4b6a9533c96d321c..bc23831147d957c548fcfece7b97e3f13f20c7a6 100644 (file)
--- 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 8408034d905c6f20eb375385d638de31a43df0e3..3149e5b42a6a84f84eed1ad603226b0df5b93862 100644 (file)
--- 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 c6eb0b1cad291bce42f3eda474a9a9c62a28c8b3..7d89d112a53d074cf3538cf890062b7afa87278c 100644 (file)
--- 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 afaad951922b0e02a973913327e2d92ee39d2631..946653f62dfa140d9930f74cc3350262b66ba542 100644 (file)
--- 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 71b6664d012d80cb397e524c3370347bb87a3956..91c84775ee0e0993cb64533fe5b9e80c0f17f202 100644 (file)
--- 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"