Update libucl to latest version
modified external/libucl/configure.ac
@@ -1,5 +1,5 @@
|
|
| - | |
| + | |
|
|
|
|
|
modified external/libucl/doc/api.md
@@ -282,7 +282,7 @@ Libucl provides the following functions for emitting UCL objects:
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -290,7 +290,7 @@ Allocate a string that is suitable to fit the underlying UCL object `obj` and fi
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -381,7 +381,7 @@ Iteration are used to iterate over UCL compound types: arrays and objects. Moreo
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -389,7 +389,7 @@ This function accept opaque iterator pointer `iter`. In the first call this iter
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -408,8 +408,8 @@ Currently, there is only one validation function called `ucl_object_validate`. I
|
|
|
|
|
|
| - | |
| - | |
| + | |
| + | |
|
|
|
|
|
modified external/libucl/doc/libucl.3
@@ -6,11 +6,11 @@
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -32,12 +32,12 @@ In future, this limitation can be removed.
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
| - | |
| + | |
|
|
| - | |
| + | |
|
|
|
|
|
@@ -57,7 +57,7 @@ as implicit array or implicit consolidation).
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -76,13 +76,13 @@ struct\ ucl_parser*\ ucl_parser_new\ (int\ flags);
|
|
|
|
|
|
| - | |
| + | |
|
|
| - | |
| - | |
| - | |
| + | |
| + | |
| + | |
|
|
| - | |
| + | |
|
|
|
|
|
@@ -161,7 +161,7 @@ bool\ ucl_parser_add_string\ (struct\ ucl_parser\ *parser,\
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -229,7 +229,7 @@ bool\ ucl_pubkey_add\ (struct\ ucl_parser\ *parser,\
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -247,25 +247,26 @@ bool\ ucl_parser_set_filevars\ (struct\ ucl_parser\ *parser,\
|
|
|
|
|
|
| - | |
| + | |
|
|
| - | |
| + | |
|
|
| - | |
| - | |
| + | |
| + | |
| + | |
|
|
| - | |
| + | |
|
|
| - | |
| + | |
|
|
|
|
|
|
| - | |
| - | |
| + | |
| + | |
|
|
| - | |
| + | |
|
|
| - | |
| + | |
|
|
|
|
|
@@ -283,7 +284,7 @@ FILE\ *in;
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -309,20 +310,20 @@ return\ ret;
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
| - | |
| + | |
|
|
|
|
| - | |
| + | |
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -344,17 +345,17 @@ struct\ ucl_emitter_functions\ {
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
| - | |
| + | |
|
|
|
|
| - | |
| + | |
|
|
|
|
| - | |
| - | |
| + | |
| + | |
|
|
|
|
|
@@ -364,7 +365,7 @@ Libucl provides the following functions for emitting UCL objects:
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -376,7 +377,7 @@ The caller should free the returned string after using.
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -400,26 +401,26 @@ cannot be converted then some reasonable default is returned (NULL for
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
|
|
|
|
|
|
|
| - | |
| + | |
|
|
| - | |
| + | |
|
|
| - | |
| + | |
|
|
| - | |
| + | |
|
|
|
|
| - | |
| + | |
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -448,26 +449,28 @@ ucl_object_t\ *\ ucl_object_typed_new\ (unsigned\ int\ type)
|
|
|
|
|
|
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
|
|
|
|
|
|
|
|
|
|
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
|
|
|
|
|
@@ -484,35 +487,35 @@ ucl_object_t\ *\ ucl_object_fromstring_common\ (const\ char\ *str,\
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
|
| - | |
| + | |
|
|
| - | |
| + | |
|
|
| - | |
| + | |
|
|
|
|
| - | |
| + | |
|
|
|
|
| - | |
| + | |
|
|
|
|
| - | |
| + | |
|
|
|
|
| - | |
| - | |
| + | |
| + | |
|
|
| - | |
| + | |
|
|
|
|
| - | |
| - | |
| - | |
| + | |
| + | |
| + | |
|
|
|
|
|
@@ -530,7 +533,7 @@ is a function \f[C]ucl_iterate_object\f[].
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -561,7 +564,7 @@ Here is an example of iteration over the objects using libucl API
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -584,13 +587,13 @@ This function is defined as following:
|
|
|
|
|
|
| - | |
| - | |
| + | |
| + | |
|
|
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
modified external/libucl/include/ucl.h
@@ -81,6 +81,14 @@ extern "C" {
|
|
|
|
|
|
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
|
|
|
|
|
@@ -208,14 +216,14 @@ typedef struct ucl_object_s {
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
|
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -245,7 +253,7 @@ UCL_EXTERN ucl_object_t * ucl_object_fromstring_common (const char *str, size_t
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -253,28 +261,29 @@ UCL_EXTERN ucl_object_t *ucl_object_fromstring (const char *str);
|
|
|
|
|
|
| - | |
| + | |
| + | |
|
|
|
|
|
|
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
|
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
|
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -283,10 +292,10 @@ UCL_EXTERN ucl_object_t* ucl_object_frombool (bool bv);
|
|
|
|
|
|
| - | |
| + | |
|
|
| - | |
| - | |
| + | |
| + | |
|
|
|
|
|
@@ -296,10 +305,10 @@ UCL_EXTERN ucl_object_t* ucl_object_insert_key (ucl_object_t *top, ucl_object_t
|
|
|
|
|
|
| - | |
| + | |
|
|
| - | |
| - | |
| + | |
| + | |
|
|
|
|
|
@@ -307,14 +316,16 @@ UCL_EXTERN ucl_object_t* ucl_object_replace_key (ucl_object_t *top, ucl_object_t
|
|
|
|
|
|
| - | |
| + | |
| + | |
|
|
|
|
|
|
|
|
|
|
|
|
| - | |
| + | |
| + | |
|
|
|
|
|
@@ -346,28 +357,28 @@ UCL_EXTERN ucl_object_t* ucl_object_pop_key (ucl_object_t *top, const char *key)
|
|
|
|
|
|
| - | |
| + | |
|
|
| - | |
| - | |
| + | |
| + | |
|
|
|
|
|
|
|
|
|
|
| - | |
| + | |
|
|
| - | |
| - | |
| + | |
| + | |
|
|
|
|
|
|
|
|
|
|
| - | |
| + | |
|
|
| - | |
| - | |
| + | |
| + | |
|
|
|
|
|
@@ -376,21 +387,22 @@ UCL_EXTERN ucl_object_t* ucl_array_prepend (ucl_object_t *top,
|
|
|
|
|
|
| - | |
| + | |
| + | |
|
|
|
|
|
|
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
|
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -412,10 +424,10 @@ UCL_EXTERN ucl_object_t* ucl_array_pop_first (ucl_object_t *top);
|
|
|
|
|
|
| - | |
| + | |
|
|
| - | |
| - | |
| + | |
| + | |
|
|
|
|
|
@@ -423,14 +435,14 @@ UCL_EXTERN ucl_object_t* ucl_elt_append (ucl_object_t *head,
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
|
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -438,14 +450,14 @@ UCL_EXTERN double ucl_object_todouble (ucl_object_t *obj);
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
|
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -453,14 +465,14 @@ UCL_EXTERN int64_t ucl_object_toint (ucl_object_t *obj);
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
|
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -468,21 +480,21 @@ UCL_EXTERN bool ucl_object_toboolean (ucl_object_t *obj);
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
|
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
|
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -492,7 +504,7 @@ UCL_EXTERN const char* ucl_object_tostring_forced (ucl_object_t *obj);
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -500,7 +512,7 @@ UCL_EXTERN bool ucl_object_tolstring_safe (ucl_object_t *obj,
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -508,7 +520,8 @@ UCL_EXTERN const char* ucl_object_tolstring (ucl_object_t *obj, size_t *tlen);
|
|
|
|
|
|
| - | |
| + | |
| + | |
|
|
|
|
|
@@ -517,14 +530,15 @@ UCL_EXTERN ucl_object_t* ucl_object_find_key (ucl_object_t *obj, const char *key
|
|
|
|
|
|
| - | |
| + | |
| + | |
|
|
|
|
|
|
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -532,19 +546,19 @@ UCL_EXTERN const char* ucl_object_key (ucl_object_t *obj);
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
| - | |
| - | |
| + | |
| + | |
|
|
| - | |
| + | |
|
|
|
|
| - | |
| - | |
| + | |
| + | |
|
|
| - | |
| + | |
|
|
|
|
|
@@ -562,7 +576,8 @@ UCL_EXTERN void ucl_object_unref (ucl_object_t *obj);
|
|
|
|
|
|
| - | |
| + | |
| + | |
|
|
|
|
|
@@ -570,7 +585,7 @@ UCL_EXTERN int ucl_object_compare (ucl_object_t *o1, ucl_object_t *o2);
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -585,7 +600,8 @@ typedef void* ucl_object_iter_t;
|
|
|
|
|
|
| - | |
| + | |
| + | |
|
|
|
|
|
@@ -663,10 +679,21 @@ UCL_EXTERN bool ucl_parser_add_string (struct ucl_parser *parser,
|
|
|
|
|
|
| - | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -736,7 +763,8 @@ struct ucl_emitter_functions {
|
|
|
|
|
|
| - | |
| + | |
| + | |
|
|
|
|
|
@@ -745,7 +773,8 @@ UCL_EXTERN unsigned char *ucl_object_emit (ucl_object_t *obj, enum ucl_emitter e
|
|
|
|
|
|
| - | |
| + | |
| + | |
|
|
|
|
|
@@ -775,7 +804,7 @@ enum ucl_schema_error_code {
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -786,8 +815,8 @@ struct ucl_schema_error {
|
|
|
|
|
|
| - | |
| - | |
| + | |
| + | |
|
|
|
|
|
modified external/libucl/src/ucl_emitter.c
@@ -41,29 +41,29 @@
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -144,10 +144,10 @@ ucl_elt_string_write_json (const char *str, size_t size,
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -196,10 +196,10 @@ ucl_elt_obj_write_json (ucl_object_t *obj, struct ucl_emitter_functions *func,
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -235,7 +235,7 @@ ucl_elt_array_write_json (ucl_object_t *obj, struct ucl_emitter_functions *func,
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -295,10 +295,10 @@ ucl_elt_write_json (ucl_object_t *obj, struct ucl_emitter_functions *func,
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -339,7 +339,8 @@ ucl_obj_write_json (ucl_object_t *obj, struct ucl_emitter_functions *func,
|
|
|
|
|
|
| - | |
| + | |
| + | |
|
|
|
|
|
@@ -350,10 +351,10 @@ ucl_object_emit_json (ucl_object_t *obj, bool compact, struct ucl_emitter_functi
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -402,10 +403,10 @@ ucl_elt_obj_write_config (ucl_object_t *obj, struct ucl_emitter_functions *func,
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -427,7 +428,7 @@ ucl_elt_array_write_config (ucl_object_t *obj, struct ucl_emitter_functions *fun
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -492,14 +493,14 @@ ucl_elt_write_config (ucl_object_t *obj, struct ucl_emitter_functions *func,
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
|
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -518,10 +519,10 @@ ucl_obj_write_yaml (ucl_object_t *obj, struct ucl_emitter_functions *func,
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -566,10 +567,10 @@ ucl_elt_obj_write_yaml (ucl_object_t *obj, struct ucl_emitter_functions *func,
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -591,7 +592,7 @@ ucl_elt_array_write_yaml (ucl_object_t *obj, struct ucl_emitter_functions *func,
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -656,7 +657,7 @@ ucl_elt_write_yaml (ucl_object_t *obj, struct ucl_emitter_functions *func,
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -723,7 +724,7 @@ ucl_utstring_append_double (double val, void *ud)
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -763,7 +764,7 @@ ucl_object_emit (ucl_object_t *obj, enum ucl_emitter emit_type)
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -785,7 +786,7 @@ ucl_object_emit_full (ucl_object_t *obj, enum ucl_emitter emit_type,
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
modified external/libucl/src/ucl_hash.c
@@ -40,13 +40,14 @@ ucl_hash_create (void)
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
|
|
|
|
|
| - | |
| + | |
| + | |
|
|
|
|
|
@@ -55,7 +56,8 @@ void ucl_hash_destroy (ucl_hash_t* hashlin, ucl_hash_free_func *func)
|
|
|
|
|
|
| - | |
| + | |
| + | |
|
|
|
|
|
@@ -64,7 +66,7 @@ ucl_hash_insert (ucl_hash_t* hashlin, ucl_object_t *obj, const char *key, unsign
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -95,7 +97,7 @@ ucl_hash_iter_has_next (ucl_hash_iter_t iter)
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -112,7 +114,7 @@ ucl_hash_search (ucl_hash_t* hashlin, const char *key, unsigned keylen)
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
modified external/libucl/src/ucl_hash.h
@@ -31,7 +31,7 @@
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -62,17 +62,19 @@ void ucl_hash_destroy (ucl_hash_t* hashlin, ucl_hash_free_func *func);
|
|
|
|
|
|
| - | |
| + | |
| + | |
|
|
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
|
|
|
| - | |
| + | |
| + | |
|
|
|
|
|
@@ -81,7 +83,7 @@ ucl_object_t* ucl_hash_search (ucl_hash_t* hashlin, const char *key, unsigned ke
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
modified external/libucl/src/ucl_internal.h
@@ -99,6 +99,10 @@
|
|
|
|
|
|
| + | |
| + | |
| + | |
| + | |
|
|
|
|
|
@@ -316,17 +320,17 @@ int ucl_maybe_parse_number (ucl_object_t *obj,
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
| - | |
| + | |
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -341,6 +345,6 @@ ucl_hash_insert_object (ucl_hash_t *hashlin, ucl_object_t *obj)
|
|
|
|
|
|
| - | |
| + | |
|
|
|
modified external/libucl/src/ucl_parser.c
@@ -1058,19 +1058,19 @@ ucl_parse_key (struct ucl_parser *parser, struct ucl_chunk *chunk, bool *next_ke
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
|
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
modified external/libucl/src/ucl_schema.c
@@ -40,10 +40,10 @@
|
|
|
|
|
|
| - | |
| - | |
| + | |
| + | |
|
|
| - | |
| + | |
|
|
|
|
|
@@ -115,7 +115,7 @@ ucl_object_type_to_string (ucl_type_t type)
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -132,13 +132,13 @@ ucl_schema_create_error (struct ucl_schema_error *err,
|
|
|
|
|
|
| - | |
| - | |
| + | |
| + | |
|
|
| - | |
| + | |
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -158,11 +158,11 @@ ucl_schema_test_pattern (ucl_object_t *obj, const char *pattern)
|
|
|
|
|
|
| - | |
| - | |
| - | |
| + | |
| + | |
| + | |
|
|
| - | |
| + | |
|
|
|
|
|
@@ -195,11 +195,11 @@ ucl_schema_validate_dependencies (ucl_object_t *deps,
|
|
|
|
|
|
| - | |
| - | |
| - | |
| + | |
| + | |
| + | |
|
|
| - | |
| + | |
|
|
|
|
|
@@ -336,10 +336,10 @@ ucl_schema_validate_object (ucl_object_t *schema,
|
|
|
|
|
|
| - | |
| - | |
| + | |
| + | |
|
|
| - | |
| + | |
|
|
|
|
|
@@ -402,10 +402,10 @@ ucl_schema_validate_number (ucl_object_t *schema,
|
|
|
|
|
|
| - | |
| - | |
| + | |
| + | |
|
|
| - | |
| + | |
|
|
|
|
|
@@ -461,7 +461,7 @@ ucl_schema_validate_string (ucl_object_t *schema,
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -473,17 +473,17 @@ TREE_DEFINE(ucl_compare_node, link)
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -516,11 +516,11 @@ ucl_schema_array_is_unique (ucl_object_t *obj, struct ucl_schema_error *err)
|
|
|
|
|
|
| - | |
| - | |
| - | |
| + | |
| + | |
| + | |
|
|
| - | |
| + | |
|
|
|
|
|
@@ -633,11 +633,11 @@ ucl_schema_validate_array (ucl_object_t *schema,
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -689,11 +689,11 @@ ucl_schema_type_is_allowed (ucl_object_t *type, ucl_object_t *obj,
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -715,12 +715,12 @@ ucl_schema_validate_enum (ucl_object_t *en, ucl_object_t *obj,
|
|
|
|
|
|
| - | |
| - | |
| + | |
| + | |
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -768,12 +768,12 @@ ucl_schema_resolve_ref_component (ucl_object_t *cur,
|
|
|
|
|
|
| - | |
| - | |
| + | |
| + | |
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -828,10 +828,10 @@ ucl_schema_resolve_ref (ucl_object_t *root, const char *ref,
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -874,12 +874,12 @@ ucl_schema_validate_values (ucl_object_t *schema, ucl_object_t *obj,
|
|
|
|
|
|
| - | |
| - | |
| + | |
| + | |
|
|
| - | |
| + | |
|
|
| - | |
| + | |
|
|
|
|
|
@@ -1007,8 +1007,8 @@ ucl_schema_validate (ucl_object_t *schema,
|
|
|
|
|
|
| - | |
| - | |
| + | |
| + | |
|
|
|
|
|
modified external/libucl/src/ucl_util.c
@@ -323,47 +323,54 @@ ucl_unescape_json_string (char *str, size_t len)
|
|
|
|
|
|
| - | |
| - | |
| + | |
| + | |
|
|
| + | |
| + | |
|
|
|
|
|
|
|
|
| - | |
| - | |
| - | |
| - | |
| + | |
| + | |
| + | |
| + | |
| + | |
|
|
| - | |
| - | |
| + | |
| + | |
|
|
|
|
|
|
|
|
|
|
| - | |
| - | |
| + | |
| + | |
|
|
| + | |
| + | |
|
|
|
|
|
|
|
|
| + | |
|
|
| + | |
|
|
| - | |
| - | |
| - | |
| - | |
| - | |
| + | |
| + | |
| + | |
| + | |
| + | |
|
|
|
|
|
|
|
|
| - | |
| - | |
| + | |
| + | |
|
|
| - | |
| + | |
|
|
|
|
|
@@ -1125,21 +1132,22 @@ ucl_object_fromstring_common (const char *str, size_t len, enum ucl_string_flags
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
|
| - | |
| + | |
| + | |
|
|
|
|
| + | |
|
|
|
|
| - | |
| + | |
|
|
|
|
|
|
| - | |
| - | |
| + | |
|
|
|
|
|
@@ -1149,7 +1157,7 @@ ucl_object_insert_key_common (ucl_object_t *top, ucl_object_t *elt,
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -1175,12 +1183,15 @@ ucl_object_insert_key_common (ucl_object_t *top, ucl_object_t *elt,
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
|
|
|
|
|
| + | |
| + | |
| + | |
|
|
|
|
|
@@ -1193,19 +1204,22 @@ ucl_object_insert_key_common (ucl_object_t *top, ucl_object_t *elt,
|
|
|
|
|
|
| - | |
| + | |
| + | |
|
|
|
|
|
|
|
|
|
|
| - | |
| + | |
| + | |
|
|
|
|
|
|
|
|
| - | |
| - | |
| + | |
| + | |
| + | |
|
|
|
|
|
@@ -1219,11 +1233,11 @@ ucl_object_insert_key_common (ucl_object_t *top, ucl_object_t *elt,
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -1231,13 +1245,13 @@ ucl_object_delete_keyl(ucl_object_t *top, const char *key, size_t keylen)
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -1245,28 +1259,28 @@ ucl_object_delete_keyl(ucl_object_t *top, const char *key, size_t keylen)
|
|
|
|
|
|
| - | |
| + | |
|
|
| - | |
| + | |
|
|
|
|
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -1275,31 +1289,32 @@ ucl_object_pop_key (ucl_object_t *top, const char *key)
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
|
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
|
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
|
|
|
|
|
|
|
| - | |
| - | |
| + | |
| + | |
|
|
| - | |
| + | |
| + | |
|
|
|
|
|
@@ -1312,11 +1327,12 @@ ucl_object_find_keyl (ucl_object_t *obj, const char *key, size_t klen)
|
|
|
|
|
|
| - | |
| - | |
| + | |
| + | |
|
|
|
|
| - | |
| + | |
| + | |
|
|
|
|
|
@@ -1330,10 +1346,10 @@ ucl_object_find_key (ucl_object_t *obj, const char *key)
|
|
|
|
|
|
| - | |
| - | |
| + | |
| + | |
|
|
| - | |
| + | |
|
|
|
|
|
@@ -1342,7 +1358,7 @@ ucl_iterate_object (ucl_object_t *obj, ucl_object_iter_t *iter, bool expand_valu
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -1373,7 +1389,7 @@ ucl_iterate_object (ucl_object_t *obj, ucl_object_iter_t *iter, bool expand_valu
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -1461,72 +1477,55 @@ ucl_object_frombool (bool bv)
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
|
|
|
| - | |
| - | |
| + | |
| + | |
|
|
|
|
| - | |
| - | |
| + | |
| + | |
|
|
| - | |
|
|
| - | |
|
|
|
|
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| + | |
| + | |
| + | |
|
|
| + | |
| + | |
|
|
| - | |
| + | |
|
|
|
|
| - | |
| + | |
|
|
|
|
|
|
|
|
| - | |
| - | |
| + | |
| + | |
|
|
|
|
| - | |
| - | |
| + | |
| + | |
| + | |
|
|
| - | |
|
|
| - | |
|
|
|
|
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| + | |
| + | |
|
|
| + | |
| + | |
| + | |
|
|
| - | |
| + | |
|
|
|
|
|
@@ -1562,8 +1561,8 @@ ucl_array_delete (ucl_object_t *top, ucl_object_t *elt)
|
|
|
|
|
|
| - | |
| - | |
| + | |
| + | |
|
|
|
|
|
@@ -1571,8 +1570,8 @@ ucl_array_head (ucl_object_t *top)
|
|
|
|
|
|
| - | |
| - | |
| + | |
| + | |
|
|
|
|
|
@@ -1583,13 +1582,13 @@ ucl_array_tail (ucl_object_t *top)
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -1612,7 +1611,7 @@ ucl_elt_append (ucl_object_t *head, ucl_object_t *elt)
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -1633,7 +1632,7 @@ ucl_object_todouble_safe (ucl_object_t *obj, double *target)
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -1642,7 +1641,7 @@ ucl_object_todouble (ucl_object_t *obj)
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -1663,7 +1662,7 @@ ucl_object_toint_safe (ucl_object_t *obj, int64_t *target)
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -1672,7 +1671,7 @@ ucl_object_toint (ucl_object_t *obj)
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -1689,7 +1688,7 @@ ucl_object_toboolean_safe (ucl_object_t *obj, bool *target)
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -1698,7 +1697,7 @@ ucl_object_toboolean (ucl_object_t *obj)
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -1716,7 +1715,7 @@ ucl_object_tostring_safe (ucl_object_t *obj, const char **target)
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -1725,13 +1724,13 @@ ucl_object_tostring (ucl_object_t *obj)
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -1751,7 +1750,7 @@ ucl_object_tolstring_safe (ucl_object_t *obj, const char **target, size_t *tlen)
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -1760,13 +1759,13 @@ ucl_object_tolstring (ucl_object_t *obj, size_t *tlen)
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -1776,16 +1775,19 @@ ucl_object_keyl (ucl_object_t *obj, size_t *len)
|
|
|
|
|
|
| - | |
| + | |
|
|
| + | |
| + | |
|
|
| + | |
|
|
| - | |
| + | |
|
|
| - | |
| + | |
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -1804,9 +1806,9 @@ ucl_object_unref (ucl_object_t *obj)
|
|
|
|
|
|
| - | |
| + | |
|
|
| - | |
| + | |
|
|
|
|
|
@@ -1877,7 +1879,7 @@ ucl_object_compare (ucl_object_t *o1, ucl_object_t *o2)
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
modified external/libucl/tests/test_basic.c
@@ -78,7 +78,9 @@ main (int argc, char **argv)
|
|
|
|
|
|
| - | |
| + | |
| + | |
| + | |
|
|
|
|
|
modified external/libucl/tests/test_generate.c
@@ -55,63 +55,64 @@ main (int argc, char **argv)
|
|
|
|
|
|
| - | |
| + | |
|
|
| - | |
| + | |
|
|
| - | |
| + | |
|
|
| + | |
|
|
| - | |
| + | |
|
|
| - | |
| + | |
|
|
| - | |
| + | |
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
| - | |
| + | |
|
|
| - | |
| + | |
|
|
| - | |
| + | |
|
|
|
|
| - | |
| + | |
|
|
| - | |
| + | |
|
|
| - | |
| + | |
|
|
| - | |
| + | |
|
|
| - | |
| + | |
|
|
| - | |
| + | |
|
|
| - | |
| + | |
|
|
|
|
|
modified external/libucl/tests/test_schema.c
@@ -58,10 +58,10 @@ read_stdin (char **buf)
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -86,11 +86,11 @@ perform_test (ucl_object_t *schema, ucl_object_t *obj,
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -124,7 +124,8 @@ main (int argc, char **argv)
|
|
|
|
|
|
| - | |
| + | |
| + | |
|
|
|
|
|
modified external/libucl/utils/objdump.c
@@ -28,11 +28,11 @@
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -64,7 +64,7 @@ ucl_obj_dump(ucl_object_t *obj, unsigned int shift)
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -99,7 +99,7 @@ main(int argc, char **argv)
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -129,7 +129,7 @@ main(int argc, char **argv)
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|