anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2025-01-27 19:40:10 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix a GCC warning: comparing signed vs. unsigned

Browse Source 
This also changes the type of an int to an ssize_t.

nRead is initialized as an ssize_t because it could
be negative. It is cast to a size_t for comparison
to the size of a vector, but only after we check
that nRead is not negative.
This commit is contained in:
Scott Kostyshak 2014-05-20 07:46:22 -04:00
parent 275b7af75e
commit fc19148f6d
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/support/filetools.cpp
View File

@ -840,7 +840,7 @@ bool readLink(FileName const & file, FileName & link)
string const encoded = file.toFilesystemEncoding(); string const encoded = file.toFilesystemEncoding();
#ifdef HAVE_DEF_PATH_MAX #ifdef HAVE_DEF_PATH_MAX
char linkbuffer[PATH_MAX + 1]; char linkbuffer[PATH_MAX + 1];
int const nRead = ::readlink(encoded.c_str(), ssize_t const nRead = ::readlink(encoded.c_str(),
linkbuffer, sizeof(linkbuffer) - 1); linkbuffer, sizeof(linkbuffer) - 1);
if (nRead <= 0) if (nRead <= 0)
return false; return false;
@ -854,7 +854,7 @@ bool readLink(FileName const & file, FileName & link)
if (nRead < 0) { if (nRead < 0) {
return false; return false;
} }
if (nRead < buf.size() - 1) { if (static_cast<size_t>(nRead) < buf.size() - 1) {
break; break;
} }
buf.resize(buf.size() * 2); buf.resize(buf.size() * 2);