tyiu/damus
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

nostrdb: filter: retain const variant of get_int_elemnet

Browse Source 
otherwise rust gets bitchy at as

Signed-off-by: William Casarin <jb55@jb55.com>
This commit is contained in:
William Casarin
2024-08-19 14:35:04 -07:00
committed by Daniel D’Aquino
parent e92018aee5
commit 8c446f804c
2 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
nostrdb/src/nostrdb.c
View File

@@ -650,11 +650,17 @@ ndb_filter_get_string_element(const struct ndb_filter *filter, const struct ndb_
} }
uint64_t * 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]; 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) int ndb_filter_init(struct ndb_filter *filter)
{ {
struct cursor cur; struct cursor cur;
@@ -4839,7 +4845,7 @@ static int cursor_push_json_elem_array(struct cursor *cur,
return 0; return 0;
break; break;
case NDB_ELEMENT_INT: 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)) if (!cursor_push_int_str(cur, val))
return 0; return 0;
break; break;
@@ -4910,19 +4916,19 @@ int ndb_filter_json(const struct ndb_filter *filter, char *buf, int buflen)
case NDB_FILTER_SINCE: case NDB_FILTER_SINCE:
if (!cursor_push_str(c, "\"since\":")) if (!cursor_push_str(c, "\"since\":"))
return 0; 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; return 0;
break; break;
case NDB_FILTER_UNTIL: case NDB_FILTER_UNTIL:
if (!cursor_push_str(c, "\"until\":")) if (!cursor_push_str(c, "\"until\":"))
return 0; 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; return 0;
break; break;
case NDB_FILTER_LIMIT: case NDB_FILTER_LIMIT:
if (!cursor_push_str(c, "\"limit\":")) if (!cursor_push_str(c, "\"limit\":"))
return 0; 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; return 0;
break; break;
} }

3
nostrdb/src/nostrdb.h
View File

@@ -501,7 +501,8 @@ int ndb_filter_from_json(const char *, int len, struct ndb_filter *filter, unsig
// getting field elements // getting field elements
unsigned char *ndb_filter_get_id_element(const struct ndb_filter *, const struct ndb_filter_elements *, int index); 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); 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_current_element(const struct ndb_filter *);
struct ndb_filter_elements *ndb_filter_get_elements(const struct ndb_filter *, int); struct ndb_filter_elements *ndb_filter_get_elements(const struct ndb_filter *, int);