generalize list into an updatable list-based map

[nbds] / struct / nstring.c

diff --git a/struct/nstring.c b/struct/nstring.c
index 840c6df88404283cfa346a786eb6aaf2039758ba..db35ee1981c71fce1bfe3c5f905646b1608f726e 100644 (file)
--- a/struct/nstring.c
+++ b/struct/nstring.c
@@ -2,11 +2,6 @@
 #include "nstring.h"
 #include "mem.h"
 
-struct nstring {
-    uint32_t len;
-    char data[];
-};
-
 nstring_t *ns_alloc (const void *data, uint32_t len) {
     nstring_t *ns = nbd_malloc(sizeof(nstring_t) + len);
     ns->len = len;
@@ -15,10 +10,6 @@ nstring_t *ns_alloc (const void *data, uint32_t len) {
 }
 
 int ns_cmp_raw (nstring_t *ns, const void *data, uint32_t len) {
-    int rc = memcmp(ns->data, data, (len < ns->len) ? len : ns->len);
-    return (rc == 0) ? ns->len - len : rc;
+    int d = memcmp(ns->data, data, (len < ns->len) ? len : ns->len);
+    return (d == 0) ? ns->len - len : d;
 }
-
-const void *ns_data (nstring_t *ns) { return ns->data; }
-
-uint64_t    ns_len  (nstring_t *ns) { return ns->len; }