diff --git a/rdpsnd_alsa.c b/rdpsnd_alsa.c index da3fc42..69f8f78 100644 --- a/rdpsnd_alsa.c +++ b/rdpsnd_alsa.c @@ -342,8 +342,10 @@ alsa_register(char *options) { static struct audio_driver alsa_driver; - alsa_driver.name = xstrdup("alsa"); - alsa_driver.description = xstrdup("ALSA output driver, default device: " DEFAULTDEVICE); + memset(&alsa_driver, 0, sizeof(alsa_driver)); + + alsa_driver.name = "alsa"; + alsa_driver.description = "ALSA output driver, default device: " DEFAULTDEVICE; alsa_driver.add_fds = alsa_add_fds; alsa_driver.check_fds = alsa_check_fds; @@ -363,7 +365,7 @@ alsa_register(char *options) } else { - pcm_name = xstrdup(DEFAULTDEVICE); + pcm_name = DEFAULTDEVICE; } return &alsa_driver; diff --git a/rdpsnd_libao.c b/rdpsnd_libao.c index 528a2fb..830adaa 100644 --- a/rdpsnd_libao.c +++ b/rdpsnd_libao.c @@ -198,8 +198,10 @@ libao_register(char *options) { static struct audio_driver libao_driver; - libao_driver.name = xstrdup("libao"); - libao_driver.description = xstrdup("libao output driver, default device: system dependent"); + memset(&libao_driver, 0, sizeof(libao_driver)); + + libao_driver.name = "libao"; + libao_driver.description = "libao output driver, default device: system dependent"; libao_driver.add_fds = libao_add_fds; libao_driver.check_fds = libao_check_fds; diff --git a/rdpsnd_oss.c b/rdpsnd_oss.c index a54d5de..2659a5a 100644 --- a/rdpsnd_oss.c +++ b/rdpsnd_oss.c @@ -319,9 +319,11 @@ oss_play(void) struct audio_driver * oss_register(char *options) { - oss_driver.name = xstrdup("oss"); + memset(&oss_driver, 0, sizeof(oss_driver)); + + oss_driver.name = "oss"; oss_driver.description = - xstrdup("OSS output driver, default device: " DEFAULTDEVICE " or $AUDIODEV"); + "OSS output driver, default device: " DEFAULTDEVICE " or $AUDIODEV"; oss_driver.add_fds = oss_add_fds; oss_driver.check_fds = oss_check_fds; @@ -345,7 +347,7 @@ oss_register(char *options) if (dsp_dev == NULL) { - dsp_dev = xstrdup(DEFAULTDEVICE); + dsp_dev = DEFAULTDEVICE; } } diff --git a/rdpsnd_sgi.c b/rdpsnd_sgi.c index a0b864f..1015eeb 100644 --- a/rdpsnd_sgi.c +++ b/rdpsnd_sgi.c @@ -294,8 +294,10 @@ sgi_register(char *options) { static struct audio_driver sgi_driver; - sgi_driver.name = xstrdup("sgi"); - sgi_driver.description = xstrdup("SGI output driver"); + memset(&sgi_driver, 0, sizeof(sgi_driver)); + + sgi_driver.name = "sgi"; + sgi_driver.description = "SGI output driver"; sgi_driver.add_fds = sgi_add_fds; sgi_driver.check_fds = sgi_check_fds; diff --git a/rdpsnd_sun.c b/rdpsnd_sun.c index f582dd0..fa0afaa 100644 --- a/rdpsnd_sun.c +++ b/rdpsnd_sun.c @@ -269,9 +269,11 @@ sun_register(char *options) { static struct audio_driver sun_driver; - sun_driver.name = xstrdup("sun"); + memset(&sun_driver, 0, sizeof(sun_driver)); + + sun_driver.name = "sun"; sun_driver.description = - xstrdup("SUN/BSD output driver, default device: " DEFAULTDEVICE " or $AUDIODEV"); + "SUN/BSD output driver, default device: " DEFAULTDEVICE " or $AUDIODEV"; sun_driver.add_fds = sun_add_fds; sun_driver.check_fds = sun_check_fds; @@ -295,7 +297,7 @@ sun_register(char *options) if (dsp_dev == NULL) { - dsp_dev = xstrdup(DEFAULTDEVICE); + dsp_dev = DEFAULTDEVICE; } }