client: combine client_open() and client_parse_config()

[paraslash.git] / alsa_write.c

diff --git a/alsa_write.c b/alsa_write.c
index c104a5d5352ce35287e6ec8f167d24951890e166..7c090c899915cf454abad3c459dc45f0973239f8 100644 (file)
--- a/alsa_write.c
+++ b/alsa_write.c
@@ -170,7 +170,7 @@ static int alsa_write_pre_select(struct sched *s, struct writer_node *wn)
 static int alsa_write_post_select(__a_unused struct sched *s,
                struct writer_node *wn)
 {
-       struct private_alsa__write_data *pad = wn->private_data;
+       struct private_alsa_write_data *pad = wn->private_data;
        struct writer_node_group *wng = wn->wng;
        size_t frames = (*wng->loaded - wn->written) / pad->bytes_per_frame;
        snd_pcm_sframes_t ret;
@@ -212,11 +212,11 @@ static void alsa_close(struct writer_node *wn)
        free(pad);
 }
 
-__malloc void *alsa_parse_config(char *options)
+__malloc static void *alsa_parse_config(const char *options)
 {
        struct alsa_write_args_info *conf
                = para_calloc(sizeof(struct alsa_write_args_info));
-       PARA_INFO_LOG("options: %s, %d\n", options, strcspn(options, " \t"));
+       PARA_INFO_LOG("options: %s, %zd\n", options, strcspn(options, " \t"));
        int ret = alsa_cmdline_parser_string(options, conf, "alsa_write");
        if (ret)
                goto err_out;