From ead09e80ab88d419d3d51ad24ee56dab9b0e122e Mon Sep 17 00:00:00 2001 From: cgf Date: Tue, 29 Nov 2011 17:41:00 +0000 Subject: [PATCH] * sigproc.cc (get_proc_lock): Remove extra NULL check. Return false on failure. --- winsup/cygwin/ChangeLog | 5 +++++ winsup/cygwin/sigproc.cc | 13 ++++--------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog index 7056124a20..170cbf42a6 100644 --- a/winsup/cygwin/ChangeLog +++ b/winsup/cygwin/ChangeLog @@ -1,5 +1,10 @@ 2011-11-29 Christopher Faylor + * sigproc.cc (get_proc_lock): Remove extra NULL check. Return false on + failure. + +2011-11-29 Christopher Faylor + * sync.cc: Fix comment. 2011-11-29 Christopher Faylor diff --git a/winsup/cygwin/sigproc.cc b/winsup/cygwin/sigproc.cc index d5c96168aa..38aa1cf5ba 100644 --- a/winsup/cygwin/sigproc.cc +++ b/winsup/cygwin/sigproc.cc @@ -134,7 +134,7 @@ get_proc_lock (DWORD what, DWORD val) Static int lastwhat = -1; if (!sync_proc_subproc) { - sigproc_printf ("sync_proc_subproc is NULL (1)"); + sigproc_printf ("sync_proc_subproc is NULL"); return false; } if (sync_proc_subproc.acquire (WPSP)) @@ -142,14 +142,9 @@ get_proc_lock (DWORD what, DWORD val) lastwhat = what; return true; } - if (!sync_proc_subproc) - { - sigproc_printf ("sync_proc_subproc is NULL (2)"); - return false; - } - system_printf ("Couldn't acquire sync_proc_subproc for(%d,%d), last %d, %E", - what, val, lastwhat); - return true; + system_printf ("Couldn't acquire %s for(%d,%d), last %d, %E", + sync_proc_subproc.name, what, val, lastwhat); + return false; } static bool __stdcall -- 2.11.0