Skip to content

Make all keys 'const char*' in function calls #2

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

Open
Hrubon wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Make all keys 'const char*' in function calls #2

Show file tree
Hide file tree
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
14 changes: 7 additions & 7 deletions ctrie.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ static char *get_label(struct ctnode *n)
* will be copied into the `label` field of the node. If it's longer, create
* a copy of the string given using `strdup`.
*/
static void set_label(struct ctnode *n, char *label)
static void set_label(struct ctnode *n, const char *label)
{
char *old_label = get_label(n);
bool need_free = (n->flags & F_SEPL);
Expand Down Expand Up @@ -221,7 +221,7 @@ void ctrie_free(struct ctrie *t)
* grand-parent of modified node, this seems reasonable.
*/
static inline struct ctnode *find3(struct ctrie *t,
char *key,
const char *key,
struct ctnode **pp,
size_t *ppi,
struct ctnode **p,
Expand Down Expand Up @@ -270,20 +270,20 @@ static inline struct ctnode *find3(struct ctrie *t,
return w;
}

static struct ctnode *find(struct ctrie *t, char *key)
static struct ctnode *find(struct ctrie *t, const char *key)
{
struct ctnode *p, *pp;
size_t pi, ppi;
return find3(t, key, &pp, &ppi, &p, &pi);
}

void *ctrie_find(struct ctrie *t, char *key)
void *ctrie_find(struct ctrie *t, const char *key)
{
struct ctnode *n = find(t, key);
return n ? data(t, n) : NULL;
}

bool ctrie_contains(struct ctrie *t, char *key)
bool ctrie_contains(struct ctrie *t, const char *key)
{
return find(t, key) != NULL;
}
Expand Down Expand Up @@ -316,7 +316,7 @@ void ctrie_dump(struct ctrie *t)
ctrie_print_node(t, t->fake_root->child[0], 0);
}

void *ctrie_insert(struct ctrie *t, char *key, bool wildcard)
void *ctrie_insert(struct ctrie *t, const char *key, bool wildcard)
{
/* TODO assert key not empty */
struct ctnode *n = t->fake_root->child[0], *parent = t->fake_root;
Expand Down Expand Up @@ -386,7 +386,7 @@ void cut(struct ctrie *t, struct ctnode *n, struct ctnode *p, size_t pi)
free(n);
}

int ctrie_remove(struct ctrie *t, char *key)
int ctrie_remove(struct ctrie *t, const char *key)
{
struct ctnode *pp, *p;
size_t ppi, pi;
Expand Down
8 changes: 4 additions & 4 deletions ctrie.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,12 +32,12 @@ void ctrie_init(struct ctrie *t, size_t data_size);
* Find node with key `key` and return it. If the key is not present in `t`,
* return `NULL`.
*/
void *ctrie_find(struct ctrie *t, char *key);
void *ctrie_find(struct ctrie *t, const char *key);

/*
* Does the trie `t` contain the string `key`?
*/
bool ctrie_contains(struct ctrie *t, char *key);
bool ctrie_contains(struct ctrie *t, const char *key);

/*
* Insert the key `key` into the trie `t` and return a pointer to the memory
Expand All @@ -47,12 +47,12 @@ bool ctrie_contains(struct ctrie *t, char *key);
* The `wildcard` argument denotes whether the key should be treated as a prefix
* wildcard.
*/
void *ctrie_insert(struct ctrie *t, char *key, bool wildcard);
void *ctrie_insert(struct ctrie *t, const char *key, bool wildcard);

/*
* Remove the key `key` from the trie `t`.
*/
int ctrie_remove(struct ctrie *t, char *key);
int ctrie_remove(struct ctrie *t, const char *key);

/*
* Print a textual representation of the trie. Useful for debugging only.
Expand Down