wash/bluelib
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

core: hash: rename b_hash_string to avoid conflict with b_string

Browse Source
This commit is contained in:
max 🍓
2025-09-22 10:31:30 +01:00
parent d52992c8ba
commit 4ab524a66b
4 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/hash/hash.c
View File

@@ -41,13 +41,13 @@ static const struct b_hash_function_ops *hash_functions[] = {
static const size_t nr_hash_functions
= sizeof hash_functions / sizeof hash_functions[0];
uint64_t b_hash_string(const char *s)
uint64_t b_hash_cstr(const char *s)
{
size_t x = 0;
return b_hash_string_ex(s, &x);
return b_hash_cstr_ex(s, &x);
}
uint64_t b_hash_string_ex(const char *s, size_t *len)
uint64_t b_hash_cstr_ex(const char *s, size_t *len)
{
uint64_t hash = FNV1_OFFSET_BASIS;
size_t i = 0;

4
core/include/blue/core/hash.h
View File

@@ -97,8 +97,8 @@ typedef struct b_hash_ctx {
} ctx_state;
} b_hash_ctx;
BLUE_API uint64_t b_hash_string(const char *s);
BLUE_API uint64_t b_hash_string_ex(const char *s, size_t *len);
BLUE_API uint64_t b_hash_cstr(const char *s);
BLUE_API uint64_t b_hash_cstr_ex(const char *s, size_t *len);
BLUE_API b_status b_hash_ctx_init(b_hash_ctx *ctx, b_hash_function func);
BLUE_API b_status b_hash_ctx_reset(b_hash_ctx *ctx);

4
core/include/blue/core/rope.h
View File

@@ -24,7 +24,7 @@ struct b_string;
.r_v = { \
.v_cstr = { \
.s = (str), \
.hash = b_hash_string(str), \
.hash = b_hash_cstr(str), \
}, \
}, \
}
@@ -36,7 +36,7 @@ struct b_string;
.r_v = { \
.v_cstr = { \
.s = (str), \
.hash = b_hash_string(str), \
.hash = b_hash_cstr(str), \
}, \
}, \
}

6
core/rope.c
View File

@@ -16,7 +16,7 @@ void b_rope_init_cstr(struct b_rope *rope, const char *s)
{
memset(rope, 0x0, sizeof *rope);
rope->r_flags = B_ROPE_F_CSTR;
rope->r_v.v_cstr.hash = b_hash_string_ex(s, &rope->r_len_total);
rope->r_v.v_cstr.hash = b_hash_cstr_ex(s, &rope->r_len_total);
rope->r_len_left = rope->r_len_total;
char *s2 = malloc(rope->r_len_total + 1);
@@ -36,7 +36,7 @@ void b_rope_init_cstr_borrowed(struct b_rope *rope, const char *s)
memset(rope, 0x0, sizeof *rope);
rope->r_flags = B_ROPE_F_CSTR_BORROWED;
rope->r_v.v_cstr.s = s;
rope->r_v.v_cstr.hash = b_hash_string_ex(s, &rope->r_len_total);
rope->r_v.v_cstr.hash = b_hash_cstr_ex(s, &rope->r_len_total);
rope->r_len_left = rope->r_len_total;
}
@@ -45,7 +45,7 @@ void b_rope_init_cstr_static(struct b_rope *rope, const char *s)
memset(rope, 0x0, sizeof *rope);
rope->r_flags = B_ROPE_F_CSTR_STATIC;
rope->r_v.v_cstr.s = s;
rope->r_v.v_cstr.hash = b_hash_string_ex(s, &rope->r_len_total);
rope->r_v.v_cstr.hash = b_hash_cstr_ex(s, &rope->r_len_total);
rope->r_len_left = rope->r_len_total;
}