From 8c446f804c24dd9b6e2f11321b7f15ca7210cdba Mon Sep 17 00:00:00 2001 From: William Casarin Date: Mon, 19 Aug 2024 14:35:04 -0700 Subject: [PATCH] nostrdb: filter: retain const variant of get_int_elemnet otherwise rust gets bitchy at as Signed-off-by: William Casarin --- nostrdb/src/nostrdb.c | 16 +++++++++++----- nostrdb/src/nostrdb.h | 3 ++- 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/nostrdb/src/nostrdb.c b/nostrdb/src/nostrdb.c index 3750c231..e4686a57 100644 --- a/nostrdb/src/nostrdb.c +++ b/nostrdb/src/nostrdb.c @@ -650,11 +650,17 @@ ndb_filter_get_string_element(const struct ndb_filter *filter, const struct ndb_ } uint64_t * -ndb_filter_get_int_element(struct ndb_filter_elements *els, int index) +ndb_filter_get_int_element_ptr(struct ndb_filter_elements *els, int index) { return &els->elements[index]; } +uint64_t +ndb_filter_get_int_element(const struct ndb_filter_elements *els, int index) +{ + return els->elements[index]; +} + int ndb_filter_init(struct ndb_filter *filter) { struct cursor cur; @@ -4839,7 +4845,7 @@ static int cursor_push_json_elem_array(struct cursor *cur, return 0; break; case NDB_ELEMENT_INT: - val = *ndb_filter_get_int_element(elems, i); + val = ndb_filter_get_int_element(elems, i); if (!cursor_push_int_str(cur, val)) return 0; break; @@ -4910,19 +4916,19 @@ int ndb_filter_json(const struct ndb_filter *filter, char *buf, int buflen) case NDB_FILTER_SINCE: if (!cursor_push_str(c, "\"since\":")) return 0; - if (!cursor_push_int_str(c, *ndb_filter_get_int_element(elems, 0))) + if (!cursor_push_int_str(c, ndb_filter_get_int_element(elems, 0))) return 0; break; case NDB_FILTER_UNTIL: if (!cursor_push_str(c, "\"until\":")) return 0; - if (!cursor_push_int_str(c, *ndb_filter_get_int_element(elems, 0))) + if (!cursor_push_int_str(c, ndb_filter_get_int_element(elems, 0))) return 0; break; case NDB_FILTER_LIMIT: if (!cursor_push_str(c, "\"limit\":")) return 0; - if (!cursor_push_int_str(c, *ndb_filter_get_int_element(elems, 0))) + if (!cursor_push_int_str(c, ndb_filter_get_int_element(elems, 0))) return 0; break; } diff --git a/nostrdb/src/nostrdb.h b/nostrdb/src/nostrdb.h index c229679e..7f1fba42 100644 --- a/nostrdb/src/nostrdb.h +++ b/nostrdb/src/nostrdb.h @@ -501,7 +501,8 @@ int ndb_filter_from_json(const char *, int len, struct ndb_filter *filter, unsig // getting field elements unsigned char *ndb_filter_get_id_element(const struct ndb_filter *, const struct ndb_filter_elements *, int index); const char *ndb_filter_get_string_element(const struct ndb_filter *, const struct ndb_filter_elements *, int index); -uint64_t *ndb_filter_get_int_element(struct ndb_filter_elements *, int index); +uint64_t ndb_filter_get_int_element(const struct ndb_filter_elements *, int index); +uint64_t *ndb_filter_get_int_element_ptr(struct ndb_filter_elements *, int index); struct ndb_filter_elements *ndb_filter_current_element(const struct ndb_filter *); struct ndb_filter_elements *ndb_filter_get_elements(const struct ndb_filter *, int);