diff options
author | minfrin <minfrin@13f79535-47bb-0310-9956-ffa450edef68> | 2018-07-16 12:32:57 +0000 |
---|---|---|
committer | minfrin <minfrin@13f79535-47bb-0310-9956-ffa450edef68> | 2018-07-16 12:32:57 +0000 |
commit | 15697e518ebd098778a272cab5c2cbafa9a93866 (patch) | |
tree | a9ace6ee5ecbe6b0af66878f07ad0ba622d6d983 /json | |
parent | a0894fa730614fc68da67b3fc8671fea9e77da71 (diff) | |
download | libapr-15697e518ebd098778a272cab5c2cbafa9a93866.tar.gz |
Begone foul tabs, and blight not our shores.
git-svn-id: http://svn.apache.org/repos/asf/apr/apr/trunk@1836027 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'json')
-rw-r--r-- | json/apr_json.c | 106 | ||||
-rw-r--r-- | json/apr_json_decode.c | 4 |
2 files changed, 55 insertions, 55 deletions
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); |