diff options
| author | Christopher Faylor <me@cgf.cx> | 2011-05-06 20:22:45 +0000 |
|---|---|---|
| committer | Christopher Faylor <me@cgf.cx> | 2011-05-06 20:22:45 +0000 |
| commit | c395d22876640ab21fee7a2b1862f6330261116f (patch) | |
| tree | dc1691cab560bf71aaa3f19265cbc09669338a5a | |
| parent | f4c566233f28f747fce3c21031f6f3d47a0a6643 (diff) | |
| download | cygnal-c395d22876640ab21fee7a2b1862f6330261116f.tar.gz cygnal-c395d22876640ab21fee7a2b1862f6330261116f.tar.bz2 cygnal-c395d22876640ab21fee7a2b1862f6330261116f.zip | |
* fhandler.h (fhandler_base::close_with_arch): Make non-virtual.
(fhandler_base::open_fs): Move closer to it's close counterpart.
| -rw-r--r-- | winsup/cygwin/ChangeLog | 5 | ||||
| -rw-r--r-- | winsup/cygwin/fhandler.h | 5 |
2 files changed, 8 insertions, 2 deletions
diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog index 952ec86c5..50624fb62 100644 --- a/winsup/cygwin/ChangeLog +++ b/winsup/cygwin/ChangeLog @@ -1,5 +1,10 @@ 2011-05-06 Christopher Faylor <me.cygwin2011@cgf.cx> + * fhandler.h (fhandler_base::close_with_arch): Make non-virtual. + (fhandler_base::open_fs): Move closer to it's close counterpart. + +2011-05-06 Christopher Faylor <me.cygwin2011@cgf.cx> + * fhandler.cc (fhandler_base::dup): Avoid duping a handle when an fhandler has an archetype. * fhandler_console.cc (fhandler_console::invisible_console): Move to diff --git a/winsup/cygwin/fhandler.h b/winsup/cygwin/fhandler.h index 1c066ff64..9d84d9d44 100644 --- a/winsup/cygwin/fhandler.h +++ b/winsup/cygwin/fhandler.h @@ -299,8 +299,7 @@ class fhandler_base virtual int open (int, mode_t); virtual void open_setup (int flags) { return; } - int open_fs (int, mode_t = 0); - virtual int close_with_arch (); + int close_with_arch (); virtual int close (); virtual void cleanup () { return; } int _archetype_usecount (const char *fn, int ln, int n) @@ -312,6 +311,8 @@ class fhandler_base strace.prntf (_STRACE_ALL, fn, "line %d: %s<%p> usecount + %d = %d", ln, get_name (), archetype, n, archetype->usecount); return archetype->usecount; } + + int open_fs (int, mode_t = 0); # define archetype_usecount(n) _archetype_usecount (__PRETTY_FUNCTION__, __LINE__, (n)) int close_fs () { return fhandler_base::close (); } virtual int __stdcall fstat (struct __stat64 *buf) __attribute__ ((regparm (2))); |