mirror of
https://github.com/boostorg/build.git
synced 2026-02-14 00:32:11 +00:00
Fix type equivalence warnings, and possible errors.
[SVN r38010]
This commit is contained in:
@@ -1147,7 +1147,7 @@ compile_set(
|
||||
LIST *nt = parse_evaluate( parse->left, frame );
|
||||
LIST *ns = parse_evaluate( parse->right, frame );
|
||||
LIST *l;
|
||||
char *trace;
|
||||
const char *trace;
|
||||
int setflag = assign_var_mode( parse->num, &trace );
|
||||
|
||||
if( DEBUG_COMPILE )
|
||||
@@ -1240,7 +1240,7 @@ compile_settings(
|
||||
LIST *ns = parse_evaluate( parse->third, frame );
|
||||
LIST *targets = parse_evaluate( parse->right, frame );
|
||||
LIST *ts;
|
||||
char *trace;
|
||||
const char *trace;
|
||||
int setflag = assign_var_mode( parse->num, &trace );
|
||||
|
||||
if( DEBUG_COMPILE )
|
||||
|
||||
@@ -96,8 +96,9 @@ static void hash_mem_free(size_t datalen, void * data);
|
||||
static void hash_mem_finalizer(char * key, struct hash * hp);
|
||||
#endif
|
||||
|
||||
static unsigned int hash_keyval( const unsigned char * key )
|
||||
static unsigned int hash_keyval( const char * key_ )
|
||||
{
|
||||
const unsigned char * key = (const unsigned char *)key_;
|
||||
unsigned int keyval = *key;
|
||||
while( *key )
|
||||
keyval = keyval * 2147059363 + *key++;
|
||||
@@ -114,7 +115,7 @@ static unsigned int hash_keyval( const unsigned char * key )
|
||||
static ITEM * hash_search(
|
||||
struct hash *hp,
|
||||
unsigned int keyval,
|
||||
const unsigned char * keydata,
|
||||
const char * keydata,
|
||||
ITEM ** previous )
|
||||
{
|
||||
ITEM * i = *hash_bucket(hp,keyval);
|
||||
@@ -150,9 +151,9 @@ hash_free(
|
||||
{
|
||||
ITEM * i = 0;
|
||||
ITEM * prev = 0;
|
||||
unsigned int keyval = hash_keyval((unsigned char*)data->key);
|
||||
unsigned int keyval = hash_keyval(data->key);
|
||||
|
||||
i = hash_search( hp, keyval, (unsigned char*)data->key, &prev );
|
||||
i = hash_search( hp, keyval, data->key, &prev );
|
||||
if (i)
|
||||
{
|
||||
/* mark it free so we skip it during enumeration */
|
||||
@@ -182,7 +183,7 @@ hashitem(
|
||||
int enter )
|
||||
{
|
||||
register ITEM *i;
|
||||
unsigned char *b = (unsigned char*)(*data)->key;
|
||||
char *b = (*data)->key;
|
||||
unsigned int keyval = hash_keyval(b);
|
||||
|
||||
#ifdef HASH_DEBUG_PROFILE
|
||||
@@ -203,7 +204,7 @@ hashitem(
|
||||
return 0;
|
||||
}
|
||||
|
||||
i = hash_search( hp, keyval, (unsigned char*)(*data)->key, 0 );
|
||||
i = hash_search( hp, keyval, (*data)->key, 0 );
|
||||
if (i)
|
||||
{
|
||||
*data = &i->data;
|
||||
|
||||
Reference in New Issue
Block a user