From bfede94fa75c69f6d063f4eca7c4b2fe9d74bb64 Mon Sep 17 00:00:00 2001
From: stanton <stanton>
Date: Tue, 2 Feb 1999 23:01:41 +0000
Subject: lint

---
 changes             |  9 ++++++++-
 generic/tclEnv.c    |  3 +--
 tests/registry.test | 12 ++++++------
 tests/winFCmd.test  |  6 +++---
 4 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/changes b/changes
index 87f76ee..9f082d1 100644
--- a/changes
+++ b/changes
@@ -1,6 +1,6 @@
 Recent user-visible changes to Tcl:
 
-RCS: @(#) $Id: changes,v 1.39 1999/01/29 00:32:14 rjohnson Exp $
+RCS: @(#) $Id: changes,v 1.40 1999/02/02 23:01:41 stanton Exp $
 
 1. No more [command1] [command2] construct for grouping multiple
 commands on a single command line.
@@ -3697,3 +3697,10 @@ Thanks to Kevin Kenny for this fix.  (SS)
 empty string on static apps.  It now always returns ".sl".  (RJ)
 
 1/28/99 (configure change) Now support -pipe option on gcc.  (RJ)
+
+2/2/99 (bug fix) Fixed initialization problem on Windows where no
+searching for init.tcl would be performed if the registry keys were
+missing.  (stanton)
+
+2/2/99 (bug fix) Added support for HKEY_PERFORMANCE_DATA and
+HKEY_DYN_DATA keys in the "registry" command. (stanton)
diff --git a/generic/tclEnv.c b/generic/tclEnv.c
index 07a5c15..52d68ae 100644
--- a/generic/tclEnv.c
+++ b/generic/tclEnv.c
@@ -12,7 +12,7 @@
  * See the file "license.terms" for information on usage and redistribution
  * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: tclEnv.c,v 1.2 1998/09/14 18:39:58 stanton Exp $
+ * RCS: @(#) $Id: tclEnv.c,v 1.3 1999/02/02 23:01:59 stanton Exp $
  */
 
 #include "tclInt.h"
@@ -276,7 +276,6 @@ TclSetEnv(name, value)
 	(void) Tcl_SetVar2(eiPtr->interp, "env", (char *) name,
 		(char *) value, TCL_GLOBAL_ONLY);
     }
-
 }
 
 /*
diff --git a/tests/registry.test b/tests/registry.test
index ab692aa..b78beff 100644
--- a/tests/registry.test
+++ b/tests/registry.test
@@ -9,7 +9,7 @@
 #
 # Copyright (c) 1997 by Sun Microsystems, Inc.  All rights reserved.
 #
-# RCS: @(#) $Id: registry.test,v 1.3 1998/11/02 23:04:14 stanton Exp $
+# RCS: @(#) $Id: registry.test,v 1.4 1999/02/02 23:01:42 stanton Exp $
 
 if {$tcl_platform(platform) != "windows"} {
     return
@@ -115,7 +115,7 @@ test registry-1.23 {argument parsing for registry command} {
 
 test registry-2.1 {DeleteKey: bad key} {
     list [catch {registry delete foo} msg] $msg
-} {1 {bad root name "foo": must be HKEY_LOCAL_MACHINE, HKEY_USERS, HKEY_CLASSES_ROOT, HKEY_CURRENT_USER, or HKEY_CURRENT_CONFIG}}
+} {1 {bad root name "foo": must be HKEY_LOCAL_MACHINE, HKEY_USERS, HKEY_CLASSES_ROOT, HKEY_CURRENT_USER, HKEY_CURRENT_CONFIG, HKEY_PERFORMANCE_DATA, or HKEY_DYN_DATA}}
 test registry-2.2 {DeleteKey: bad key} {
     list [catch {registry delete HKEY_CLASSES_ROOT} msg] $msg
 } {1 {bad key: cannot delete root keys}}
@@ -459,19 +459,19 @@ test registry-9.2 {ParseKeyName: bad keys} {
 } {1 {bad key "\foobar": must start with a valid root}}
 test registry-9.3 {ParseKeyName: bad keys} {
     list [catch {registry values \\\\} msg] $msg
-} {1 {ambiguous root name "": must be HKEY_LOCAL_MACHINE, HKEY_USERS, HKEY_CLASSES_ROOT, HKEY_CURRENT_USER, or HKEY_CURRENT_CONFIG}}
+} {1 {ambiguous root name "": must be HKEY_LOCAL_MACHINE, HKEY_USERS, HKEY_CLASSES_ROOT, HKEY_CURRENT_USER, HKEY_CURRENT_CONFIG, HKEY_PERFORMANCE_DATA, or HKEY_DYN_DATA}}
 test registry-9.4 {ParseKeyName: bad keys} {
     list [catch {registry values \\\\\\} msg] $msg
-} {1 {ambiguous root name "": must be HKEY_LOCAL_MACHINE, HKEY_USERS, HKEY_CLASSES_ROOT, HKEY_CURRENT_USER, or HKEY_CURRENT_CONFIG}}
+} {1 {ambiguous root name "": must be HKEY_LOCAL_MACHINE, HKEY_USERS, HKEY_CLASSES_ROOT, HKEY_CURRENT_USER, HKEY_CURRENT_CONFIG, HKEY_PERFORMANCE_DATA, or HKEY_DYN_DATA}}
 test registry-9.5 {ParseKeyName: bad keys} {
     list [catch {registry values \\\\\\HKEY_CLASSES_ROOT} msg] $msg
 } {1 {unable to open key: The network address is invalid.}}
 test registry-9.6 {ParseKeyName: bad keys} {
     list [catch {registry values \\\\gaspode} msg] $msg
-} {1 {ambiguous root name "": must be HKEY_LOCAL_MACHINE, HKEY_USERS, HKEY_CLASSES_ROOT, HKEY_CURRENT_USER, or HKEY_CURRENT_CONFIG}}
+} {1 {ambiguous root name "": must be HKEY_LOCAL_MACHINE, HKEY_USERS, HKEY_CLASSES_ROOT, HKEY_CURRENT_USER, HKEY_CURRENT_CONFIG, HKEY_PERFORMANCE_DATA, or HKEY_DYN_DATA}}
 test registry-9.7 {ParseKeyName: bad keys} {
     list [catch {registry values foobar} msg] $msg
-} {1 {bad root name "foobar": must be HKEY_LOCAL_MACHINE, HKEY_USERS, HKEY_CLASSES_ROOT, HKEY_CURRENT_USER, or HKEY_CURRENT_CONFIG}}
+} {1 {bad root name "foobar": must be HKEY_LOCAL_MACHINE, HKEY_USERS, HKEY_CLASSES_ROOT, HKEY_CURRENT_USER, HKEY_CURRENT_CONFIG, HKEY_PERFORMANCE_DATA, or HKEY_DYN_DATA}}
 test registry-9.8 {ParseKeyName: null keys} {
     list [catch {registry delete HKEY_CLASSES_ROOT\\} msg] $msg
 } {1 {bad key: cannot delete root keys}}
diff --git a/tests/winFCmd.test b/tests/winFCmd.test
index 55df5d0..dad71e9 100644
--- a/tests/winFCmd.test
+++ b/tests/winFCmd.test
@@ -9,7 +9,7 @@
 # See the file "license.terms" for information on usage and redistribution
 # of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 #
-# RCS: @(#) $Id: winFCmd.test,v 1.2 1998/09/14 18:40:15 stanton Exp $
+# RCS: @(#) $Id: winFCmd.test,v 1.3 1999/02/02 23:01:42 stanton Exp $
 #
 
 if {[string compare test [info procs test]] == 1} then {source defs}
@@ -733,8 +733,8 @@ test winFCmd-7.18 {TraverseWinTree: recurse on files: several files and dir} {
     createfile td1/tf3
     createfile td1/tf4
     testfile cpdir td1 td2
-    glob td2/*
-} {td2/tf1 td2/tf2 td2/td2 td2/tf3 td2/tf4}
+    lsort [glob td2/*]
+} {td2/td2 td2/tf1 td2/tf2 td2/tf3 td2/tf4}
 test winFCmd-7.19 {TraverseWinTree: call TraversalCopy: DOTREE_POSTD} {
     cleanup
     file mkdir td1
-- 
cgit v0.12