CVS: rdesktop disk.c,1.54,1.55

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

Modified Files:
	disk.c 
Log Message:
changed to compile with g++

Index: disk.c
===================================================================
RCS file: /cvsroot/rdesktop/rdesktop/disk.c,v
retrieving revision 1.54
retrieving revision 1.55
diff -C2 -d -r1.54 -r1.55
*** disk.c	31 Aug 2005 13:00:57 -0000	1.54
--- disk.c	22 Sep 2005 00:16:31 -0000	1.55
***************
*** 202,206 ****
  	int ret;
  	off_t pos;
! 	static const char zero;
  
  	/* Try the simple method first */
--- 202,206 ----
  	int ret;
  	off_t pos;
! 	static const char zero = 0;
  
  	/* Try the simple method first */
***************
*** 210,214 ****
  	}
  
! 	/* 
  	 * Some kind of error. Perhaps we were trying to grow. Retry
  	 * in a safe way.
--- 210,214 ----
  	}
  
! 	/*
  	 * Some kind of error. Perhaps we were trying to grow. Retry
  	 * in a safe way.
***************
*** 326,330 ****
  				g_rdpdr_device[*id].name);
  
! 		g_rdpdr_device[*id].local_path = xmalloc(strlen(pos2) + 1);
  		strcpy(g_rdpdr_device[*id].local_path, pos2);
  		g_rdpdr_device[*id].device_type = DEVICE_TYPE_DISK;
--- 326,330 ----
  				g_rdpdr_device[*id].name);
  
! 		g_rdpdr_device[*id].local_path = (char *) xmalloc(strlen(pos2) + 1);
  		strcpy(g_rdpdr_device[*id].local_path, pos2);
  		g_rdpdr_device[*id].device_type = DEVICE_TYPE_DISK;
***************
*** 961,965 ****
  			continue;
  		p->num_entries++;
! 		fullname = xmalloc(strlen(pfinfo->path) + strlen(dp->d_name) + 2);
  		sprintf(fullname, "%s/%s", pfinfo->path, dp->d_name);
  
--- 961,965 ----
  			continue;
  		p->num_entries++;
! 		fullname = (char *) xmalloc(strlen(pfinfo->path) + strlen(dp->d_name) + 2);
  		sprintf(fullname, "%s/%s", pfinfo->path, dp->d_name);
  



-------------------------------------------------------
SF.Net email is sponsored by:
Tame your development challenges with Apache's Geronimo App Server. Download
it for free - -and be entered to win a 42" plasma tv or your very own
Sony(tm)PSP.  Click here to play: http://sourceforge.net/geronimo.php