Bladeren bron

refactor: 消除编译警告

RyanCW 1 jaar geleden
bovenliggende
commit
108b95822e
1 gewijzigde bestanden met toevoegingen van 4 en 9 verwijderingen
  1. 4 9
      RyanJson/RyanJson.c

+ 4 - 9
RyanJson/RyanJson.c

@@ -32,10 +32,10 @@
         else                                       \
         else                                       \
         {                                          \
         {                                          \
             errCode                                \
             errCode                                \
-        };                                         \
+        }                                          \
     }
     }
 
 
-#define printBufAppend(buf, n) expansion(buf, (n))
+#define printBufAppend(buf, n) expansion(buf, ((uint32_t)(n)))
 #define printBufPutc(buf, c) ((buf)->address[(buf)->end++] = (c))
 #define printBufPutc(buf, c) ((buf)->address[(buf)->end++] = (c))
 #define printBufPuts(buf, s, len)           \
 #define printBufPuts(buf, s, len)           \
     {                                       \
     {                                       \
@@ -141,10 +141,10 @@ static int32_t pow2gt(int32_t x)
  * @param needed
  * @param needed
  * @return RyanJsonBool
  * @return RyanJsonBool
  */
  */
-static RyanJsonBool expansion(printBuffer *buf, int32_t needed)
+static RyanJsonBool expansion(printBuffer *buf, uint32_t needed)
 {
 {
     char *address = NULL;
     char *address = NULL;
-    int32_t size = 0;
+    uint32_t size = 0;
 
 
     if (NULL == buf || NULL == buf->address)
     if (NULL == buf || NULL == buf->address)
         return RyanJsonFalse;
         return RyanJsonFalse;
@@ -1250,11 +1250,6 @@ RyanJson_t RyanJsonParseOptions(const char *text, uint32_t size, RyanJsonBool re
         *return_parse_end = buf.address;
         *return_parse_end = buf.address;
 
 
     return pJson;
     return pJson;
-
-__exit:
-    if (return_parse_end)
-        *return_parse_end = buf.address;
-    return NULL;
 }
 }
 
 
 /**
 /**