2000-08-10
2000-08-10 17:57:17 by Henrik Grubbström (Grubba) <grubba@grubba.org>
-
d3b06ff2f69cacc84d3796aefbbb9460ecfd56fe
(31 lines)
(+16/-15)
[
Show
| Annotate
]
Branch: 7.9
Fixed a few warnings.
Rev: src/program.c:1.258
Rev: src/stralloc.c:1.93
Rev: src/stralloc.h:1.52
25:
#define HUGE HUGE_VAL
#endif /*!HUGE*/
- RCSID("$Id: stralloc.c,v 1.92 2000/08/10 08:41:30 grubba Exp $");
+ RCSID("$Id: stralloc.c,v 1.93 2000/08/10 17:57:04 grubba Exp $");
#define BEGIN_HASH_SIZE 997
#define MAX_AVG_LINK_LENGTH 3
47:
#define StrHash(s,len) low_do_hash(s,len,0)
- static unsigned int low_do_hash(const void *s, int len, int size_shift)
+ static unsigned int low_do_hash(const void *s, ptrdiff_t len, int size_shift)
{
full_hash_value=hashmem(s,len<<size_shift,HASH_PREFIX<<size_shift);
return full_hash_value % htable_size;
59:
}
- static INLINE int find_magnitude1(const unsigned INT16 *s, int len)
+ static INLINE int find_magnitude1(const unsigned INT16 *s, ptrdiff_t len)
{
while(--len>=0)
if(s[len]>=256)
67:
return 0;
}
- static INLINE int find_magnitude2(const unsigned INT32 *s, int len)
+ static INLINE int find_magnitude2(const unsigned INT32 *s, ptrdiff_t len)
{
while(--len>=0)
{
161:
CONVERT(2,1)
- PMOD_EXPORT int generic_compare_strings(const void *a,int alen, int asize,
- const void *b,int blen, int bsize)
+ PMOD_EXPORT int generic_compare_strings(const void *a, ptrdiff_t alen, int asize,
+ const void *b, ptrdiff_t blen, int bsize)
{
#define TWO_SIZES(X,Y) (((X)<<2)+(Y))
if(alen != blen) return 0;
181:
PMOD_EXPORT void generic_memcpy(PCHARP to,
PCHARP from,
- int len)
+ ptrdiff_t len)
{
#ifdef PIKE_DEBUG
if(len<0)
285:
* This assumes that the string is minimized!!!!
*/
static struct pike_string *internal_findstring(const char *s,
- int len,
+ ptrdiff_t len,
int size_shift,
int h)
{
444: Inside #if undefined(HASH_PREFIX)
/* This could in theory have a pretty ugly complexity */
/* /Hubbe
*/
- unsigned INT32 save_full_hash_value=full_hash_value;
+ size_t save_full_hash_value = full_hash_value;
need_more_hash_prefix=0;
HASH_PREFIX=HASH_PREFIX*2;
456: Inside #if undefined(HASH_PREFIX)
base_table[h]=0;
while(tmp)
{
- unsigned int h2;
+ size_t h2;
struct pike_string *tmp2=tmp; /* First unlink */
tmp=tmp2->next;
493:
*/
PMOD_EXPORT struct pike_string *low_end_shared_string(struct pike_string *s)
{
- int len,h;
+ ptrdiff_t len, h;
struct pike_string *s2;
- len=s->len;
- h=do_hash(s);
- s2=internal_findstring(s->str,len,s->size_shift,h);
+ len = s->len;
+ h = do_hash(s);
+ s2 = internal_findstring(s->str,len,s->size_shift,h);
#ifdef PIKE_DEBUG
if(s2==s)
fatal("end_shared_string called twice! (or something like that)\n");