CVS: rdesktop rdpsnd_alsa.c, 1.13, 1.14 rdpsnd_libao.c, 1.34, 1.35 rdpsnd_oss.c, 1.33, 1.34 rdpsnd_sgi.c, 1.20, 1.21 rdpsnd_sun.c, 1.27, 1.28

Update of /cvsroot/rdesktop/rdesktop
In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv26811

Modified Files:
	rdpsnd_alsa.c rdpsnd_libao.c rdpsnd_oss.c rdpsnd_sgi.c 
	rdpsnd_sun.c 
Log Message:
Fix audio_driver initialisation to avoid problem with uninitialised
variables and reduce the memory leakage.


Index: rdpsnd_alsa.c
===================================================================
RCS file: /cvsroot/rdesktop/rdesktop/rdpsnd_alsa.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** rdpsnd_alsa.c	24 Dec 2006 13:52:08 -0000	1.13
--- rdpsnd_alsa.c	2 Jan 2007 11:39:56 -0000	1.14
***************
*** 343,348 ****
  	static struct audio_driver alsa_driver;
  
! 	alsa_driver.name = xstrdup("alsa");
! 	alsa_driver.description = xstrdup("ALSA output driver, default device: " DEFAULTDEVICE);
  
  	alsa_driver.add_fds = alsa_add_fds;
--- 343,350 ----
  	static struct audio_driver alsa_driver;
  
! 	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;
***************
*** 364,368 ****
  	else
  	{
! 		pcm_name = xstrdup(DEFAULTDEVICE);
  	}
  
--- 366,370 ----
  	else
  	{
! 		pcm_name = DEFAULTDEVICE;
  	}
  

Index: rdpsnd_libao.c
===================================================================
RCS file: /cvsroot/rdesktop/rdesktop/rdpsnd_libao.c,v
retrieving revision 1.34
retrieving revision 1.35
diff -C2 -d -r1.34 -r1.35
*** rdpsnd_libao.c	24 Dec 2006 15:23:00 -0000	1.34
--- rdpsnd_libao.c	2 Jan 2007 11:39:56 -0000	1.35
***************
*** 199,204 ****
  	static struct audio_driver libao_driver;
  
! 	libao_driver.name = xstrdup("libao");
! 	libao_driver.description = xstrdup("libao output driver, default device: system dependent");
  
  	libao_driver.add_fds = libao_add_fds;
--- 199,206 ----
  	static struct audio_driver libao_driver;
  
! 	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;

Index: rdpsnd_oss.c
===================================================================
RCS file: /cvsroot/rdesktop/rdesktop/rdpsnd_oss.c,v
retrieving revision 1.33
retrieving revision 1.34
diff -C2 -d -r1.33 -r1.34
*** rdpsnd_oss.c	24 Dec 2006 13:52:08 -0000	1.33
--- rdpsnd_oss.c	2 Jan 2007 11:39:56 -0000	1.34
***************
*** 320,326 ****
  oss_register(char *options)
  {
! 	oss_driver.name = xstrdup("oss");
  	oss_driver.description =
! 		xstrdup("OSS output driver, default device: " DEFAULTDEVICE " or $AUDIODEV");
  
  	oss_driver.add_fds = oss_add_fds;
--- 320,328 ----
  oss_register(char *options)
  {
! 	memset(&oss_driver, 0, sizeof(oss_driver));
! 
! 	oss_driver.name = "oss";
  	oss_driver.description =
! 		"OSS output driver, default device: " DEFAULTDEVICE " or $AUDIODEV";
  
  	oss_driver.add_fds = oss_add_fds;
***************
*** 346,350 ****
  		if (dsp_dev == NULL)
  		{
! 			dsp_dev = xstrdup(DEFAULTDEVICE);
  		}
  	}
--- 348,352 ----
  		if (dsp_dev == NULL)
  		{
! 			dsp_dev = DEFAULTDEVICE;
  		}
  	}

Index: rdpsnd_sgi.c
===================================================================
RCS file: /cvsroot/rdesktop/rdesktop/rdpsnd_sgi.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** rdpsnd_sgi.c	24 Dec 2006 15:24:17 -0000	1.20
--- rdpsnd_sgi.c	2 Jan 2007 11:39:56 -0000	1.21
***************
*** 295,300 ****
  	static struct audio_driver sgi_driver;
  
! 	sgi_driver.name = xstrdup("sgi");
! 	sgi_driver.description = xstrdup("SGI output driver");
  
  	sgi_driver.add_fds = sgi_add_fds;
--- 295,302 ----
  	static struct audio_driver sgi_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;

Index: rdpsnd_sun.c
===================================================================
RCS file: /cvsroot/rdesktop/rdesktop/rdpsnd_sun.c,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -d -r1.27 -r1.28
*** rdpsnd_sun.c	24 Dec 2006 13:52:08 -0000	1.27
--- rdpsnd_sun.c	2 Jan 2007 11:39:56 -0000	1.28
***************
*** 270,276 ****
  	static struct audio_driver sun_driver;
  
! 	sun_driver.name = xstrdup("sun");
  	sun_driver.description =
! 		xstrdup("SUN/BSD output driver, default device: " DEFAULTDEVICE " or $AUDIODEV");
  
  	sun_driver.add_fds = sun_add_fds;
--- 270,278 ----
  	static struct audio_driver sun_driver;
  
! 	memset(&sun_driver, 0, sizeof(sun_driver));
! 
! 	sun_driver.name = "sun";
  	sun_driver.description =
! 		"SUN/BSD output driver, default device: " DEFAULTDEVICE " or $AUDIODEV";
  
  	sun_driver.add_fds = sun_add_fds;
***************
*** 296,300 ****
  		if (dsp_dev == NULL)
  		{
! 			dsp_dev = xstrdup(DEFAULTDEVICE);
  		}
  	}
--- 298,302 ----
  		if (dsp_dev == NULL)
  		{
! 			dsp_dev = DEFAULTDEVICE;
  		}
  	}


-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys - and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV