Squashed 'libs/ujson4c/' changes from 65d3e3586..6c0831944

6c0831944 add function to return lenght of an array

git-subtree-dir: libs/ujson4c
git-subtree-split: 6c0831944229cadc6948c12833faad999fb6cd47

Author: bpintea

src/ujdecode.c

@@ -75,7 +75,8 @@ typedef struct __ArrayItem
 	Item item;
 	ArrayEntry *head;
 	ArrayEntry *tail;
-} ArrayItem; 
+	int length;
+} ArrayItem;
 
 typedef struct __LongValue
 {
@@ -229,6 +230,7 @@ static void arrayAddItem(void* context, JSOBJ obj, JSOBJ value)
 	}
 	ai->tail = ae;
 
+	ai->length ++;
 }
 
 static JSOBJ newTrue(void* context)
@@ -272,6 +274,7 @@ static JSOBJ newArray(void *context)
 	ArrayItem *ai = (ArrayItem *) alloc(ds, sizeof(ArrayItem));
 	ai->head = NULL;
 	ai->tail = NULL;
+	ai->length = 0;
 	ai->item.type = UJT_Array;
 	return (JSOBJ) ai;
 }
@@ -473,6 +476,15 @@ int UJIterArray(void **iter, UJObject *outObj)
 	return 1;
 }
 
+int UJLengthArray(UJObject arrObj)
+{
+	switch ( ((Item *) arrObj)->type)
+	{
+	case UJT_Array: return ((ArrayItem *) arrObj)->length;
+	default: return -1;
+	}
+}
+
 void *UJBeginObject(UJObject objObj)
 {
 	switch ( ((Item *) objObj)->type)
@@ -688,7 +700,6 @@ int UJObjectUnpack(UJObject objObj, int keys, const char *format, const wchar_t
 	const wchar_t *keyNames[64];
 	UJObject *outValues[64];
 	va_list args;
-	UJObject *outValue;
 
 
   if (!UJIsObject(objObj))
@@ -707,8 +718,7 @@ int UJObjectUnpack(UJObject objObj, int keys, const char *format, const wchar_t
 	for (ki = 0; ki < keys; ki ++)
 	{
 		keyNames[ki] = _keyNames[ki];
-		outValue = va_arg(args, UJObject *);
-		outValues[ki] = outValue;
+		outValues[ki] = va_arg(args, UJObject *);
 	}
 	va_end(args);
 

src/ujdecode.h

@@ -163,6 +163,14 @@ extern "C" {
 	*/
 	int UJIterArray(void **iter, UJObject *outObj);
 
+	/*
+	===============================================================================
+	Returns the count of elements in an array object,
+	or negative if not an array.
+	===============================================================================
+	*/
+	int UJLengthArray(UJObject arrObj);
+
 	/*
 	===============================================================================
 	Called to initiate the iterator of an Object (key-value structure)