Use -1 instead of 0 to indicate absent glxtest_pipe fd

This commit is contained in:
trav90 2018-04-20 17:44:53 -05:00 • committed by Roy Tam
commit 2871772641

View file

@ -23,7 +23,7 @@ NS_IMPL_ISUPPORTS_INHERITED(GfxInfo, GfxInfoBase, nsIGfxInfoDebug)
#endif
// these global variables will be set when firing the glxtest process
int glxtest_pipe = 0;
int glxtest_pipe = -1;
pid_t glxtest_pid = 0;
nsresult
@ -50,8 +50,8 @@ GfxInfo::GetData()
// to understand this function, see bug 639842. We retrieve the OpenGL driver information in a
// separate process to protect against bad drivers.
// if glxtest_pipe == 0, that means that we already read the information
if (!glxtest_pipe)
// if glxtest_pipe == -1, that means that we already read the information
if (glxtest_pipe == -1)
return;
enum { buf_size = 1024 };
@ -60,7 +60,7 @@ GfxInfo::GetData()
&buf,
buf_size-1); // -1 because we'll append a zero
close(glxtest_pipe);
glxtest_pipe = 0;
glxtest_pipe = -1;
// bytesread < 0 would mean that the above read() call failed.
// This should never happen. If it did, the outcome would be to blacklist anyway.