FGFS-4.1/simgear
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix some signed/unsigned comparisoms.

Browse Source
This commit is contained in:
James Turner 2013-02-28 19:45:19 +00:00
parent 06b089ba13
commit ad7d6624de
4 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
simgear/io/HTTPClient.cxx
View File

@ -338,7 +338,7 @@ public:
}
char flags = zlibInflateBuffer[3];
int gzipHeaderSize = GZIP_HEADER_SIZE;
unsigned int gzipHeaderSize = GZIP_HEADER_SIZE;
if (flags & GZIP_HEADER_FEXTRA) {
gzipHeaderSize += 2;
if (zlib.avail_in < gzipHeaderSize) {

5
simgear/package/Catalog.cxx
View File

@ -238,11 +238,12 @@ void Catalog::writeTimestamp()
f << m_retrievedTime << std::endl;
}
int Catalog::ageInSeconds() const
unsigned int Catalog::ageInSeconds() const
{
time_t now;
time(&now);
return ::difftime(now, m_retrievedTime);
int diff = ::difftime(now, m_retrievedTime);
return (diff < 0) ? 0 : diff;
}
std::string Catalog::getLocalisedString(const SGPropertyNode* aRoot, const char* aName) const

2
simgear/package/Catalog.hxx
View File

@ -64,7 +64,7 @@ public:
Package* getPackageById(const std::string& aId) const;
int ageInSeconds() const;
unsigned int ageInSeconds() const;
private:
Catalog(Root* aRoot);

4
simgear/package/Install.cxx
View File

@ -119,8 +119,8 @@ private:
unz_file_info fileInfo;
unzGetCurrentFileInfo(zip, &fileInfo,
buffer, bufferSize,
NULL, NULL, /* extra field */
NULL, NULL /* comment field */);
NULL, 0, /* extra field */
NULL, 0 /* comment field */);
std::string name(buffer);
// no absolute paths, no 'up' traversals