kolan/CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

COMP: Fix warning on sun

Browse Source
This commit is contained in:
Andy Cedilnik 2005-12-30 16:28:30 -05:00
parent 2c30cb64b1
commit 6534e66e61
1 changed files with 23 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
Source/cmSystemTools.cxx
View File

@ -1370,13 +1370,16 @@ bool cmSystemTools::IsPathToFramework(const char* path)
struct cmSystemToolsGZStruct struct cmSystemToolsGZStruct
{ {
gzFile GZFile; gzFile GZFile;
static int Open(void* call_data, const char *pathname, int oflags, mode_t mode);
static int Close(void* call_data);
static ssize_t Read(void* call_data, void* buf, size_t count);
static ssize_t Write(void* call_data, const void* buf, size_t count);
}; };
int cmSystemToolsGZStruct::Open(void* call_data, const char *pathname, int oflags, mode_t mode) extern "C" {
static int cmSystemToolsGZStructOpen(void* call_data, const char *pathname, int oflags, mode_t mode);
static int cmSystemToolsGZStructClose(void* call_data);
static ssize_t cmSystemToolsGZStructRead(void* call_data, void* buf, size_t count);
static ssize_t cmSystemToolsGZStructWrite(void* call_data, const void* buf, size_t count);
}
int cmSystemToolsGZStructOpen(void* call_data, const char *pathname, int oflags, mode_t mode)
{ {
const char *gzoflags; const char *gzoflags;
int fd; int fd;
@ -1420,19 +1423,19 @@ int cmSystemToolsGZStruct::Open(void* call_data, const char *pathname, int oflag
return fd; return fd;
} }
int cmSystemToolsGZStruct::Close(void* call_data) int cmSystemToolsGZStructClose(void* call_data)
{ {
cmSystemToolsGZStruct* gzf = static_cast<cmSystemToolsGZStruct*>(call_data); cmSystemToolsGZStruct* gzf = static_cast<cmSystemToolsGZStruct*>(call_data);
return cm_zlib_gzclose(gzf->GZFile); return cm_zlib_gzclose(gzf->GZFile);
} }
ssize_t cmSystemToolsGZStruct::Read(void* call_data, void* buf, size_t count) ssize_t cmSystemToolsGZStructRead(void* call_data, void* buf, size_t count)
{ {
cmSystemToolsGZStruct* gzf = static_cast<cmSystemToolsGZStruct*>(call_data); cmSystemToolsGZStruct* gzf = static_cast<cmSystemToolsGZStruct*>(call_data);
return cm_zlib_gzread(gzf->GZFile, buf, count); return cm_zlib_gzread(gzf->GZFile, buf, count);
} }
ssize_t cmSystemToolsGZStruct::Write(void* call_data, const void* buf, size_t count) ssize_t cmSystemToolsGZStructWrite(void* call_data, const void* buf, size_t count)
{ {
cmSystemToolsGZStruct* gzf = static_cast<cmSystemToolsGZStruct*>(call_data); cmSystemToolsGZStruct* gzf = static_cast<cmSystemToolsGZStruct*>(call_data);
return cm_zlib_gzwrite(gzf->GZFile, (void*)buf, count); return cm_zlib_gzwrite(gzf->GZFile, (void*)buf, count);
@ -1449,10 +1452,10 @@ bool cmSystemTools::CreateTar(const char* outFileName, const std::vector<cmStdSt
cmSystemToolsGZStruct gzs; cmSystemToolsGZStruct gzs;
tartype_t gztype = { tartype_t gztype = {
(openfunc_t)cmSystemToolsGZStruct::Open, (openfunc_t)cmSystemToolsGZStructOpen,
(closefunc_t)cmSystemToolsGZStruct::Close, (closefunc_t)cmSystemToolsGZStructClose,
(readfunc_t)cmSystemToolsGZStruct::Read, (readfunc_t)cmSystemToolsGZStructRead,
(writefunc_t)cmSystemToolsGZStruct::Write, (writefunc_t)cmSystemToolsGZStructWrite,
&gzs &gzs
}; };
@ -1514,10 +1517,10 @@ bool cmSystemTools::ExtractTar(const char* outFileName, const std::vector<cmStdS
cmSystemToolsGZStruct gzs; cmSystemToolsGZStruct gzs;
tartype_t gztype = { tartype_t gztype = {
cmSystemToolsGZStruct::Open, cmSystemToolsGZStructOpen,
cmSystemToolsGZStruct::Close, cmSystemToolsGZStructClose,
cmSystemToolsGZStruct::Read, cmSystemToolsGZStructRead,
cmSystemToolsGZStruct::Write, cmSystemToolsGZStructWrite,
&gzs &gzs
}; };
@ -1563,10 +1566,10 @@ bool cmSystemTools::ListTar(const char* outFileName, std::vector<cmStdString>& f
cmSystemToolsGZStruct gzs; cmSystemToolsGZStruct gzs;
tartype_t gztype = { tartype_t gztype = {
cmSystemToolsGZStruct::Open, cmSystemToolsGZStructOpen,
cmSystemToolsGZStruct::Close, cmSystemToolsGZStructClose,
cmSystemToolsGZStruct::Read, cmSystemToolsGZStructRead,
cmSystemToolsGZStruct::Write, cmSystemToolsGZStructWrite,
&gzs &gzs
}; };