summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCorinna Vinschen <corinna@vinschen.de>2015-06-08 21:55:11 +0200
committerCorinna Vinschen <corinna@vinschen.de>2015-06-08 21:55:11 +0200
commit6261fb30a9780fae87d631c1da4d77efa43fe329 (patch)
tree6714d848b6eeb8331fc3a33836bc7534d2105a24
parent575ec00a43ae3bbc84d5dab1233c3f95fdad18d0 (diff)
downloadcygnal-cygwin-2_0_4-release.tar.gz
cygnal-cygwin-2_0_4-release.tar.bz2
cygnal-cygwin-2_0_4-release.zip
Avoid compiler warning in latest patchcygwin-2_0_4-release
* pinfo.cc (_pinfo::cwd): Initialize s to avoid comiler warning. (_pinfo::cmdline): Ditto. Signed-off-by: Corinna Vinschen <corinna@vinschen.de>
-rw-r--r--winsup/cygwin/ChangeLog5
-rw-r--r--winsup/cygwin/pinfo.cc4
2 files changed, 7 insertions, 2 deletions
diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index 10717e399..091fa32a3 100644
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,5 +1,10 @@
2015-06-08 Corinna Vinschen <corinna@vinschen.de>
+ * pinfo.cc (_pinfo::cwd): Initialize s to avoid comiler warning.
+ (_pinfo::cmdline): Ditto.
+
+2015-06-08 Corinna Vinschen <corinna@vinschen.de>
+
* pinfo.cc (_pinfo::root): Fake default root for native processes.
(open_commune_proc_parms): New helper function to access process
parameter block.
diff --git a/winsup/cygwin/pinfo.cc b/winsup/cygwin/pinfo.cc
index f7fd9f00c..038937e15 100644
--- a/winsup/cygwin/pinfo.cc
+++ b/winsup/cygwin/pinfo.cc
@@ -892,7 +892,7 @@ open_commune_proc_parms (DWORD pid, PRTL_USER_PROCESS_PARAMETERS prupp)
char *
_pinfo::cwd (size_t& n)
{
- char *s;
+ char *s = NULL;
if (!this || !pid)
return NULL;
if (ISSTATE (this, PID_NOTCYGWIN))
@@ -938,7 +938,7 @@ _pinfo::cwd (size_t& n)
char *
_pinfo::cmdline (size_t& n)
{
- char *s;
+ char *s = NULL;
if (!this || !pid)
return NULL;
if (ISSTATE (this, PID_NOTCYGWIN))