merge JSON fixes from 1.12

pocoproject · Sep 30, 2023 · 8fe335a · 8fe335a
1 parent b9015c4
commit 8fe335a
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 12 deletions.
diff --git a/JSON/include/Poco/JSON/Array.h b/JSON/include/Poco/JSON/Array.h
@@ -46,7 +46,7 @@ class JSON_API Array
 	///    Array::Ptr arr = result.extract<Array::Ptr>();
 	///    Object::Ptr object = arr->getObject(0); // object == {\"test\" : 0}
 	///    int i = object->getElement<int>("test"); // i == 0;
-	///    Object::Ptr subObject = *arr->getObject(1); // subObject == {\"test\" : 0}
+	///    Object::Ptr subObject = arr->getObject(1); // subObject == {\"test\" : 0}
 	///    Array subArr::Ptr = subObject->getArray("test1"); // subArr == [1, 2, 3]
 	///    i = result = subArr->get(0); // i == 1;
 	///

diff --git a/JSON/include/Poco/JSON/Query.h b/JSON/include/Poco/JSON/Query.h
@@ -32,7 +32,7 @@ class JSON_API Query
 {
 public:
 	Query(const Dynamic::Var& source);
-		/// Creates a Query/
+		/// Creates a Query.
 		///
 		/// Source must be JSON Object, Array, Object::Ptr,
 		/// Array::Ptr or empty Var. Any other type will trigger throwing of 

diff --git a/JSON/src/pdjson.c b/JSON/src/pdjson.c
@@ -555,7 +555,7 @@ read_number(json_stream *json, int c)
             json_error(json, "unexpected byte '%c' in number", c);
             return JSON_ERROR;
         }
-    } else if (strchr("123456789", c) != NULL) {
+    } else if (c >= '1' && c <= '9') {
         c = json->source.peek(&json->source);
         if (is_digit(c)) {
             if (read_digits(json) != 0)

diff --git a/JSON/src/pdjson.h b/JSON/src/pdjson.h
@@ -9,12 +9,12 @@
 extern "C" {
 #else
 #if defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 199901L)
-		#include <stdbool.h>
-	#else
-	#ifndef bool
-		#define bool int
-		#define true 1
-		#define false 0
+    #include <stdbool.h>
+#else
+    #ifndef bool
+        #define bool int
+        #define true 1
+        #define false 0
     #endif /* bool */
 #endif /* __STDC_VERSION__ */
 #endif /* __cplusplus */
@@ -33,7 +33,7 @@ struct json_allocator {
     void (*free)(void *);
 };
 
-typedef int (*json_user_io) (void *user);
+typedef int (*json_user_io)(void *user);
 
 typedef struct json_stream json_stream;
 typedef struct json_allocator json_allocator;
@@ -69,8 +69,8 @@ PDJSON_SYMEXPORT bool json_isspace(int c);
 /* internal */
 
 struct json_source {
-    int (*get) (struct json_source *);
-    int (*peek) (struct json_source *);
+    int (*get)(struct json_source *);
+    int (*peek)(struct json_source *);
     size_t position;
     union {
         struct {