Remove ->init() of struct receiver.

The previous patch removed the ->init() method of the afh receiver.
Since the afh receiver was the only receiver that defined an init
method, the method can now be removed from struct receiver.

As a consequence, recv_init(), which calls each receiver's init method
has become a no-op and can also be removed.

diff --git a/afh_recv.c b/afh_recv.c
index e5e87bddbc798b7dc5af2b40b2de8df4602ba58f..4f8ff4974f018ef92e5055ac7a28bf337e3aa301 100644 (file)
--- a/afh_recv.c
+++ b/afh_recv.c
@@ -238,7 +238,6 @@ out:
        return ret;
 }
 
-/** See \ref recv_init(). */
 const struct receiver lsg_recv_cmd_com_afh_user_data = {
        .open = afh_recv_open,
        .close = afh_recv_close,

diff --git a/audiod.c b/audiod.c
index b93f29de4498c50f574e55c4c8b3e9a34dfe0aee..a5a774376b37c50eba92a76a02b1389bd6df67f4 100644 (file)
--- a/audiod.c
+++ b/audiod.c
@@ -1451,7 +1451,6 @@ int main(int argc, char *argv[])
        parse_config_or_die();
        crypt_init();
        daemon_set_priority(OPT_UINT32_VAL(PRIORITY));
-       recv_init();
        if (daemon_init_colors_or_die(OPT_UINT32_VAL(COLOR), COLOR_AUTO,
                        COLOR_NO, OPT_GIVEN(LOGFILE))) {
                for (i = 0; i < OPT_GIVEN(LOG_COLOR); i++)

diff --git a/dccp_recv.c b/dccp_recv.c
index 8a08504a8930de6a0f3f3a89969357eadf6a7c9f..639c93fcbf99bc93ddc054ad43d03f30811270ac 100644 (file)
--- a/dccp_recv.c
+++ b/dccp_recv.c
@@ -151,7 +151,6 @@ out:
        return ret;
 }
 
-/** See \ref recv_init(). */
 const struct receiver lsg_recv_cmd_com_dccp_user_data = {
        .open = dccp_recv_open,
        .close = dccp_recv_close,

diff --git a/http_recv.c b/http_recv.c
index 3a723299e78b241a9ac4f44a13caf91651f36b6a..1fb60bad810d86dbbb0098a3714c2caa3d9e835b 100644 (file)
--- a/http_recv.c
+++ b/http_recv.c
@@ -167,7 +167,6 @@ static int http_recv_open(struct receiver_node *rn)
        return 1;
 }
 
-/** See \ref recv_init(). */
 const struct receiver lsg_recv_cmd_com_http_user_data = {
        .open = http_recv_open,
        .close = http_recv_close,

diff --git a/play.c b/play.c
index c860208caff9411ac830dc976f5f5985ac9d96ea..86edc4d4e4f47bc1bd38197ed5982e97df9f72cf 100644 (file)
--- a/play.c
+++ b/play.c
@@ -1238,9 +1238,6 @@ int main(int argc, char *argv[])
        int ret;
        unsigned num_inputs;
 
-       /* needed this early to make help work */
-       recv_init();
-
        sched.default_timeout.tv_sec = 5;
        parse_config_or_die(argc, argv);
        session_open();

diff --git a/recv.c b/recv.c
index 7b46d78cac4602b1032508818c710fbcd2b0cc98..10d55d218071ccf6a314fc87d4e5f78001012db4 100644 (file)
--- a/recv.c
+++ b/recv.c
@@ -79,7 +79,6 @@ int main(int argc, char *argv[])
        loglevel = OPT_UINT32_VAL(LOGLEVEL, lpr);
        version_handle_flag("recv", OPT_GIVEN(VERSION, lpr));
        handle_help_flag(lpr);
-       recv_init();
        memset(&rn, 0, sizeof(struct receiver_node));
        ret = check_receiver_arg(OPT_STRING_VAL(RECEIVER, lpr), &receiver_lpr);
        if (ret < 0)

diff --git a/recv.h b/recv.h
index f88ebd84897a89df5b748ab86acb399c37917e0a..36b0f1db62e348c9ab7ccdfc3b32ba656d698c5f 100644 (file)
--- a/recv.h
+++ b/recv.h
@@ -39,12 +39,6 @@ struct receiver_node {
  * \sa \ref http_recv.c, \ref udp_recv.c.
  */
 struct receiver {
-       /**
-        * The optional receiver init function.
-        *
-        * Performs any initialization needed before the receiver can be opened.
-        */
-       void (*init)(void);
        /**
         * Open one instance of the receiver.
         *
@@ -114,7 +108,6 @@ struct receiver {
 /** Iterate over all available receivers. */
 #define FOR_EACH_RECEIVER(i) for (i = 1; lls_cmd(i, recv_cmd_suite); i++)
 
-void recv_init(void);
 int check_receiver_arg(const char *ra, struct lls_parse_result **lprp);
 void print_receiver_helps(bool detailed);
 int generic_recv_pre_select(struct sched *s, struct receiver_node *rn);

diff --git a/recv_common.c b/recv_common.c
index 948de4745dda8c62bce88f31ec8362650ae85de0..31fd81f1ec52c3d0b6204e8b3663a7d36e14fbb3 100644 (file)
--- a/recv_common.c
+++ b/recv_common.c
@@ -15,27 +15,6 @@
 #include "recv.h"
 #include "string.h"
 
-/**
- * Call the init function of each paraslash receiver.
- *
- * Receivers employ the user_data feature of the lopsub library: Each receiver
- * of the recv_cmd suite defines a struct receiver as its user data.
- * recv_init() obtains a pointer to this structure by calling lls_user_data().
- * If the receiver has an init function (i.e., if ->init is not NULL), ->init()
- * is called to initialize the receiver.
- */
-void recv_init(void)
-{
-       int i;
-
-       FOR_EACH_RECEIVER(i) {
-               const struct lls_command *cmd = RECV_CMD(i);
-               const struct receiver *r = lls_user_data(cmd);
-               if (r && r->init)
-                       r->init();
-       }
-}
-
 /**
  * Check if the given string is a valid receiver specifier.
  *

diff --git a/udp_recv.c b/udp_recv.c
index 67846b141926e80baba083edda9177fa8b3b6acf..58d45ab43d6508619d34186b3f4a23f6d455ecc7 100644 (file)
--- a/udp_recv.c
+++ b/udp_recv.c
@@ -186,7 +186,6 @@ err:
        return ret;
 }
 
-/** See \ref recv_init(). */
 const struct receiver lsg_recv_cmd_com_udp_user_data = {
        .open = udp_recv_open,
        .close = udp_recv_close,