frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

hw/xwin: Use char strings in winClipboardUNIXtoDOS for consistency with the rest of the clipboard code 

winclipboardxevents.c: In function ‘winClipboardFlushXEvents’:
winclipboardxevents.c:575:13: warning: passing argument 1 of ‘winClipboardUNIXtoDOS’ from incompatible pointer type
winclipboard.h:102:2: note: expected ‘unsigned char **’ but argument is of type ‘char **’

Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
This commit is contained in:
Jon TURNEY 2012-10-11 16:20:35 +01:00
parent fa36a7cd48
commit 13fb6b36b8
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hw/xwin/winclipboard.h
View File

@ -99,7 +99,7 @@ void
winClipboardDOStoUNIX(char *pszData, int iLength); winClipboardDOStoUNIX(char *pszData, int iLength);
void void
winClipboardUNIXtoDOS(unsigned char **ppszData, int iLength); winClipboardUNIXtoDOS(char **ppszData, int iLength);
/* /*
* winclipboardthread.c * winclipboardthread.c

10
hw/xwin/winclipboardtextconv.c
View File

@ -38,7 +38,7 @@
void void
winClipboardDOStoUNIX(char *pszSrc, int iLength); winClipboardDOStoUNIX(char *pszSrc, int iLength);
void void
winClipboardUNIXtoDOS(unsigned char **ppszData, int iLength); winClipboardUNIXtoDOS(char **ppszData, int iLength);
/* /*
* Convert \r\n to \n * Convert \r\n to \n
@ -75,12 +75,12 @@ winClipboardDOStoUNIX(char *pszSrc, int iLength)
*/ */
void void
winClipboardUNIXtoDOS(unsigned char **ppszData, int iLength) winClipboardUNIXtoDOS(char **ppszData, int iLength)
{ {
int iNewlineCount = 0; int iNewlineCount = 0;
unsigned char *pszSrc = *ppszData; char *pszSrc = *ppszData;
unsigned char *pszEnd = pszSrc + iLength; char *pszEnd = pszSrc + iLength;
unsigned char *pszDest = NULL, *pszDestBegin = NULL; char *pszDest = NULL, *pszDestBegin = NULL;
winDebug("UNIXtoDOS () - Original data:'%s'\n", *ppszData); winDebug("UNIXtoDOS () - Original data:'%s'\n", *ppszData);