From 59d430fe145ae0715589e0e12f6749b546848b3e Mon Sep 17 00:00:00 2001 From: dgp Date: Thu, 11 Oct 2007 02:54:10 +0000 Subject: merge updates from HEAD --- ChangeLog | 5 +++++ doc/Hash.3 | 4 ++-- generic/tclCompile.c | 5 +++-- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index b5b4adf..072b154 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2007-10-08 George Peter Staplin + + * doc/Hash.3: Correct the valid usage of the flags member for the + Tcl_HashKeyType. It should be 0 or more of the flags mentioned. + 2007-10-02 Jeff Hobbs * generic/tcl.h (Tcl_DecrRefCount): Update change from 2006-05-29 diff --git a/doc/Hash.3 b/doc/Hash.3 index e995fb3..b22100a 100644 --- a/doc/Hash.3 +++ b/doc/Hash.3 @@ -5,7 +5,7 @@ '\" See the file "license.terms" for information on usage and redistribution '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES. '\" -'\" RCS: @(#) $Id: Hash.3,v 1.18.12.1 2007/09/04 17:43:46 dgp Exp $ +'\" RCS: @(#) $Id: Hash.3,v 1.18.12.2 2007/10/11 02:54:12 dgp Exp $ '\" .so man.macros .TH Tcl_Hash 3 "" Tcl "Tcl Library Procedures" @@ -251,7 +251,7 @@ structure is extended in future then the version can be used to distinguish between different structures. It should be set to \fBTCL_HASH_KEY_TYPE_VERSION\fR. .PP -The \fIflags\fR member is one or more of the following values OR'ed together: +The \fIflags\fR member is 0 or one or more of the following values OR'ed together: .IP \fBTCL_HASH_KEY_RANDOMIZE_HASH\fR 25 There are some things, pointers for example which don't hash well because they do not use the lower bits. If this flag is set then the diff --git a/generic/tclCompile.c b/generic/tclCompile.c index d08b0b7..b233187 100644 --- a/generic/tclCompile.c +++ b/generic/tclCompile.c @@ -11,7 +11,7 @@ * See the file "license.terms" for information on usage and redistribution of * this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tclCompile.c,v 1.117.2.10 2007/10/02 20:11:54 dgp Exp $ + * RCS: @(#) $Id: tclCompile.c,v 1.117.2.11 2007/10/11 02:54:12 dgp Exp $ */ #include "tclInt.h" @@ -3240,9 +3240,10 @@ TclPrintInstruction( unsigned char *pc) /* Points to first byte of instruction. */ { Tcl_Obj *bufferObj; + int numBytes; TclNewObj(bufferObj); - FormatInstruction(codePtr, pc, bufferObj); + numBytes = FormatInstruction(codePtr, pc, bufferObj); fprintf(stdout, "%s", TclGetString(bufferObj)); Tcl_DecrRefCount(bufferObj); return numBytes; -- cgit v0.12