summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--include/apr_json.h24
-rw-r--r--json/apr_json.c106
-rw-r--r--json/apr_json_decode.c4
-rw-r--r--test/testjson.c6
4 files changed, 70 insertions, 70 deletions
diff --git a/include/apr_json.h b/include/apr_json.h
index 91b7316f6..6850feccd 100644
--- a/include/apr_json.h
+++ b/include/apr_json.h
@@ -178,8 +178,8 @@ APR_DECLARE(apr_json_value_t *) apr_json_value_create(apr_pool_t *pool)
* @return The apr_json_value_t structure.
*/
APR_DECLARE(apr_json_value_t *)
- apr_json_string_create(apr_pool_t *pool, const char *val,
- apr_ssize_t len) __attribute__((nonnull(1)));
+ apr_json_string_create(apr_pool_t *pool, const char *val,
+ apr_ssize_t len) __attribute__((nonnull(1)));
/**
* Allocate and return a JSON array.
@@ -189,8 +189,8 @@ APR_DECLARE(apr_json_value_t *)
* @return The apr_json_value_t structure.
*/
APR_DECLARE(apr_json_value_t *)
- apr_json_array_create(apr_pool_t *pool, int nelts)
- __attribute__((nonnull(1)));
+ apr_json_array_create(apr_pool_t *pool, int nelts)
+ __attribute__((nonnull(1)));
/**
* Allocate and return a JSON object.
@@ -209,8 +209,8 @@ APR_DECLARE(apr_json_value_t *) apr_json_object_create(apr_pool_t *pool)
* @return The apr_json_value_t structure.
*/
APR_DECLARE(apr_json_value_t *)
- apr_json_long_create(apr_pool_t *pool, apr_int64_t lnumber)
- __attribute__((nonnull(1)));
+ apr_json_long_create(apr_pool_t *pool, apr_int64_t lnumber)
+ __attribute__((nonnull(1)));
/**
* Allocate and return a JSON double.
@@ -220,8 +220,8 @@ APR_DECLARE(apr_json_value_t *)
* @return The apr_json_value_t structure.
*/
APR_DECLARE(apr_json_value_t *)
- apr_json_double_create(apr_pool_t *pool, double dnumber)
- __attribute__((nonnull(1)));
+ apr_json_double_create(apr_pool_t *pool, double dnumber)
+ __attribute__((nonnull(1)));
/**
* Allocate and return a JSON boolean.
@@ -231,8 +231,8 @@ APR_DECLARE(apr_json_value_t *)
* @return The apr_json_value_t structure.
*/
APR_DECLARE(apr_json_value_t *)
- apr_json_boolean_create(apr_pool_t *pool, int boolean)
- __attribute__((nonnull(1)));
+ apr_json_boolean_create(apr_pool_t *pool, int boolean)
+ __attribute__((nonnull(1)));
/**
* Allocate and return a JSON null.
@@ -241,8 +241,8 @@ APR_DECLARE(apr_json_value_t *)
* @return The apr_json_value_t structure.
*/
APR_DECLARE(apr_json_value_t *)
- apr_json_null_create(apr_pool_t *pool)
- __attribute__((nonnull(1)));
+ apr_json_null_create(apr_pool_t *pool)
+ __attribute__((nonnull(1)));
/**
* Associate a value with a key in a JSON object.
diff --git a/json/apr_json.c b/json/apr_json.c
index ebae3d92d..c7a6efee2 100644
--- a/json/apr_json.c
+++ b/json/apr_json.c
@@ -32,12 +32,12 @@ apr_json_value_t *apr_json_value_create(apr_pool_t *pool)
apr_json_value_t *apr_json_object_create(apr_pool_t *pool)
{
- apr_json_object_t *object;
+ apr_json_object_t *object;
- apr_json_value_t *json = apr_json_value_create(pool);
+ apr_json_value_t *json = apr_json_value_create(pool);
- json->type = APR_JSON_OBJECT;
- json->value.object = object = apr_pcalloc(pool, sizeof(apr_json_object_t));
+ json->type = APR_JSON_OBJECT;
+ json->value.object = object = apr_pcalloc(pool, sizeof(apr_json_object_t));
APR_RING_INIT(&object->list, apr_json_kv_t, link);
object->hash = apr_hash_make(pool);
@@ -45,80 +45,80 @@ apr_json_value_t *apr_json_object_create(apr_pool_t *pool)
}
apr_json_value_t *apr_json_string_create(apr_pool_t *pool, const char *val,
- apr_ssize_t len) {
- apr_json_value_t *json = apr_json_value_create(pool);
-
- if (json) {
- if (val) {
- json->type = APR_JSON_STRING;
- json->value.string.p = val;
- json->value.string.len = len;
- } else {
- json->type = APR_JSON_NULL;
- }
- }
-
- return json;
+ apr_ssize_t len) {
+ apr_json_value_t *json = apr_json_value_create(pool);
+
+ if (json) {
+ if (val) {
+ json->type = APR_JSON_STRING;
+ json->value.string.p = val;
+ json->value.string.len = len;
+ } else {
+ json->type = APR_JSON_NULL;
+ }
+ }
+
+ return json;
}
apr_json_value_t *apr_json_array_create(apr_pool_t *pool, int nelts)
{
- apr_json_value_t *json = apr_json_value_create(pool);
+ apr_json_value_t *json = apr_json_value_create(pool);
- if (json) {
- json->type = APR_JSON_ARRAY;
- json->value.array = apr_array_make(pool, nelts,
- sizeof(apr_json_value_t *));
- }
+ if (json) {
+ json->type = APR_JSON_ARRAY;
+ json->value.array = apr_array_make(pool, nelts,
+ sizeof(apr_json_value_t *));
+ }
- return json;
+ return json;
}
apr_json_value_t *apr_json_long_create(apr_pool_t *pool, apr_int64_t lnumber)
{
- apr_json_value_t *json = apr_json_value_create(pool);
+ apr_json_value_t *json = apr_json_value_create(pool);
- if (json) {
- json->type = APR_JSON_LONG;
- json->value.lnumber = lnumber;
- }
+ if (json) {
+ json->type = APR_JSON_LONG;
+ json->value.lnumber = lnumber;
+ }
- return json;
+ return json;
}
apr_json_value_t *apr_json_double_create(apr_pool_t *pool, double dnumber)
{
- apr_json_value_t *json = apr_json_value_create(pool);
+ apr_json_value_t *json = apr_json_value_create(pool);
- if (json) {
- json->type = APR_JSON_DOUBLE;
- json->value.lnumber = dnumber;
- }
+ if (json) {
+ json->type = APR_JSON_DOUBLE;
+ json->value.lnumber = dnumber;
+ }
- return json;
+ return json;
}
apr_json_value_t *apr_json_boolean_create(apr_pool_t *pool, int boolean)
{
- apr_json_value_t *json = apr_json_value_create(pool);
+ apr_json_value_t *json = apr_json_value_create(pool);
- if (json) {
- json->type = APR_JSON_BOOLEAN;
- json->value.boolean = boolean;
- }
+ if (json) {
+ json->type = APR_JSON_BOOLEAN;
+ json->value.boolean = boolean;
+ }
- return json;
+ return json;
}
apr_json_value_t *apr_json_null_create(apr_pool_t *pool)
{
- apr_json_value_t *json = apr_json_value_create(pool);
+ apr_json_value_t *json = apr_json_value_create(pool);
- if (json) {
- json->type = APR_JSON_NULL;
- }
+ if (json) {
+ json->type = APR_JSON_NULL;
+ }
- return json;
+ return json;
}
apr_status_t apr_json_object_set(apr_json_value_t *object, apr_json_value_t *key,
@@ -127,12 +127,12 @@ apr_status_t apr_json_object_set(apr_json_value_t *object, apr_json_value_t *key
apr_json_kv_t *kv;
apr_hash_t *hash;
- if (object->type != APR_JSON_OBJECT || !key
- || key->type != APR_JSON_STRING) {
- return APR_EINVAL;
- }
+ if (object->type != APR_JSON_OBJECT || !key
+ || key->type != APR_JSON_STRING) {
+ return APR_EINVAL;
+ }
- hash = object->value.object->hash;
+ hash = object->value.object->hash;
kv = apr_hash_get(hash, key->value.string.p, key->value.string.len);
diff --git a/json/apr_json_decode.c b/json/apr_json_decode.c
index 0e0fa4d3d..c5ce25f4b 100644
--- a/json/apr_json_decode.c
+++ b/json/apr_json_decode.c
@@ -439,8 +439,8 @@ static apr_status_t apr_json_decode_object(apr_json_scanner_t * self,
{
apr_status_t status = APR_SUCCESS;
- apr_json_object_t *object = apr_pcalloc(self->pool,
- sizeof(apr_json_object_t));
+ apr_json_object_t *object = apr_pcalloc(self->pool,
+ sizeof(apr_json_object_t));
APR_RING_INIT(&object->list, apr_json_kv_t, link);
object->hash = apr_hash_make(self->pool);
diff --git a/test/testjson.c b/test/testjson.c
index 8ce9b148c..16bb5dce3 100644
--- a/test/testjson.c
+++ b/test/testjson.c
@@ -135,7 +135,7 @@ static void test_json_string(abts_case * tc, void *data)
apr_off_t offset = 0;
/* "턞\"\t/\b\f\n\r\t"; */
- const unsigned char expected[] = {237, 132, 158, 34, 9, 47, 8, 12, 10, 13, 9, 0};
+ const unsigned char expected[] = {237, 132, 158, 34, 9, 47, 8, 12, 10, 13, 9, 0};
src = "\"\\uD834\\uDD1E\\\"\\t\\/\\b\\f\\n\\r\\t\"";
@@ -145,8 +145,8 @@ static void test_json_string(abts_case * tc, void *data)
ABTS_INT_EQUAL(tc, APR_SUCCESS, status);
ABTS_INT_EQUAL(tc, APR_JSON_STRING, json->type);
- ABTS_ASSERT(tc, "check for string unescape match",
- (memcmp(expected, json->value.string.p, json->value.string.len) == 0));
+ ABTS_ASSERT(tc, "check for string unescape match",
+ (memcmp(expected, json->value.string.p, json->value.string.len) == 0));
}
abts_suite *testjson(abts_suite * suite)
View Lorry Controller Status