Fix (weird) merge conflict
diff --git a/README.md b/README.md
index 708a3a6..38c34a1 100644
--- a/README.md
+++ b/README.md
@@ -169,7 +169,6 @@
## Code Status
The official current release is version 1.4.1 Changes over the last few
-years have been only minor bug fixes, minor feature additions and
documentation improvements. QCBOR 1.x is highly stable.
Work on some larger feature additions is ongoing in "dev" branch.
diff --git a/src/qcbor_decode.c b/src/qcbor_decode.c
index ef28817..646c0d4 100644
--- a/src/qcbor_decode.c
+++ b/src/qcbor_decode.c
@@ -1323,9 +1323,11 @@
QCBORItem *pDecodedItem)
{
QCBORError uReturn;
- int nMajorType = 0;
- uint64_t uArgument = 0;
- int nAdditionalInfo = 0;
+ int nMajorType = 0;
+ uint64_t uArgument = 0;
+ int nAdditionalInfo = 0;
+
+ memset(pDecodedItem, 0, sizeof(QCBORItem));
/* Decode the "head" that every CBOR item has into the major type,
* argument and the additional info.
@@ -1335,8 +1337,6 @@
return uReturn;
}
- memset(pDecodedItem, 0, sizeof(QCBORItem));
-
/* All the functions below get inlined by the optimizer. This code
* is easier to read with them all being similar functions, even if
* some functions don't do much.