From 9c94760f23f51aa4fcbe2607b05b55cd90d04e7d Mon Sep 17 00:00:00 2001
From: Koen Zandberg <koen@bergzand.net>
Date: Fri, 13 Oct 2023 15:13:53 +0200
Subject: [PATCH] decoder: Add dedicated functions for items remaining

This adds two separate functions for retrieving the number of items
remaining in maps and in arrays
---
 include/nanocbor/nanocbor.h | 36 +++++++++++++++++++++++++++++++++++-
 1 file changed, 35 insertions(+), 1 deletion(-)

diff --git a/include/nanocbor/nanocbor.h b/include/nanocbor/nanocbor.h
index 808b517..6ccf7d1 100644
--- a/include/nanocbor/nanocbor.h
+++ b/include/nanocbor/nanocbor.h
@@ -625,12 +625,14 @@ int nanocbor_get_subcbor(nanocbor_value_t *it, const uint8_t **start,
                          size_t *len);
 
 /**
- * @brief Retrieve the number of remaining values is a CBOR container
+ * @brief Retrieve the number of remaining values in a CBOR container: either array or map
  *
  * The returned value is undefined when not inside a container or when the
  * container is of indefinite length. For a map, the number is the full number
  * of CBOR items remaining (twice the number of key/value pairs).
  *
+ * See also nanocbor_array_items_remaining and nanocbor_map_items_remaining
+ *
  * @param[in]   value   value inside a CBOR container
  *
  * @return              number of items remaining
@@ -641,6 +643,38 @@ nanocbor_container_remaining(const nanocbor_value_t *value)
     return value->remaining;
 }
 
+/**
+ * @brief Retrieve the number of remaining items in a CBOR array
+ *
+ * The returned value is undefined when not inside an array or when the
+ * array is of indefinite length.
+ *
+ * @param[in]   value   nanocbor value inside a CBOR array
+ *
+ * @return              number of array items remaining
+ */
+static inline uint32_t
+nanocbor_array_items_remaining(const nanocbor_value_t *value)
+{
+    return nanocbor_container_remaining(value);
+}
+
+/**
+ * @brief Retrieve the number of remaining values in a CBOR map
+ *
+ * The returned value is undefined when not inside a map or when the
+ * container is of indefinite length.
+ *
+ * @param[in]   value   nanocbor value inside a CBOR map
+ *
+ * @return              number of key/value pairs remaining
+ */
+static inline uint32_t
+nanocbor_map_items_remaining(const nanocbor_value_t *value)
+{
+    return nanocbor_container_remaining(value)/2;
+}
+
 /**
  * @brief Check whether a container is an indefinite-length container
  *