CVS: rdesktop xclip.c,1.39,1.40 xwin.c,1.207,1.208

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

Modified Files:
	xclip.c xwin.c 
Log Message:
Compile fixes for GCC 2.96. Fixes 1444824.

Index: xclip.c
===================================================================
RCS file: /cvsroot/rdesktop/rdesktop/xclip.c,v
retrieving revision 1.39
retrieving revision 1.40
diff -C2 -d -r1.39 -r1.40
*** xclip.c	28 Mar 2006 14:46:47 -0000	1.39
--- xclip.c	9 Apr 2006 20:11:42 -0000	1.40
***************
*** 158,161 ****
--- 158,162 ----
  	uint8 *result;
  	uint16 *inptr, *outptr;
+ 	Bool swap_endianess;
  
  	/* Worst case: Every char is LF */
***************
*** 168,172 ****
  
  	/* Check for a reversed BOM */
! 	Bool swap_endianess = (*inptr == 0xfffe);
  
  	while ((uint8 *) inptr < data + *size)
--- 169,173 ----
  
  	/* Check for a reversed BOM */
! 	swap_endianess = (*inptr == 0xfffe);
  
  	while ((uint8 *) inptr < data + *size)
***************
*** 293,296 ****
--- 294,307 ----
  	    target == format_unicode_atom || target == format_utf8_string_atom)
  	{
+ 		size_t unicode_buffer_size;
+ 		char *unicode_buffer;
+ 		iconv_t cd;
+ 		size_t unicode_buffer_size_remaining;
+ 		char *unicode_buffer_remaining;
+ 		char *data_remaining;
+ 		size_t data_size_remaining;
+ 		uint32 translated_data_size;
+ 		uint8 *translated_data;
+ 
  		if (rdp_clipboard_request_format != RDP_CF_TEXT)
  			return False;
***************
*** 301,308 ****
  		   WinNT versions are Unicode-minded).
  		 */
- 		size_t unicode_buffer_size;
- 		char *unicode_buffer;
- 		iconv_t cd;
- 
  		if (target == format_string_atom)
  		{
--- 312,315 ----
***************
*** 343,350 ****
  
  		unicode_buffer = xmalloc(unicode_buffer_size);
! 		size_t unicode_buffer_size_remaining = unicode_buffer_size;
! 		char *unicode_buffer_remaining = unicode_buffer;
! 		char *data_remaining = (char *) source;
! 		size_t data_size_remaining = source_size;
  		iconv(cd, (ICONV_CONST char **) &data_remaining, &data_size_remaining,
  		      &unicode_buffer_remaining, &unicode_buffer_size_remaining);
--- 350,357 ----
  
  		unicode_buffer = xmalloc(unicode_buffer_size);
! 		unicode_buffer_size_remaining = unicode_buffer_size;
! 		unicode_buffer_remaining = unicode_buffer;
! 		data_remaining = (char *) source;
! 		data_size_remaining = source_size;
  		iconv(cd, (ICONV_CONST char **) &data_remaining, &data_size_remaining,
  		      &unicode_buffer_remaining, &unicode_buffer_size_remaining);
***************
*** 352,358 ****
  
  		/* translate linebreaks */
! 		uint32 translated_data_size = unicode_buffer_size - unicode_buffer_size_remaining;
! 		uint8 *translated_data =
! 			utf16_lf2crlf((uint8 *) unicode_buffer, &translated_data_size);
  		if (translated_data != NULL)
  		{
--- 359,364 ----
  
  		/* translate linebreaks */
! 		translated_data_size = unicode_buffer_size - unicode_buffer_size_remaining;
! 		translated_data = utf16_lf2crlf((uint8 *) unicode_buffer, &translated_data_size);
  		if (translated_data != NULL)
  		{

Index: xwin.c
===================================================================
RCS file: /cvsroot/rdesktop/rdesktop/xwin.c,v
retrieving revision 1.207
retrieving revision 1.208
diff -C2 -d -r1.207 -r1.208
*** xwin.c	28 Mar 2006 13:56:08 -0000	1.207
--- xwin.c	9 Apr 2006 20:11:42 -0000	1.208
***************
*** 1345,1348 ****
--- 1345,1350 ----
  		{
  			XVisualInfo *visual_info = &vmatches[i];
+ 			BOOL can_translate_to_bpp = False;
+ 			int j;
  
  			/* Try to find a no-translation visual that'll
***************
*** 1388,1393 ****
  			/* Only care for visuals, for whose BPPs (not depths!)
  			   we have a translateXtoY function. */
- 			BOOL can_translate_to_bpp = False;
- 			int j;
  			for (j = 0; j < pixmap_formats_count; ++j)
  			{
--- 1390,1393 ----



-------------------------------------------------------
This SF.Net email is sponsored by xPML, a groundbreaking scripting language
that extends applications into web and mobile media. Attend the live webcast
and join the prime developer group breaking into this new coding territory!
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=110944&bid=241720&dat=121642