diff options
| author | Masaki Muranaka <[email protected]> | 2013-03-16 17:00:44 +0900 |
|---|---|---|
| committer | Masaki Muranaka <[email protected]> | 2013-03-16 17:00:44 +0900 |
| commit | 1bb447a7d3bd60e9e8ce2980ad0d5f314884aa44 (patch) | |
| tree | a595ac40cf54141ccb37280568708ccba0327dfd /include | |
| parent | 591dbbf13f51b6135e06f37773bc8d7dd51ac524 (diff) | |
| download | mruby-1bb447a7d3bd60e9e8ce2980ad0d5f314884aa44.tar.gz mruby-1bb447a7d3bd60e9e8ce2980ad0d5f314884aa44.zip | |
Avoid to call memset(). Use the new function kh_fill_flags() instead. This is for compatibility.
Diffstat (limited to 'include')
| -rw-r--r-- | include/mruby/khash.h | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/include/mruby/khash.h b/include/mruby/khash.h index 96c48d294..08896d256 100644 --- a/include/mruby/khash.h +++ b/include/mruby/khash.h @@ -75,6 +75,14 @@ static const uint8_t __m[8] = {0x01, 0x02, 0x04, 0x08, 0x10, 0x20, 0x40, 0x80}; void kh_del_##name(kh_##name##_t *h, khint_t x); \ kh_##name##_t *kh_copy_##name(mrb_state *mrb, kh_##name##_t *h); +static inline void +kh_fill_flags(uint8_t *p, uint8_t c, size_t len) +{ + while (len-- > 0) { + *p++ = c; + } +} + /* define kh_xxx_funcs name: hash name @@ -92,8 +100,8 @@ static const uint8_t __m[8] = {0x01, 0x02, 0x04, 0x08, 0x10, 0x20, 0x40, 0x80}; h->upper_bound = UPPER_BOUND(sz); \ h->e_flags = (uint8_t *)mrb_malloc(h->mrb, sizeof(uint8_t)*sz/4); \ h->d_flags = h->e_flags + sz/8; \ - memset(h->e_flags, 0xff, sz/8*sizeof(uint8_t)); \ - memset(h->d_flags, 0x00, sz/8*sizeof(uint8_t)); \ + kh_fill_flags(h->e_flags, 0xff, sz/8); \ + kh_fill_flags(h->d_flags, 0x00, sz/8); \ h->keys = (khkey_t *)mrb_malloc(h->mrb, sizeof(khkey_t)*sz); \ h->vals = (khval_t *)mrb_malloc(h->mrb, sizeof(khval_t)*sz); \ h->mask = sz-1; \ @@ -124,8 +132,8 @@ static const uint8_t __m[8] = {0x01, 0x02, 0x04, 0x08, 0x10, 0x20, 0x40, 0x80}; void kh_clear_##name(kh_##name##_t *h) \ { \ if (h && h->e_flags) { \ - memset(h->e_flags, 0xff, h->n_buckets/8*sizeof(uint8_t)); \ - memset(h->d_flags, 0x00, h->n_buckets/8*sizeof(uint8_t)); \ + kh_fill_flags(h->e_flags, 0xff, h->n_buckets/8); \ + kh_fill_flags(h->d_flags, 0x00, h->n_buckets/8); \ h->size = h->n_occupied = 0; \ } \ } \ |