CVS: rdesktop rdp.c,1.84,1.85

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

Modified Files:
	rdp.c 
Log Message:
C error/warning fixes from Jeremy Meng <[email protected]>


Index: rdp.c
===================================================================
RCS file: /cvsroot/rdesktop/rdesktop/rdp.c,v
retrieving revision 1.84
retrieving revision 1.85
diff -C2 -d -r1.84 -r1.85
*** rdp.c	15 Mar 2005 11:25:49 -0000	1.84
--- rdp.c	19 Mar 2005 15:30:14 -0000	1.85
***************
*** 162,166 ****
  	size_t ibl = strlen(string), obl = len + 2;
  	static iconv_t iconv_h = (iconv_t) - 1;
! 	char *pin = string, *pout = s->p;
  
  	memset(pout, 0, len + 4);
--- 162,166 ----
  	size_t ibl = strlen(string), obl = len + 2;
  	static iconv_t iconv_h = (iconv_t) - 1;
! 	char *pin = string, *pout = (char *)s->p;
  
  	memset(pout, 0, len + 4);
***************
*** 177,181 ****
  
  				g_iconv_works = False;
! 				return (rdp_out_unistr(s, string, len));
  			}
  			if (iconv(iconv_h, (ICONV_CONST char **) &pin, &i, &pout, &o) ==
--- 177,182 ----
  
  				g_iconv_works = False;
! 				rdp_out_unistr(s, string, len);
! 				return;
  			}
  			if (iconv(iconv_h, (ICONV_CONST char **) &pin, &i, &pout, &o) ==
***************
*** 187,191 ****
  
  				g_iconv_works = False;
! 				return (rdp_out_unistr(s, string, len));
  			}
  			pin = string;
--- 188,193 ----
  
  				g_iconv_works = False;
! 				rdp_out_unistr(s, string, len);
! 				return;
  			}
  			pin = string;
***************
*** 200,204 ****
  
  			g_iconv_works = False;
! 			return (rdp_out_unistr(s, string, len));
  		}
  
--- 202,207 ----
  
  			g_iconv_works = False;
! 			rdp_out_unistr(s, string, len);
! 			return;
  		}
  
***************
*** 232,236 ****
  #ifdef HAVE_ICONV
  	size_t ibl = uni_len, obl = uni_len;
! 	char *pin = s->p, *pout = string;
  	static iconv_t iconv_h = (iconv_t) - 1;
  
--- 235,239 ----
  #ifdef HAVE_ICONV
  	size_t ibl = uni_len, obl = uni_len;
! 	char *pin = (char *)s->p, *pout = string;
  	static iconv_t iconv_h = (iconv_t) - 1;
  



-------------------------------------------------------
SF email is sponsored by - The IT Product Guide
Read honest & candid reviews on hundreds of IT Products from real users.
Discover which products truly live up to the hype. Start reading now.
http://ads.osdn.com/?ad_id=6595&alloc_id=14396&op=click