diff options
| author | Dennis Syrovatsky <dennis@tightvnc.com> | 2006-05-22 09:34:50 +0000 |
|---|---|---|
| committer | Dennis Syrovatsky <dennis@tightvnc.com> | 2006-05-22 09:34:50 +0000 |
| commit | bd1379447a2d9fd0e105bbaf5a99dfa2fbfc8982 (patch) | |
| tree | 4feeb32d40d019d3c7c74bb2de79410e4c465d0d /rfb | |
| parent | 068693e42e9f04e2eba3c2eb135daa21fa436dc0 (diff) | |
| download | tigervnc-bd1379447a2d9fd0e105bbaf5a99dfa2fbfc8982.tar.gz tigervnc-bd1379447a2d9fd0e105bbaf5a99dfa2fbfc8982.zip | |
Fixed gcc compile warning.
git-svn-id: svn://svn.code.sf.net/p/tigervnc/code/trunk@576 3789f03b-4d11-0410-bbf8-ca57d06f2519
Diffstat (limited to 'rfb')
| -rw-r--r-- | rfb/SFTMsgReader.cxx | 2 | ||||
| -rw-r--r-- | rfb/SFTMsgReader.h | 2 | ||||
| -rw-r--r-- | rfb/SFileTransfer.cxx | 5 |
3 files changed, 3 insertions, 6 deletions
diff --git a/rfb/SFTMsgReader.cxx b/rfb/SFTMsgReader.cxx index b88467bc..22787bf0 100644 --- a/rfb/SFTMsgReader.cxx +++ b/rfb/SFTMsgReader.cxx @@ -70,7 +70,7 @@ SFTMsgReader::readFileUploadRqst(unsigned int *pFilenameSize, char *pFilename, return readU8U16U32StringMsg(&compressedLevel, pFilenameSize, pPosition, pFilename); } -void * +char * SFTMsgReader::readFileUploadData(unsigned int *pDataSize, unsigned int *pModTime) { unsigned char compressedLevel = m_pIS->readU8(); diff --git a/rfb/SFTMsgReader.h b/rfb/SFTMsgReader.h index dff06a46..32ac8697 100644 --- a/rfb/SFTMsgReader.h +++ b/rfb/SFTMsgReader.h @@ -46,7 +46,7 @@ namespace rfb { bool readFileUploadRqst(unsigned int *pFilenameSize, char *pFilename, unsigned int *pPosition); - void *readFileUploadData(unsigned int *pDataSize, unsigned int *pModTime); + char *readFileUploadData(unsigned int *pDataSize, unsigned int *pModTime); bool readFileCreateDirRqst(unsigned int *pDirNameSize, char *pDirName); diff --git a/rfb/SFileTransfer.cxx b/rfb/SFileTransfer.cxx index 6f444e9b..957e50b2 100644 --- a/rfb/SFileTransfer.cxx +++ b/rfb/SFileTransfer.cxx @@ -174,7 +174,7 @@ SFileTransfer::processFileUploadData() unsigned int dataSize = 0; unsigned int modTime = 0; - void *pUploadData = m_reader.readFileUploadData(&dataSize, &modTime); + char *pUploadData = m_reader.readFileUploadData(&dataSize, &modTime); if (!m_bUploadStarted) { char reason[] = "Upload is impossible"; @@ -200,9 +200,6 @@ SFileTransfer::processFileUploadData() } } } - // FIXME: For the next line, gcc says: - // warning: deleting `void *' is undefined - // Perhaps it should not be `void *' at all. delete [] pUploadData; return true; } |