From 653abd34a9a985b37e5bba9618f37b5ddb1245c7 Mon Sep 17 00:00:00 2001 From: Peter Stephenson Date: Fri, 13 Apr 2012 16:01:20 +0000 Subject: 30391: tweak to ignore DISABLED flag in new hash-based arrayuniq() --- ChangeLog | 8 +++++++- Src/params.c | 2 +- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 4c521afd8..cabf23d08 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2012-04-13 Peter Stephenson + + * 30391: Src/params.c: New hash-based arrayuniq() doesn't + care about (or set the flag correctly for) disabled hash nodes, + so we need to ignore that flag. + 2012-04-12 Peter Stephenson * 30388, 30389 (Stephane): Functions/Misc/zargs: handle @@ -16169,5 +16175,5 @@ ***************************************************** * This is used by the shell to define $ZSH_PATCHLEVEL -* $Revision: 1.5623 $ +* $Revision: 1.5624 $ ***************************************************** diff --git a/Src/params.c b/Src/params.c index d960c22cf..b18fb90a6 100644 --- a/Src/params.c +++ b/Src/params.c @@ -3532,7 +3532,7 @@ arrayuniq(char **x, int freeok) } for (it = x, write_it = x; *it;) { - if (! gethashnode(ht, *it)) { + if (! gethashnode2(ht, *it)) { HashNode new_node = zhalloc(sizeof(struct hashnode)); if (!new_node) { /* Oops, out of heap memory, no way to recover */ -- cgit 1.4.1