diff options
-rw-r--r-- | polyp/alsa-util.c | 2 | ||||
-rw-r--r-- | polyp/client-conf.c | 3 | ||||
-rw-r--r-- | polyp/resampler.c | 2 | ||||
-rw-r--r-- | polyp/strlist-test.c | 2 | ||||
-rw-r--r-- | polyp/util.c | 2 |
5 files changed, 4 insertions, 7 deletions
diff --git a/polyp/alsa-util.c b/polyp/alsa-util.c index 52eaaed4..b6b9ac11 100644 --- a/polyp/alsa-util.c +++ b/polyp/alsa-util.c @@ -31,7 +31,7 @@ #include "xmalloc.h" /* Set the hardware parameters of the given ALSA device. Returns the - * selected fragment settings in *period/*period_size */ + * selected fragment settings in *period and *period_size */ int pa_alsa_set_hw_params(snd_pcm_t *pcm_handle, const struct pa_sample_spec *ss, uint32_t *periods, snd_pcm_uframes_t *period_size) { int ret = -1; snd_pcm_uframes_t buffer_size; diff --git a/polyp/client-conf.c b/polyp/client-conf.c index 2de1c57f..21e0acab 100644 --- a/polyp/client-conf.c +++ b/polyp/client-conf.c @@ -59,12 +59,9 @@ static const struct pa_client_conf default_conf = { struct pa_client_conf *pa_client_conf_new(void) { struct pa_client_conf *c = pa_xmemdup(&default_conf, sizeof(default_conf)); - - c->daemon_binary = pa_xstrdup(POLYPAUDIO_BINARY); c->extra_arguments = pa_xstrdup("--log-target=syslog --exit-idle-time=5"); - c->cookie_file = pa_xstrdup(PA_NATIVE_COOKIE_FILE); return c; diff --git a/polyp/resampler.c b/polyp/resampler.c index dbd748f7..377aa797 100644 --- a/polyp/resampler.c +++ b/polyp/resampler.c @@ -397,7 +397,7 @@ static int trivial_init(struct pa_resampler*r) { } const char *pa_resample_method_to_string(enum pa_resample_method m) { - static const char const* resample_methods[] = { + static const char * const resample_methods[] = { "src-sinc-best-quality", "src-sinc-medium-quality", "src-sinc-fastest", diff --git a/polyp/strlist-test.c b/polyp/strlist-test.c index 01dcdf12..b68a0415 100644 --- a/polyp/strlist-test.c +++ b/polyp/strlist-test.c @@ -36,4 +36,6 @@ int main(int argc, char* argv[]) { pa_xfree(t); pa_strlist_free(l); + + return 0; } diff --git a/polyp/util.c b/polyp/util.c index 87beafb3..0b459ddc 100644 --- a/polyp/util.c +++ b/polyp/util.c @@ -225,8 +225,6 @@ char *pa_vsprintf_malloc(const char *format, va_list ap) { for(;;) { int r; - va_list ap; - c = pa_xrealloc(c, size); r = vsnprintf(c, size, format, ap); |