X-Git-Url: https://pd.if.org/git/?p=nbds;a=blobdiff_plain;f=struct%2Fnstring.c;fp=struct%2Fnstring.c;h=db35ee1981c71fce1bfe3c5f905646b1608f726e;hp=840c6df88404283cfa346a786eb6aaf2039758ba;hb=f0777b2151019e22458f6f166a8f3c569c32a505;hpb=9b3e566281f7e2ac0683205042796958bfd8939f diff --git a/struct/nstring.c b/struct/nstring.c index 840c6df..db35ee1 100644 --- 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; }