Skip to content

Rename strhash to strhash_djb2 and use size_t #42

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
daboehme merged 1 commit into from
Sep 23, 2025
Merged

Rename strhash to strhash_djb2 and use size_t #42

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions src/adiak.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ static int measure_walltime();
static int measure_systime();
static int measure_cputime();

static unsigned long strhash(const char*);
static size_t strhash_djb2(const char*);
static record_list_t* find_record_by_name(const char* str);

#define MAX_PATH_LEN 4096
Expand Down Expand Up @@ -942,8 +942,8 @@ static adiak_datatype_t *parse_typestr_helper(const char *typestr, int typestr_s
return NULL;
}

static unsigned long strhash(const char *str) {
unsigned long hash = 5381;
static size_t strhash_djb2(const char *str) {
size_t hash = 5381;
int c;
while ((c = *str++))
hash = ((hash << 5) + hash) + c;
Expand All @@ -961,7 +961,7 @@ static record_list_t* find_record_by_name(const char* name)
adiak_t* adiak_config = adiak_get_config();
record_list_t** record_hash = get_record_hash_list(adiak_config);

unsigned long hashval = strhash(name) % RECORD_HASH_SIZE;
size_t hashval = strhash_djb2(name) % RECORD_HASH_SIZE;
for (rec = record_hash[hashval]; rec != NULL; rec = rec->hash_next) {
if (strcmp(rec->name, name) == 0)
break;
Expand All @@ -975,12 +975,12 @@ static record_list_t* record_nameval(const char *name, int category, const char
{
record_list_t *addrecord = NULL, *i;
int newrecord = 0;
unsigned long hashval = 0;
size_t hashval = 0;

adiak_t* adiak_config = adiak_get_config();
record_list_t** record_hash = get_record_hash_list(adiak_config);

hashval = strhash(name) % RECORD_HASH_SIZE;
hashval = strhash_djb2(name) % RECORD_HASH_SIZE;
for (i = record_hash[hashval]; i != NULL; i = i->hash_next) {
if (strcmp(i->name, name) == 0) {
addrecord = i;
Expand Down