From 543703d4ee015b5c0fb7b4402dbe0701ba47945f Mon Sep 17 00:00:00 2001 From: dgp Date: Fri, 17 May 2019 18:33:49 +0000 Subject: comment typo --- generic/tclTest.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/generic/tclTest.c b/generic/tclTest.c index 1d92ff5..35687fd 100644 --- a/generic/tclTest.c +++ b/generic/tclTest.c @@ -4326,7 +4326,7 @@ TesttranslatefilenameCmd( * * TestupvarCmd -- * - * This procedure implements the "testupvar2" command. It is used + * This procedure implements the "testupvar" command. It is used * to test Tcl_UpVar and Tcl_UpVar2. * * Results: -- cgit v0.12 From 245ed0c3c358f72b7b1c4591a0a8e1de80c0fb42 Mon Sep 17 00:00:00 2001 From: sebres Date: Tue, 21 May 2019 11:22:36 +0000 Subject: cherry-picing of [3f693cdfe9c875c4] to be more compatible across version, resolve mistake with "key objects/pointers comparison by the hash entry" firstly introduced there. --- generic/tclHash.c | 5 ++++- generic/tclObj.c | 7 +++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/generic/tclHash.c b/generic/tclHash.c index 5d6ea86..837a167 100644 --- a/generic/tclHash.c +++ b/generic/tclHash.c @@ -324,7 +324,10 @@ CreateHashEntry( continue; } #endif - if (compareKeysProc((VOID *) key, hPtr)) { + /* if keys pointers or values are equal */ + if (((void *) key == hPtr->key.oneWordValue) + || compareKeysProc((VOID *) key, hPtr) + ) { if (newPtr) { *newPtr = 0; } diff --git a/generic/tclObj.c b/generic/tclObj.c index a283dd8..1738985 100644 --- a/generic/tclObj.c +++ b/generic/tclObj.c @@ -3921,11 +3921,10 @@ TclCompareObjKeys( /* * If the object pointers are the same then they match. - */ + * OPT: this comparison was moved to the caller - if (objPtr1 == objPtr2) { - return 1; - } + if (objPtr1 == objPtr2) return 1; + */ /* * Don't use Tcl_GetStringFromObj as it would prevent l1 and l2 being -- cgit v0.12 From 57c23073f76044f428a0768143d020ba62ffbfbc Mon Sep 17 00:00:00 2001 From: sebres Date: Tue, 21 May 2019 11:29:09 +0000 Subject: small amend (no cast needed) --- generic/tclHash.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/generic/tclHash.c b/generic/tclHash.c index 837a167..c2fc8ec 100644 --- a/generic/tclHash.c +++ b/generic/tclHash.c @@ -325,7 +325,7 @@ CreateHashEntry( } #endif /* if keys pointers or values are equal */ - if (((void *) key == hPtr->key.oneWordValue) + if ((key == hPtr->key.oneWordValue) || compareKeysProc((VOID *) key, hPtr) ) { if (newPtr) { -- cgit v0.12