Fixed warnings

This commit is contained in:
Joseph Kogut 2011-07-24 15:32:47 -07:00
parent 189bb42923
commit 69f9c32ff6
4 changed files with 11 additions and 11 deletions

View file

@ -30,7 +30,7 @@ void destroy_htab(tvm_htab_t* htab)
htab = NULL;
}
int htab_add(tvm_htab_t* htab, char* k, int v)
int htab_add(tvm_htab_t* htab, const char* k, int v)
{
int hash = htab_hash(k);
@ -46,7 +46,7 @@ int htab_add(tvm_htab_t* htab, char* k, int v)
return 0;
}
int htab_find(tvm_htab_t* htab, char* key)
int htab_find(tvm_htab_t* htab, const char* key)
{
int hash = htab_hash(key);
@ -54,11 +54,11 @@ int htab_find(tvm_htab_t* htab, char* key)
else return -1;
}
unsigned int htab_hash(char* k)
unsigned int htab_hash(const char* k)
{
unsigned int hash = 1;
char* c; for(c = k; *c; c++)
char* c; for(c = (char*)k; *c; c++)
hash += (hash << *c) - *c;
return hash % HTAB_SIZE;

View file

@ -19,9 +19,9 @@ typedef struct tvm_htab_s
tvm_htab_t* create_htab();
void destroy_htab(tvm_htab_t* htab);
int htab_add(tvm_htab_t* htab, char* key, int value);
int htab_find(tvm_htab_t* htab, char* key);
int htab_add(tvm_htab_t* htab, const char* key, int value);
int htab_find(tvm_htab_t* htab, const char* key);
unsigned int htab_hash(char* key);
unsigned int htab_hash(const char* key);
#endif

View file

@ -63,8 +63,8 @@ int interpret_program(tvm_program_t* p, char* filename, tvm_memory_t* pMemory)
p->args = (int***)realloc(p->args, sizeof(int**) * (p->num_instructions + 1));
p->args[p->num_instructions] = (int**)calloc(MAX_ARGS, sizeof(int*));
parse_labels(p, (const char*)lexer->tokens[i]);
parse_instructions(p, (const char*)lexer->tokens[i], pMemory);
parse_labels(p, (const char**)lexer->tokens[i]);
parse_instructions(p, (const char**)lexer->tokens[i], pMemory);
i++;
}
@ -217,7 +217,7 @@ int* add_value(tvm_program_t* p, const int val)
return p->values[p->num_values++];
}
int parse_value(char* str)
int parse_value(const char* str)
{
char* delimiter = strchr(str, ':');
int base = 0;

View file

@ -34,6 +34,6 @@ int interpret_program(tvm_program_t* p, char* filename, tvm_memory_t* pMemory);
void destroy_program(tvm_program_t* p);
int* add_value(tvm_program_t* p, const int val);
int parse_value(char* str);
int parse_value(const char* str);
#endif