diff options
| author | Bram Moolenaar <Bram@vim.org> | 2022-12-25 21:32:09 +0000 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2022-12-25 21:32:09 +0000 |
| commit | b3d614369fceb891819badc941f80f08f57831f9 (patch) | |
| tree | e2986686fe43369523f0c062ea3564467e851590 | |
| parent | 71d53e7c579b8af44083142ea3894b455947ad81 (diff) | |
patch 9.0.1097: tests are failingv9.0.1097
Problem: Tests are failing.
Solution: Do clean up a hashtab when at the initial size.
| -rw-r--r-- | src/hashtab.c | 11 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 9 insertions, 4 deletions
diff --git a/src/hashtab.c b/src/hashtab.c index 0c1aca2c5b..dc4ef8888b 100644 --- a/src/hashtab.c +++ b/src/hashtab.c @@ -405,10 +405,6 @@ hash_may_resize( return FAIL; // overflow } - // bail out if the hashtab is already at the desired size - if (newsize == ht->ht_mask + 1) - return OK; - if (newsize == HT_INIT_SIZE) { // Use the small array inside the hashdict structure. @@ -425,6 +421,13 @@ hash_may_resize( oldarray = ht->ht_array; CLEAR_FIELD(ht->ht_smallarray); } + + else if (newsize == ht->ht_mask + 1) + { + // the hashtab is already at the desired size, bail out + return OK; + } + else { // Allocate an array. diff --git a/src/version.c b/src/version.c index deaee33566..94bcd5871d 100644 --- a/src/version.c +++ b/src/version.c @@ -696,6 +696,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1097, +/**/ 1096, /**/ 1095, |