]> git.tuebingen.mpg.de Git - paraslash.git/commitdiff
Merge ../paraslash.fml/paraslash
authorAndre Noll <maan@systemlinux.org>
Tue, 30 Jan 2007 18:31:33 +0000 (19:31 +0100)
committerAndre Noll <maan@systemlinux.org>
Tue, 30 Jan 2007 18:31:33 +0000 (19:31 +0100)
1  2 
alsa_write.c

diff --combined alsa_write.c
index 793d16b65a6e2006a4eb1f0b8018d9eb35ca53a8,705713b94e1d8acd1e2e21bf0e7520c6e155a9b0..7c090c899915cf454abad3c459dc45f0973239f8
@@@ -212,11 -212,11 +212,11 @@@ static void alsa_close(struct writer_no
        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;