From d92e95d62c207581fc49b77af0b78b0b46c0bb0b Mon Sep 17 00:00:00 2001 From: Corinna Vinschen Date: Tue, 24 May 2011 15:09:08 +0000 Subject: [PATCH] * mount.cc (mount_info::conv_to_win32_path): Remove unused code. * mount.h (class mount_info): Remove sys_mount_table_counter member. * shared_info.h (class shared_info): Ditto. (CURR_SHARED_MAGIC): Update. --- winsup/cygwin/ChangeLog | 7 +++++++ winsup/cygwin/mount.cc | 7 +------ winsup/cygwin/mount.h | 1 - winsup/cygwin/shared_info.h | 3 +-- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog index 1d3e2b9fb..c8e67b533 100644 --- a/winsup/cygwin/ChangeLog +++ b/winsup/cygwin/ChangeLog @@ -1,3 +1,10 @@ +2011-05-24 Corinna Vinschen + + * mount.cc (mount_info::conv_to_win32_path): Remove unused code. + * mount.h (class mount_info): Remove sys_mount_table_counter member. + * shared_info.h (class shared_info): Ditto. + (CURR_SHARED_MAGIC): Update. + 2011-05-24 Corinna Vinschen * pinfo.h (struct _pinfo): Reduce size of progname array slightly. diff --git a/winsup/cygwin/mount.cc b/winsup/cygwin/mount.cc index e224211b4..7bb919594 100644 --- a/winsup/cygwin/mount.cc +++ b/winsup/cygwin/mount.cc @@ -558,12 +558,7 @@ mount_info::conv_to_win32_path (const char *src_path, char *dst, device& dev, unsigned *flags) { bool chroot_ok = !cygheap->root.exists (); - while (sys_mount_table_counter < cygwin_shared->sys_mount_table_counter) - { - int current = cygwin_shared->sys_mount_table_counter; - init (); - sys_mount_table_counter = current; - } + MALLOC_CHECK; dev.devn = FH_FS; diff --git a/winsup/cygwin/mount.h b/winsup/cygwin/mount.h index 3ab18737d..d8468c857 100644 --- a/winsup/cygwin/mount.h +++ b/winsup/cygwin/mount.h @@ -146,7 +146,6 @@ struct device; class mount_info { public: - DWORD sys_mount_table_counter; int nmounts; mount_item mount[MAX_MOUNTS]; diff --git a/winsup/cygwin/shared_info.h b/winsup/cygwin/shared_info.h index feb8ff1da..8a6a3f8fc 100644 --- a/winsup/cygwin/shared_info.h +++ b/winsup/cygwin/shared_info.h @@ -30,7 +30,7 @@ public: /* Data accessible to all tasks */ -#define CURR_SHARED_MAGIC 0xb41ae342U +#define CURR_SHARED_MAGIC 0x34e5bfa7U #define USER_VERSION 1 #define CURR_USER_MAGIC 0x6112afb3U @@ -44,7 +44,6 @@ class shared_info DWORD cb; public: DWORD heap_chunk; - DWORD sys_mount_table_counter; tty_list tty; LONG last_used_bindresvport; DWORD obcaseinsensitive; -- 2.43.5