diff --git a/src/dat/nbt.c b/src/dat/nbt.c index 934f476..307bab1 100644 --- a/src/dat/nbt.c +++ b/src/dat/nbt.c @@ -7,20 +7,21 @@ #include "../util/compat/endian.h" #include "../util/types.h" -/* returns the string length from a specific location in the buffer */ -static inline u16 nbt_strlen(const u8 *restrict buf) { - return be16toh(*(u16 *)(buf)); -} - /* returns the length of an array from a specific location in the buffer */ static inline i32 nbt_arrlen(const u8 *restrict buf) { return be32toh(*(i32 *)(buf)); } +const u8 *nbt_nexttag(const u8 *restrict buf, u16 naml) { + size_t len = nbt_tagdatlen(buf); + if (!len) return NULL; // TODO: compound tags should be handled here + return buf + naml + len + 3; +} + /* compares the string in `buf` to `matstr`. * returns `=0` if equal, `>0` if buf is greater, `<0` if matstr is greater. */ static int nbt_cmpstr(const char *restrict matstr, const u8 *restrict buf) { - u16 len = nbt_strlen(buf); + u16 len = be16toh(*(u16 *)buf); // allocate and copy bytes char str[len + 1]; @@ -30,14 +31,6 @@ static int nbt_cmpstr(const char *restrict matstr, const u8 *restrict buf) { return strncmp(str, matstr, len); } -/* returns the (expected) pointer of the tag following this one. - * `NULL` is returned if anything went wrong. */ -static const u8 *nbt_nexttag(const u8 *restrict buf, u16 naml) { - size_t len = nbt_tagdatlen(buf); - if (!len) return NULL; // TODO: compound tags should be handled here - return buf + naml + len + 3; -} - // TODO: not actually doing anything /* readies the output data for export, returns the new buffer position, or `NULL` upon an error (may be out of bounds) */ static const u8 *nbt_proctag(const u8 *restrict buf, u16 slen) { @@ -99,9 +92,9 @@ int nbt_proc(struct nbt_path const *restrict pats, uint npats, const u8 *restric memset((void *)cpat, 0, mdpt - 1); // looping through the different tags - const u8 *ptr = buf + nbt_strlen(buf + 1) + 3; + const u8 *ptr = buf + nbt_namelen(buf) + 3; while (ptr < (buf + len) && dpt >= 0) { - u16 naml = nbt_strlen(ptr + 1); + u16 naml = nbt_namelen(ptr); const char *mat = getpat(pats, npats, dpt, (char *)(ptr + 3), naml); cpat[dpt] = mat; @@ -150,7 +143,7 @@ size_t nbt_tagdatlen(const u8 *restrict buf) { case NBT_ARR_I32: mems += sizeof(i32) - sizeof(i8); __attribute__((fallthrough)); case NBT_ARR_I8: return +mems * nbt_arrlen(buf) + 4; - case NBT_STR: return nbt_strlen(buf) + 2; + case NBT_STR: return be16toh(*(u16 *)buf) + 2; case NBT_LIST: mems = nbt_primsize(*buf); diff --git a/src/dat/nbt.h b/src/dat/nbt.h index a013108..3679ca8 100644 --- a/src/dat/nbt.h +++ b/src/dat/nbt.h @@ -2,6 +2,7 @@ // Licensed under the MIT Licence. See LICENSE for details #pragma once +#include #include #include @@ -39,6 +40,16 @@ struct nbt_path { i16 len; // specifies the length of the NBT elements }; +/* returns the name length of a specific tag. `buf` is the pointer to start of the tag */ +atrb_pure atrb_nonnull(1) static inline u16 nbt_namelen(const u8 *restrict buf) { + assert(*buf != NBT_END); + return be16toh(*(u16 *)(buf + 1)); +} + +/* returns the (expected) pointer of the tag following this one. + * `NULL` is returned if anything went wrong. */ +atrb_pure atrb_nonnull(1) const u8 *nbt_nexttag(const u8 *restrict buf, u16 naml); + /* checks whether the tag is a primitive data tag. (not recommended for filtering tags, use a `switch`) * returns a boolean value. */ atrb_const int nbt_isprim(u8 tag);