From 14e06cca26d10be79606054ff17eecc573db25db Mon Sep 17 00:00:00 2001 From: Corinna Vinschen Date: Mon, 26 Feb 2007 12:39:25 +0000 Subject: [PATCH] * fhandler_registry.cc (registry_listing): Drop name of HKEY_DYN_DATA. (registry_keys): Drop HKEY_DYN_DATA. * net.cc: Fix comment. * syslog.cc: Ditto. --- winsup/cygwin/ChangeLog | 7 +++++++ winsup/cygwin/fhandler_registry.cc | 4 +--- winsup/cygwin/libc/minires-os-if.c | 2 +- winsup/cygwin/net.cc | 2 +- winsup/cygwin/syslog.cc | 19 ++++++++----------- 5 files changed, 18 insertions(+), 16 deletions(-) diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog index 6bed79fb2..a95c5f567 100644 --- a/winsup/cygwin/ChangeLog +++ b/winsup/cygwin/ChangeLog @@ -1,3 +1,10 @@ +2007-02-26 Corinna Vinschen + + * fhandler_registry.cc (registry_listing): Drop name of HKEY_DYN_DATA. + (registry_keys): Drop HKEY_DYN_DATA. + * net.cc: Fix comment. + * syslog.cc: Ditto. + 2007-02-26 Corinna Vinschen * fhandler_disk_file.cc (fhandler_disk_file::fchmod): Drop comment. diff --git a/winsup/cygwin/fhandler_registry.cc b/winsup/cygwin/fhandler_registry.cc index 47ef092f5..26e975069 100644 --- a/winsup/cygwin/fhandler_registry.cc +++ b/winsup/cygwin/fhandler_registry.cc @@ -1,6 +1,6 @@ /* fhandler_registry.cc: fhandler for /proc/registry virtual filesystem - Copyright 2002, 2003, 2003, 2004, 2005, 2006 Red Hat, Inc. + Copyright 2002, 2003, 2003, 2004, 2005, 2006, 2007 Red Hat, Inc. This file is part of Cygwin. @@ -46,7 +46,6 @@ static const char *registry_listing[] = "HKEY_CURRENT_USER", "HKEY_LOCAL_MACHINE", "HKEY_USERS", - "HKEY_DYN_DATA", // 95/98/Me "HKEY_PERFORMANCE_DATA", // NT/2000/XP NULL }; @@ -60,7 +59,6 @@ static const HKEY registry_keys[] = HKEY_CURRENT_USER, HKEY_LOCAL_MACHINE, HKEY_USERS, - HKEY_DYN_DATA, HKEY_PERFORMANCE_DATA }; diff --git a/winsup/cygwin/libc/minires-os-if.c b/winsup/cygwin/libc/minires-os-if.c index 540d78634..2beb5f8b8 100644 --- a/winsup/cygwin/libc/minires-os-if.c +++ b/winsup/cygwin/libc/minires-os-if.c @@ -1,6 +1,6 @@ /* minires-os-if.c. Stub synchronous resolver for Cygwin. - Copyright 2006 Red Hat, Inc. + Copyright 2006, 2007 Red Hat, Inc. Written by Pierre A. Humblet diff --git a/winsup/cygwin/net.cc b/winsup/cygwin/net.cc index eccefa232..dd316c5ea 100644 --- a/winsup/cygwin/net.cc +++ b/winsup/cygwin/net.cc @@ -1413,7 +1413,7 @@ done: } /* - * IFCONF 98/ME, NTSP4, W2K: + * IFCONF NTSP4, W2K: * Use IP Helper Library */ static void diff --git a/winsup/cygwin/syslog.cc b/winsup/cygwin/syslog.cc index d5d85e7df..383cc244f 100644 --- a/winsup/cygwin/syslog.cc +++ b/winsup/cygwin/syslog.cc @@ -30,8 +30,7 @@ details. */ #define CYGWIN_LOG_NAME "Cygwin" -/* openlog: save the passed args. Don't open the - system log (NT) or log file (95) yet. */ +/* openlog: save the passed args. Don't open the system log or /dev/log yet. */ extern "C" void openlog (const char *ident, int logopt, int facility) { @@ -259,15 +258,13 @@ try_connect_syslogd (int priority, const char *msg, int len) return ret; } -/* - * syslog: creates the log message and writes to system - * log (NT) or log file (95). FIXME. WinNT log error messages - * don't look pretty, but in order to fix this we have to - * embed resources in the code and tell the NT registry - * where we are, blech (what happens if we move ?). - * We could, however, add the resources in Cygwin and - * always point to that. - */ +/* syslog: creates the log message and writes to /dev/log, or to the + NT system log if /dev/log isn't available. + + FIXME. WinNT system log messages don't look pretty, but in order to + fix this we have to embed resources in the code and tell the NT + registry where we are, blech (what happens if we move ?). We could, + however, add the resources in Cygwin and always point to that. */ extern "C" void vsyslog (int priority, const char *message, va_list ap) -- 2.43.5