diff options
| author | Christopher Faylor <me@cgf.cx> | 2011-06-05 02:10:31 +0000 |
|---|---|---|
| committer | Christopher Faylor <me@cgf.cx> | 2011-06-05 02:10:31 +0000 |
| commit | d5cb221b85cc8120c0947d74178f762c84d47a96 (patch) | |
| tree | 9e3eeb5584a4d9745aacb92ee5dcbe3e671bad58 | |
| parent | 665f9a59a412731a6262e953b7b76f93a2ce13c8 (diff) | |
| download | cygnal-d5cb221b85cc8120c0947d74178f762c84d47a96.tar.gz cygnal-d5cb221b85cc8120c0947d74178f762c84d47a96.tar.bz2 cygnal-d5cb221b85cc8120c0947d74178f762c84d47a96.zip | |
* fhandler_console.cc (fhandler_console::open_shared_console): Don't zero
handle to open_shared since it is supposed to be an input.
(enum_windows): Set handle input to open_shared to NULL since it does not
represent any previously opened shared region.
* shared.cc (open_shared): Tweak debugging output.
| -rw-r--r-- | winsup/cygwin/ChangeLog | 8 | ||||
| -rw-r--r-- | winsup/cygwin/fhandler_console.cc | 3 | ||||
| -rw-r--r-- | winsup/cygwin/shared.cc | 2 |
3 files changed, 10 insertions, 3 deletions
diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog index 1272c87da..1f8f5d5c6 100644 --- a/winsup/cygwin/ChangeLog +++ b/winsup/cygwin/ChangeLog @@ -1,3 +1,11 @@ +2011-06-04 Christopher Faylor <me.cygwin2011@cgf.cx> + + * fhandler_console.cc (fhandler_console::open_shared_console): Don't + zero handle to open_shared since it is supposed to be an input. + (enum_windows): Set handle input to open_shared to NULL since it does + not represent any previously opened shared region. + * shared.cc (open_shared): Tweak debugging output. + 2011-06-03 Christopher Faylor <me.cygwin2011@cgf.cx> * ntdll.h (FILE_PIPE_*): Define constants. diff --git a/winsup/cygwin/fhandler_console.cc b/winsup/cygwin/fhandler_console.cc index 399830b79..6766cb02e 100644 --- a/winsup/cygwin/fhandler_console.cc +++ b/winsup/cygwin/fhandler_console.cc @@ -82,7 +82,6 @@ fhandler_console::open_shared_console (HWND hw, HANDLE& h, bool& create) { wchar_t namebuf[(sizeof "XXXXXXXXXXXXXXXXXX-consNNNNNNNNNN")]; __small_swprintf (namebuf, L"%S-cons%p", &installation_key, hw); - h = NULL; shared_locations m = create ? SH_JUSTCREATE: SH_JUSTOPEN; console_state *res = (console_state *) @@ -108,7 +107,7 @@ enum_windows (HWND hw, LPARAM lp) console_unit *this1 = (console_unit *) lp; if (hw == this1->me) return TRUE; - HANDLE h; + HANDLE h = NULL; fhandler_console::console_state *cs; if ((cs = fhandler_console::open_shared_console (hw, h))) { diff --git a/winsup/cygwin/shared.cc b/winsup/cygwin/shared.cc index 22138d0be..a4b5b006a 100644 --- a/winsup/cygwin/shared.cc +++ b/winsup/cygwin/shared.cc @@ -301,7 +301,7 @@ open_shared (const WCHAR *name, int n, HANDLE& shared_h, DWORD size, offsets[SH_TOTAL_SIZE] += delta; } - debug_printf ("name %W, n %d, shared %p (wanted %p), h %p", mapname, n, shared, addr, shared_h); + debug_printf ("name %W, n %d, shared %p (wanted %p), h %p, *m %d", mapname, n, shared, addr, shared_h, *m); return shared; } |