IntenseFinance/neovim
3
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-02-25 18:55:25 -06:00
Code Issues Packages Projects Releases Wiki Activity

Remove long_u: hashtab: Enable -Wconversion.

Browse Source 
- Add hashtab.c to converted files list.
- Fix conversion issues:
    * hash_lookup()     : idx      : unsigned -> hash_T.
    * hash_may_resize() : minitems : int      -> size_t.
    * hash_may_resize() : newi     : unsigned -> hash_T.
    * hash_may_resize() : minsize  : long_u   -> size_t.
This commit is contained in:
Eliseo Martínez 2014-05-24 01:17:46 +02:00
parent 4d97ae66f9
commit 0c68623aca
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/nvim/CMakeLists.txt
View File

@ -37,6 +37,7 @@ set(CONV_SRCS
api.c api.c
arabic.c arabic.c
garray.c garray.c
hashtab.c
memory.c memory.c
map.c map.c
os/env.c os/env.c

14
src/nvim/hashtab.c
View File

@ -30,7 +30,7 @@
// Magic value for algorithm that walks through the array. // Magic value for algorithm that walks through the array.
#define PERTURB_SHIFT 5 #define PERTURB_SHIFT 5
static int hash_may_resize(hashtab_T *ht, int minitems); static int hash_may_resize(hashtab_T *ht, size_t minitems);
/// Initialize an empty hash table. /// Initialize an empty hash table.
void hash_init(hashtab_T *ht) void hash_init(hashtab_T *ht)
@ -101,7 +101,7 @@ hashitem_T* hash_lookup(hashtab_T *ht, char_u *key, hash_T hash)
// - return if there is no item at all // - return if there is no item at all
// - skip over a removed item // - skip over a removed item
// - return if the item matches // - return if the item matches
unsigned idx = (unsigned)(hash & ht->ht_mask); hash_T idx = hash & ht->ht_mask;
hashitem_T *hi = &ht->ht_array[idx]; hashitem_T *hi = &ht->ht_array[idx];
if (hi->hi_key == NULL) { if (hi->hi_key == NULL) {
@ -251,7 +251,7 @@ void hash_unlock(hashtab_T *ht)
/// ///
/// @return OK if success. /// @return OK if success.
/// FAIL if out of memory. /// FAIL if out of memory.
static int hash_may_resize(hashtab_T *ht, int minitems) static int hash_may_resize(hashtab_T *ht, size_t minitems)
{ {
// Don't resize a locked table. // Don't resize a locked table.
if (ht->ht_locked > 0) { if (ht->ht_locked > 0) {
@ -268,7 +268,7 @@ static int hash_may_resize(hashtab_T *ht, int minitems)
} }
#endif // ifdef HT_DEBUG #endif // ifdef HT_DEBUG
long_u minsize; size_t minsize;
if (minitems == 0) { if (minitems == 0) {
// Return quickly for small tables with at least two NULL items. // Return quickly for small tables with at least two NULL items.
// items are required for the lookup to decide a key isn't there. // items are required for the lookup to decide a key isn't there.
@ -295,9 +295,9 @@ static int hash_may_resize(hashtab_T *ht, int minitems)
} }
} else { } else {
// Use specified size. // Use specified size.
if ((long_u)minitems < ht->ht_used) { if (minitems < ht->ht_used) {
// just in case... // just in case...
minitems = (int)ht->ht_used; minitems = ht->ht_used;
} }
// array is up to 2/3 full // array is up to 2/3 full
minsize = minitems * 3 / 2; minsize = minitems * 3 / 2;
@ -340,7 +340,7 @@ static int hash_may_resize(hashtab_T *ht, int minitems)
// The algorithm to find the spot to add the item is identical to // The algorithm to find the spot to add the item is identical to
// the algorithm to find an item in hash_lookup(). But we only // the algorithm to find an item in hash_lookup(). But we only
// need to search for a NULL key, thus it's simpler. // need to search for a NULL key, thus it's simpler.
unsigned newi = (unsigned)(olditem->hi_hash & newmask); hash_T newi = olditem->hi_hash & newmask;
hashitem_T *newitem = &newarray[newi]; hashitem_T *newitem = &newarray[newi];
if (newitem->hi_key != NULL) { if (newitem->hi_key != NULL) {
for (hash_T perturb = olditem->hi_hash;; perturb >>= PERTURB_SHIFT) { for (hash_T perturb = olditem->hi_hash;; perturb >>= PERTURB_SHIFT) {