refactor: 去掉不必要的判断

RyanJson/RyanJson.c

@@ -1466,7 +1466,7 @@ uint32_t RyanJsonGetSize(RyanJson_t pJson)
  */
 RyanJson_t RyanJsonGetObjectByIndex(RyanJson_t pJson, uint32_t index)
 {
-	RyanJsonCheckReturnNull(NULL != pJson && index >= 0);
+	RyanJsonCheckReturnNull(NULL != pJson);
 
 	RyanJsonCheckReturnNull(_checkType(RyanJsonGetType(pJson), RyanJsonTypeArray) ||
 				_checkType(RyanJsonGetType(pJson), RyanJsonTypeObject));
@@ -1515,7 +1515,7 @@ RyanJson_t RyanJsonGetObjectByKey(RyanJson_t pJson, const char *key)
  */
 RyanJson_t RyanJsonDetachByIndex(RyanJson_t pJson, uint32_t index)
 {
-	RyanJsonCheckReturnNull(NULL != pJson && index >= 0);
+	RyanJsonCheckReturnNull(NULL != pJson);
 
 	RyanJsonCheckReturnNull(_checkType(RyanJsonGetType(pJson), RyanJsonTypeArray) ||
 				_checkType(RyanJsonGetType(pJson), RyanJsonTypeObject));
@@ -1587,7 +1587,7 @@ RyanJson_t RyanJsonDetachByKey(RyanJson_t pJson, const char *key)
  */
 RyanJsonBool_e RyanJsonDeleteByIndex(RyanJson_t pJson, uint32_t index)
 {
-	RyanJsonCheckReturnFlase(NULL != pJson && index >= 0);
+	RyanJsonCheckReturnFlase(NULL != pJson);
 
 	RyanJson_t nextItem = RyanJsonDetachByIndex(pJson, index);
 	RyanJsonCheckReturnFlase(NULL != nextItem);
@@ -1625,7 +1625,7 @@ RyanJsonBool_e RyanJsonDeleteByKey(RyanJson_t pJson, const char *key)
 RyanJsonBool_e RyanJsonInsert(RyanJson_t pJson, uint32_t index, RyanJson_t item)
 {
 	RyanJsonCheckReturnFlase(NULL != item);
-	RyanJsonCheckCode(NULL != pJson && index >= 0, { goto __exit; });
+	RyanJsonCheckCode(NULL != pJson, { goto __exit; });
 
 	RyanJsonCheckCode(_checkType(RyanJsonGetType(pJson), RyanJsonTypeArray) ||
 				  (_checkType(RyanJsonGetType(pJson), RyanJsonTypeObject) && RyanJsonIsKey(item)),
@@ -1705,7 +1705,7 @@ static RyanJsonBool_e RyanJsonReplaceNode(RyanJson_t prev, RyanJson_t oldItem, R
  */
 RyanJsonBool_e RyanJsonReplaceByIndex(RyanJson_t pJson, uint32_t index, RyanJson_t item)
 {
-	RyanJsonCheckReturnFlase(NULL != pJson && index >= 0 && NULL != item);
+	RyanJsonCheckReturnFlase(NULL != pJson && NULL != item);
 
 	RyanJsonCheckReturnFlase(_checkType(RyanJsonGetType(pJson), RyanJsonTypeArray) ||
 				 _checkType(RyanJsonGetType(pJson), RyanJsonTypeObject));

RyanJson/RyanJsonUtils.c

@@ -39,7 +39,7 @@ RyanJson_t RyanJsonGetObjectByKeys(RyanJson_t pJson, const char *key, ...)
  */
 RyanJson_t RyanJsonGetObjectByIndexs(RyanJson_t pJson, uint32_t index, ...)
 {
-	RyanJsonCheckReturnNull(NULL != pJson && index >= 0);
+	RyanJsonCheckReturnNull(NULL != pJson);
 
 	uint32_t nextIndex = index;
 	RyanJson_t nextItem = RyanJsonGetObjectByIndex(pJson, nextIndex);
@@ -67,7 +67,7 @@ RyanJson_t RyanJsonGetObjectByIndexs(RyanJson_t pJson, uint32_t index, ...)
  */
 RyanJson_t RyanJsonCreateIntArray(const int32_t *numbers, uint32_t count)
 {
-	RyanJsonCheckReturnNull(NULL != numbers && count > 0);
+	RyanJsonCheckReturnNull(NULL != numbers);
 
 	RyanJson_t pJson = RyanJsonCreateArray();
 	for (uint32_t i = 0; pJson && i < count; i++) { RyanJsonAddIntToArray(pJson, numbers[i]); }
@@ -83,7 +83,7 @@ RyanJson_t RyanJsonCreateIntArray(const int32_t *numbers, uint32_t count)
  */
 RyanJson_t RyanJsonCreateDoubleArray(const double *numbers, uint32_t count)
 {
-	RyanJsonCheckReturnNull(NULL != numbers && count > 0);
+	RyanJsonCheckReturnNull(NULL != numbers);
 
 	RyanJson_t pJson = RyanJsonCreateArray();
 	for (uint32_t i = 0; pJson && i < count; i++) { RyanJsonAddDoubleToArray(pJson, numbers[i]); }
@@ -99,7 +99,7 @@ RyanJson_t RyanJsonCreateDoubleArray(const double *numbers, uint32_t count)
  */
 RyanJson_t RyanJsonCreateStringArray(const char **strings, uint32_t count)
 {
-	RyanJsonCheckReturnNull(NULL != strings && count > 0);
+	RyanJsonCheckReturnNull(NULL != strings);
 
 	RyanJson_t pJson = RyanJsonCreateArray();
 	for (uint32_t i = 0; pJson && i < count; i++) { RyanJsonAddStringToArray(pJson, strings[i]); }