Clean up some more warnings
This commit is contained in:
parent
a6dcbb1f1c
commit
8feff5bc76
@ -49,6 +49,7 @@ namespace chaiscript
|
|||||||
|
|
||||||
#ifdef __GNUC__
|
#ifdef __GNUC__
|
||||||
#pragma GCC diagnostic push
|
#pragma GCC diagnostic push
|
||||||
|
#pragma GCC diagnostic ignored "-Wpragmas"
|
||||||
#pragma GCC diagnostic ignored "-Wsign-compare"
|
#pragma GCC diagnostic ignored "-Wsign-compare"
|
||||||
#pragma GCC diagnostic ignored "-Wfloat-equal"
|
#pragma GCC diagnostic ignored "-Wfloat-equal"
|
||||||
#pragma GCC diagnostic ignored "-Wconversion"
|
#pragma GCC diagnostic ignored "-Wconversion"
|
||||||
|
@ -89,24 +89,24 @@ std::vector<std::string> default_search_paths()
|
|||||||
std::vector<char> buf(2048);
|
std::vector<char> buf(2048);
|
||||||
ssize_t size = -1;
|
ssize_t size = -1;
|
||||||
|
|
||||||
if ((size = readlink("/proc/self/exe", &buf.front(), buf.size())) != -1)
|
if ((size = readlink("/proc/self/exe", &buf.front(), buf.size())) > 0)
|
||||||
{
|
{
|
||||||
exepath = std::string(&buf.front(), size);
|
exepath = std::string(&buf.front(), static_cast<size_t>(size));
|
||||||
}
|
}
|
||||||
|
|
||||||
if (exepath.empty())
|
if (exepath.empty())
|
||||||
{
|
{
|
||||||
if ((size = readlink("/proc/curproc/file", &buf.front(), buf.size())) != -1)
|
if ((size = readlink("/proc/curproc/file", &buf.front(), buf.size())) > 0)
|
||||||
{
|
{
|
||||||
exepath = std::string(&buf.front(), size);
|
exepath = std::string(&buf.front(), static_cast<size_t>(size));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (exepath.empty())
|
if (exepath.empty())
|
||||||
{
|
{
|
||||||
if ((size = readlink("/proc/self/path/a.out", &buf.front(), buf.size())) != -1)
|
if ((size = readlink("/proc/self/path/a.out", &buf.front(), buf.size())) > 0)
|
||||||
{
|
{
|
||||||
exepath = std::string(&buf.front(), size);
|
exepath = std::string(&buf.front(), static_cast<size_t>(size));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user