merge trunk and dup test names

3 files changed, 15 insertions, 12 deletions

diff --git a/doc/TclZlib.3 b/doc/TclZlib.3
index d14ba48..4d6735b 100644
--- a/doc/TclZlib.3
+++ b/doc/TclZlib.3
@@ -18,7 +18,7 @@ int
 \fBTcl_ZlibDeflate\fR(\fIinterp, format, dataObj, level, dictObj\fR)
 .sp
 int
-\fBTcl_ZlibInflate\fR(\fIinterp, format, dataObj, dictObj\fR)
+\fBTcl_ZlibInflate\fR(\fIinterp, format, dataObj, bufferSize, dictObj\fR)
 .sp
 unsigned int
 \fBTcl_ZlibCRC32\fR(\fIinitValue, bytes, length\fR)
@@ -85,6 +85,9 @@ section \fBGZIP OPTIONS DICTIONARY\fR for details about the contents of this
 dictionary.
 .AP "unsigned int" initValue in
 The initial value for the checksum algorithm.
+.AP "Tcl_Size" bufferSize in
+A hint as to what size of buffer is to be used to receive the data.
+Use 0 to use a geric guess based on the input data.
 .AP "unsigned char" *bytes in
 An array of bytes to run the checksum algorithm over, or NULL to get the
 recommended initial value for the checksum algorithm.
diff --git a/tests/clock.test b/tests/clock.test
index 1b70c04..76155b5 100644
--- a/tests/clock.test
+++ b/tests/clock.test
@@ -37265,7 +37265,7 @@ test clock-46.16-pos-fmt2 {scan with format: validation rules: valid day of week
 	0 946728000 0 946814400 0 946900800 0 946987200 0 947073600 0 947160000 0 947246400 \
 	0 946641600 0 946728000 0 946814400 0 946900800 0 946987200 0 947073600 0 947160000 \
     ]
-test clock-46.16-pos-fmt2 {scan with format: validation rules: valid day of week (must work for all weekdays)} \
+test clock-46.16-pos-fmt3 {scan with format: validation rules: valid day of week (must work for all weekdays)} \
     -body {
 	_invalid_test {:GMT -12:00 +12:00} {-format "%w, %d %b %Y %H:%M:%S"} {6, 01 Jan 2000 00:00:00} {0, 02 Jan 2000 00:00:00} {1, 03 Jan 2000 00:00:00} {2, 04 Jan 2000 00:00:00} {3, 05 Jan 2000 00:00:00} {4, 06 Jan 2000 00:00:00} {5, 07 Jan 2000 00:00:00}
     } -result [list \
diff --git a/tests/info.test b/tests/info.test
index a8a6245..fe7b35b 100644
--- a/tests/info.test
+++ b/tests/info.test
@@ -2606,16 +2606,7 @@ test info-39.2 {Bug 4b61afd660} -setup {
     rename probe {}
 } -result 3
 
-test info-40.0 {Bug 0de6c1d79c crash} -setup {
-    interp create child
-    child hide info
-} -cleanup {
-    interp delete child
-} -body {
-    child invokehidden info frame
-} -result 1
-
-test info-40.0 {Bug 0de6c1d79c crash} -setup {
+test info-41.0 {Bug 0de6c1d79c crash} -setup {
     interp create child
     child hide info
 } -body {
@@ -2629,6 +2620,15 @@ test info-40.0 {Bug 0de6c1d79c crash} -setup {
     unset -nocomplain msg
 } -result {1 {type precompiled} {type precompiled} 1 {bad level "-1"} 1 {bad level "2"}}
 
+test info-41.1 {Bug 0de6c1d79c crash} -setup {
+    interp create child
+    child hide info
+} -cleanup {
+    interp delete child
+} -body {
+    child invokehidden info frame
+} -result 1
+
 # cleanup
 catch {namespace delete test_ns_info1 test_ns_info2}
 ::tcltest::cleanupTests