aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorLibravatar vnugent <public@vaughnnugent.com>2024-08-12 13:57:11 -0400
committerLibravatar vnugent <public@vaughnnugent.com>2024-08-12 13:57:11 -0400
commitfa5e809f465fc25d2872fe85983632b77f290062 (patch)
treee2ffc7daee461ae0946763e3227dfd801f087359 /src
parentfb3608b9455b3e0956e401e6254da13cebd71558 (diff)
Squashed commit of the following:v0.1.3
commit a6392806eae7f302031afbcf22664ba33cbc4ad1 Author: vnugent <public@vaughnnugent.com> Date: Mon Aug 12 13:56:03 2024 -0400 simple cleanup & some api notes commit a97012676cc836ec50ef5ff6d8e97134aa7a1d22 Merge: ec7461d fb3608b Author: vnugent <public@vaughnnugent.com> Date: Wed Aug 7 21:39:28 2024 -0400 Merge branch 'master' into develop
Diffstat (limited to 'src')
-rw-r--r--src/nc-util.h19
1 files changed, 12 insertions, 7 deletions
diff --git a/src/nc-util.h b/src/nc-util.h
index a248578..36d26de 100644
--- a/src/nc-util.h
+++ b/src/nc-util.h
@@ -193,13 +193,10 @@ static _nc_fn_inline void ncSpanWrite(span_t span, uint32_t offset, const uint8_
static _nc_fn_inline void ncSpanAppend(span_t span, uint32_t* offset, const uint8_t* data, uint32_t size)
{
- DEBUG_ASSERT2(ncSpanIsValid(span), "Expected span to be non-null")
DEBUG_ASSERT2(offset != NULL, "Expected offset to be non-null")
- DEBUG_ASSERT2(data != NULL, "Expected data to be non-null")
- DEBUG_ASSERT2(*offset + size <= span.size, "Expected offset + size to be less than span size")
- /* Copy data to span */
- MEMMOV(span.data + *offset, data, size);
+ /* Copy data to span (also performs argument assertions) */
+ ncSpanWrite(span, *offset, data, size);
/* Increment offset */
*offset += size;
@@ -213,7 +210,11 @@ static _nc_fn_inline span_t ncSpanSlice(span_t span, uint32_t offset, uint32_t s
DEBUG_ASSERT2(offset + size <= span.size, "Expected offset + size to be less than span size")
/* Initialize slice, offset input data by the specified offset */
- ncSpanInit(&slice, span.data + offset, size);
+ ncSpanInit(
+ &slice,
+ ncSpanGetOffset(span, offset),
+ size
+ );
return slice;
}
@@ -226,7 +227,11 @@ static _nc_fn_inline cspan_t ncSpanSliceC(cspan_t span, uint32_t offset, uint32_
DEBUG_ASSERT2(offset + size <= span.size, "Expected offset + size to be less than span size")
/* Initialize slice, offset input data by the specified offset */
- ncSpanInitC(&slice, span.data + offset, size);
+ ncSpanInitC(
+ &slice,
+ ncSpanGetOffsetC(span, offset),
+ size
+ );
return slice;
}