This is the mail archive of the
cygwin-cvs@cygwin.com
mailing list for the Cygwin project.
[newlib-cygwin] cygwin: Remove comparison of 'this' to 'NULL' in _pinfo::cwd
- From: Corinna Vinschen <corinna at sourceware dot org>
- To: cygwin-cvs at sourceware dot org
- Date: 9 Oct 2017 10:11:09 -0000
- Subject: [newlib-cygwin] cygwin: Remove comparison of 'this' to 'NULL' in _pinfo::cwd
https://sourceware.org/git/gitweb.cgi?p=newlib-cygwin.git;h=571b7689bb690148b9747a125ff2db1d5accb561
commit 571b7689bb690148b9747a125ff2db1d5accb561
Author: Ken Brown <kbrown@cornell.edu>
Date: Sat Sep 16 22:04:12 2017 -0400
cygwin: Remove comparison of 'this' to 'NULL' in _pinfo::cwd
Fix all callers.
Diff:
---
winsup/cygwin/fhandler_process.cc | 2 +-
winsup/cygwin/pinfo.cc | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/winsup/cygwin/fhandler_process.cc b/winsup/cygwin/fhandler_process.cc
index 08cc7ea..453e79b 100644
--- a/winsup/cygwin/fhandler_process.cc
+++ b/winsup/cygwin/fhandler_process.cc
@@ -498,7 +498,7 @@ format_process_cwd (void *data, char *&destbuf)
cfree (destbuf);
destbuf = NULL;
}
- destbuf = p->cwd (fs);
+ destbuf = p ? p->cwd (fs) : NULL;
if (!destbuf || !*destbuf)
{
destbuf = cstrdup ("<defunct>");
diff --git a/winsup/cygwin/pinfo.cc b/winsup/cygwin/pinfo.cc
index 9fe1b3a..c281581 100644
--- a/winsup/cygwin/pinfo.cc
+++ b/winsup/cygwin/pinfo.cc
@@ -930,7 +930,7 @@ char *
_pinfo::cwd (size_t& n)
{
char *s = NULL;
- if (!this || !pid)
+ if (!pid)
return NULL;
if (ISSTATE (this, PID_NOTCYGWIN))
{