Skip to content

Commit

Permalink
updated for version 7.3.740
Browse files Browse the repository at this point in the history
Problem:    IOC tool complains about undefined behavior for int.
Solution:   Change to unsigned int. (Dominique Pelle)
  • Loading branch information
brammool committed Nov 28, 2012
1 parent e818fc7 commit bd47063
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 8 deletions.
12 changes: 6 additions & 6 deletions src/hashtab.c
Expand Up @@ -138,7 +138,7 @@ hash_lookup(ht, key, hash)
hash_T perturb;
hashitem_T *freeitem;
hashitem_T *hi;
int idx;
unsigned idx;

#ifdef HT_DEBUG
++hash_count_lookup;
Expand All @@ -150,7 +150,7 @@ hash_lookup(ht, key, hash)
* - skip over a removed item
* - return if the item matches
*/
idx = (int)(hash & ht->ht_mask);
idx = (unsigned)(hash & ht->ht_mask);
hi = &ht->ht_array[idx];

if (hi->hi_key == NULL)
Expand All @@ -176,7 +176,7 @@ hash_lookup(ht, key, hash)
#ifdef HT_DEBUG
++hash_count_perturb; /* count a "miss" for hashtab lookup */
#endif
idx = (int)((idx << 2) + idx + perturb + 1);
idx = (unsigned)((idx << 2U) + idx + perturb + 1U);
hi = &ht->ht_array[idx & ht->ht_mask];
if (hi->hi_key == NULL)
return freeitem == NULL ? hi : freeitem;
Expand Down Expand Up @@ -342,7 +342,7 @@ hash_may_resize(ht, minitems)
hashitem_T temparray[HT_INIT_SIZE];
hashitem_T *oldarray, *newarray;
hashitem_T *olditem, *newitem;
int newi;
unsigned newi;
int todo;
long_u oldsize, newsize;
long_u minsize;
Expand Down Expand Up @@ -448,13 +448,13 @@ hash_may_resize(ht, minitems)
* the algorithm to find an item in hash_lookup(). But we only
* need to search for a NULL key, thus it's simpler.
*/
newi = (int)(olditem->hi_hash & newmask);
newi = (unsigned)(olditem->hi_hash & newmask);
newitem = &newarray[newi];

if (newitem->hi_key != NULL)
for (perturb = olditem->hi_hash; ; perturb >>= PERTURB_SHIFT)
{
newi = (int)((newi << 2) + newi + perturb + 1);
newi = (unsigned)((newi << 2U) + newi + perturb + 1U);
newitem = &newarray[newi & newmask];
if (newitem->hi_key == NULL)
break;
Expand Down
4 changes: 2 additions & 2 deletions src/misc2.c
Expand Up @@ -3860,7 +3860,7 @@ static ulg keys[3]; /* keys defining the pseudo-random sequence */
ush temp; \
\
temp = (ush)keys[2] | 2; \
t = (int)(((unsigned)(temp * (temp ^ 1)) >> 8) & 0xff); \
t = (int)(((unsigned)(temp * (temp ^ 1U)) >> 8) & 0xff); \
}

/*
Expand Down Expand Up @@ -4002,7 +4002,7 @@ crypt_decode(ptr, len)
ush temp;

temp = (ush)keys[2] | 2;
temp = (int)(((unsigned)(temp * (temp ^ 1)) >> 8) & 0xff);
temp = (int)(((unsigned)(temp * (temp ^ 1U)) >> 8) & 0xff);
UPDATE_KEYS_ZIP(*p ^= temp);
}
else
Expand Down
2 changes: 2 additions & 0 deletions src/version.c
Expand Up @@ -725,6 +725,8 @@ static char *(features[]) =

static int included_patches[] =
{ /* Add new patch number below this line */
/**/
740,
/**/
739,
/**/
Expand Down

0 comments on commit bd47063

Please sign in to comment.