diff options
| -rw-r--r-- | winsup/cygwin/ChangeLog | 10 | ||||
| -rw-r--r-- | winsup/cygwin/environ.cc | 7 | ||||
| -rw-r--r-- | winsup/cygwin/fork.cc | 4 | ||||
| -rw-r--r-- | winsup/cygwin/wincap.cc | 14 | ||||
| -rw-r--r-- | winsup/cygwin/wincap.h | 4 |
5 files changed, 12 insertions, 27 deletions
diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog index 67cacac2a..fb4018a11 100644 --- a/winsup/cygwin/ChangeLog +++ b/winsup/cygwin/ChangeLog @@ -1,3 +1,13 @@ +2011-05-10 Corinna Vinschen <corinna@vinschen.de> + + * environ.cc (set_chunksize): Remove. + (parse_thing): Remove forkchunk entry. + * fork.cc (child_copy): Drop handling external chunksize setting. + * wincap.cc: Througout, drop chunksize. + (wincapc::set_chunksize): Remove. + * wincap.h (struct wincaps): Drop chunksize and declaration of + set_chunksize. + 2011-05-08 Yaakov Selkowitz <yselkowitz@users.sourceforge.net> * times.cc (settimeofday): Add EFAULT handler. diff --git a/winsup/cygwin/environ.cc b/winsup/cygwin/environ.cc index ceebe60b4..8a9f74ae3 100644 --- a/winsup/cygwin/environ.cc +++ b/winsup/cygwin/environ.cc @@ -558,12 +558,6 @@ glob_init (const char *buf) } static void -set_chunksize (const char *buf) -{ - wincap.set_chunksize (strtoul (buf, NULL, 0)); -} - -static void set_proc_retry (const char *buf) { child_info::retry_count = strtoul (buf, NULL, 0); @@ -596,7 +590,6 @@ static struct parse_thing {"envcache", {&envcache}, justset, NULL, {{true}, {false}}}, {"error_start", {func: &error_start_init}, isfunc, NULL, {{0}, {0}}}, {"export", {&export_settings}, justset, NULL, {{false}, {true}}}, - {"forkchunk", {func: set_chunksize}, isfunc, NULL, {{0}, {0}}}, {"glob", {func: &glob_init}, isfunc, NULL, {{0}, {s: "normal"}}}, {"proc_retry", {func: set_proc_retry}, isfunc, NULL, {{0}, {5}}}, {"reset_com", {&reset_com}, justset, NULL, {{false}, {true}}}, diff --git a/winsup/cygwin/fork.cc b/winsup/cygwin/fork.cc index 790976b34..8701cdfa3 100644 --- a/winsup/cygwin/fork.cc +++ b/winsup/cygwin/fork.cc @@ -1,7 +1,7 @@ /* fork.cc Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2004, 2005, 2006, - 2007, 2008, 2009 Red Hat, Inc. + 2007, 2008, 2009, 2010, 2011 Red Hat, Inc. This file is part of Cygwin. @@ -743,7 +743,7 @@ child_copy (HANDLE hp, bool write, ...) { char *low = va_arg (args, char *); char *high = va_arg (args, char *); - DWORD todo = wincap.chunksize () ?: high - low; + DWORD todo = high - low; char *here; for (here = low; here < high; here += todo) diff --git a/winsup/cygwin/wincap.cc b/winsup/cygwin/wincap.cc index 4a7cc3e23..b36bc0876 100644 --- a/winsup/cygwin/wincap.cc +++ b/winsup/cygwin/wincap.cc @@ -24,7 +24,6 @@ details. */ #define wincap_minimal wincap_2000 wincaps wincap_2000 __attribute__((section (".cygwin_dll_common"), shared)) = { - chunksize:0, heapslop:0x0, max_sys_priv:SE_MANAGE_VOLUME_PRIVILEGE, is_server:false, @@ -56,7 +55,6 @@ wincaps wincap_2000 __attribute__((section (".cygwin_dll_common"), shared)) = { }; wincaps wincap_2000sp4 __attribute__((section (".cygwin_dll_common"), shared)) = { - chunksize:0, heapslop:0x0, max_sys_priv:SE_CREATE_GLOBAL_PRIVILEGE, is_server:false, @@ -88,7 +86,6 @@ wincaps wincap_2000sp4 __attribute__((section (".cygwin_dll_common"), shared)) = }; wincaps wincap_xp __attribute__((section (".cygwin_dll_common"), shared)) = { - chunksize:0, heapslop:0x0, max_sys_priv:SE_MANAGE_VOLUME_PRIVILEGE, is_server:false, @@ -120,7 +117,6 @@ wincaps wincap_xp __attribute__((section (".cygwin_dll_common"), shared)) = { }; wincaps wincap_xpsp1 __attribute__((section (".cygwin_dll_common"), shared)) = { - chunksize:0, heapslop:0x0, max_sys_priv:SE_MANAGE_VOLUME_PRIVILEGE, is_server:false, @@ -152,7 +148,6 @@ wincaps wincap_xpsp1 __attribute__((section (".cygwin_dll_common"), shared)) = { }; wincaps wincap_xpsp2 __attribute__((section (".cygwin_dll_common"), shared)) = { - chunksize:0, heapslop:0x0, max_sys_priv:SE_CREATE_GLOBAL_PRIVILEGE, is_server:false, @@ -184,7 +179,6 @@ wincaps wincap_xpsp2 __attribute__((section (".cygwin_dll_common"), shared)) = { }; wincaps wincap_2003 __attribute__((section (".cygwin_dll_common"), shared)) = { - chunksize:0, heapslop:0x4, max_sys_priv:SE_CREATE_GLOBAL_PRIVILEGE, is_server:true, @@ -216,7 +210,6 @@ wincaps wincap_2003 __attribute__((section (".cygwin_dll_common"), shared)) = { }; wincaps wincap_vista __attribute__((section (".cygwin_dll_common"), shared)) = { - chunksize:0, heapslop:0x4, max_sys_priv:SE_CREATE_SYMBOLIC_LINK_PRIVILEGE, is_server:false, @@ -248,7 +241,6 @@ wincaps wincap_vista __attribute__((section (".cygwin_dll_common"), shared)) = { }; wincaps wincap_7 __attribute__((section (".cygwin_dll_common"), shared)) = { - chunksize:0, heapslop:0x4, max_sys_priv:SE_CREATE_SYMBOLIC_LINK_PRIVILEGE, is_server:false, @@ -371,9 +363,3 @@ wincapc::init () __small_sprintf (osnam, "NT-%d.%d", version.dwMajorVersion, version.dwMinorVersion); } - -void -wincapc::set_chunksize (DWORD nchunksize) -{ - ((wincaps *)caps)->chunksize = nchunksize; -} diff --git a/winsup/cygwin/wincap.h b/winsup/cygwin/wincap.h index 631cf30ae..c1e467275 100644 --- a/winsup/cygwin/wincap.h +++ b/winsup/cygwin/wincap.h @@ -14,7 +14,6 @@ details. */ struct wincaps { - DWORD chunksize; DWORD heapslop; DWORD max_sys_priv; unsigned is_server : 1; @@ -55,14 +54,11 @@ class wincapc public: void init (); - void set_chunksize (DWORD nchunksize); - const char *osname () const { return osnam; } const bool is_wow64 () const { return wow64; } #define IMPLEMENT(cap) cap() const { return ((wincaps *) this->caps)->cap; } - DWORD IMPLEMENT (chunksize) DWORD IMPLEMENT (heapslop) DWORD IMPLEMENT (max_sys_priv) bool IMPLEMENT (is_server) |