Sync from libucl, update to use the new API
modified external/libucl/include/ucl.h
@@ -34,7 +34,6 @@
|
|
|
|
|
|
| - | |
|
|
|
|
|
@@ -624,7 +623,7 @@ ucl_object_keyl (ucl_object_t *obj, size_t *len)
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -654,8 +653,7 @@ void ucl_parser_register_macro (struct ucl_parser *parser, const char *macro,
|
|
|
|
|
|
| - | |
| - | |
| + | |
|
|
|
|
|
@@ -664,8 +662,7 @@ bool ucl_parser_add_chunk (struct ucl_parser *parser, const unsigned char *data,
|
|
|
|
|
|
| - | |
| - | |
| + | |
|
|
|
|
|
@@ -673,9 +670,14 @@ bool ucl_parser_add_file (struct ucl_parser *parser, const char *filename,
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
| + | |
| + | |
| + | |
| + | |
| + | |
|
|
|
|
|
@@ -725,6 +727,6 @@ unsigned char *ucl_object_emit (ucl_object_t *obj, enum ucl_emitter emit_type);
|
|
|
|
|
|
| - | |
| + | |
|
|
|
modified external/libucl/src/ucl_internal.h
@@ -36,6 +36,7 @@
|
|
|
|
|
|
| + | |
|
|
|
|
|
@@ -125,6 +126,7 @@ struct ucl_parser {
|
|
|
|
|
|
| + | |
|
|
|
|
|
@@ -141,7 +143,7 @@ size_t ucl_unescape_json_string (char *str, size_t len);
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -151,7 +153,7 @@ bool ucl_include_handler (const unsigned char *data, size_t len, void* ud, UT_st
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
modified external/libucl/src/ucl_parser.c
@@ -91,7 +91,7 @@ ucl_set_err (struct ucl_chunk *chunk, int code, const char *str, UT_string **err
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -139,7 +139,7 @@ start:
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -237,7 +237,7 @@ static inline size_t
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -245,7 +245,7 @@ ucl_copy_or_store_ptr (struct ucl_parser *parser,
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -493,12 +493,11 @@ ucl_maybe_parse_number (ucl_object_t *obj,
|
|
|
|
|
|
| - | |
|
|
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -512,7 +511,7 @@ ucl_lex_number (struct ucl_parser *parser,
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -522,12 +521,11 @@ ucl_lex_number (struct ucl_parser *parser,
|
|
|
|
|
|
| - | |
|
|
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -538,10 +536,10 @@ ucl_lex_json_string (struct ucl_parser *parser,
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -549,7 +547,7 @@ ucl_lex_json_string (struct ucl_parser *parser,
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -557,13 +555,13 @@ ucl_lex_json_string (struct ucl_parser *parser,
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -572,7 +570,7 @@ ucl_lex_json_string (struct ucl_parser *parser,
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -585,7 +583,7 @@ ucl_lex_json_string (struct ucl_parser *parser,
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -593,12 +591,10 @@ ucl_lex_json_string (struct ucl_parser *parser,
|
|
|
|
|
|
| - | |
|
|
|
|
|
|
| - | |
| - | |
| + | |
|
|
|
|
|
@@ -621,7 +617,7 @@ ucl_parse_key (struct ucl_parser *parser,
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -639,7 +635,7 @@ ucl_parse_key (struct ucl_parser *parser,
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -654,13 +650,13 @@ ucl_parse_key (struct ucl_parser *parser,
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -671,7 +667,7 @@ ucl_parse_key (struct ucl_parser *parser,
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -686,7 +682,7 @@ ucl_parse_key (struct ucl_parser *parser,
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -696,13 +692,13 @@ ucl_parse_key (struct ucl_parser *parser,
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -714,14 +710,14 @@ ucl_parse_key (struct ucl_parser *parser,
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
|
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -747,12 +743,11 @@ ucl_parse_key (struct ucl_parser *parser,
|
|
|
|
|
|
| - | |
|
|
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -798,7 +793,7 @@ ucl_parse_string_value (struct ucl_parser *parser,
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -811,13 +806,12 @@ ucl_parse_string_value (struct ucl_parser *parser,
|
|
|
|
|
|
| - | |
|
|
|
|
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -857,11 +851,10 @@ ucl_parse_multiline_string (struct ucl_parser *parser,
|
|
|
|
|
|
| - | |
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -891,13 +884,13 @@ ucl_parse_value (struct ucl_parser *parser, struct ucl_chunk *chunk, UT_string *
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -949,13 +942,13 @@ ucl_parse_value (struct ucl_parser *parser, struct ucl_chunk *chunk, UT_string *
|
|
|
|
|
|
| - | |
| - | |
| + | |
| + | |
|
|
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -972,7 +965,7 @@ ucl_parse_value (struct ucl_parser *parser, struct ucl_chunk *chunk, UT_string *
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -980,11 +973,11 @@ ucl_parse_value (struct ucl_parser *parser, struct ucl_chunk *chunk, UT_string *
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -996,12 +989,12 @@ ucl_parse_value (struct ucl_parser *parser, struct ucl_chunk *chunk, UT_string *
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -1015,7 +1008,7 @@ ucl_parse_value (struct ucl_parser *parser, struct ucl_chunk *chunk, UT_string *
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -1028,12 +1021,12 @@ ucl_parse_value (struct ucl_parser *parser, struct ucl_chunk *chunk, UT_string *
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -1053,11 +1046,10 @@ ucl_parse_value (struct ucl_parser *parser, struct ucl_chunk *chunk, UT_string *
|
|
|
|
|
|
| - | |
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -1072,7 +1064,7 @@ ucl_parse_after_value (struct ucl_parser *parser, struct ucl_chunk *chunk, UT_st
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -1082,7 +1074,7 @@ ucl_parse_after_value (struct ucl_parser *parser, struct ucl_chunk *chunk, UT_st
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -1094,7 +1086,7 @@ ucl_parse_after_value (struct ucl_parser *parser, struct ucl_chunk *chunk, UT_st
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -1116,7 +1108,7 @@ ucl_parse_after_value (struct ucl_parser *parser, struct ucl_chunk *chunk, UT_st
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -1130,13 +1122,12 @@ ucl_parse_after_value (struct ucl_parser *parser, struct ucl_chunk *chunk, UT_st
|
|
|
|
|
|
| - | |
|
|
|
|
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -1148,7 +1139,7 @@ ucl_parse_macro_value (struct ucl_parser *parser,
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -1209,11 +1200,10 @@ ucl_parse_macro_value (struct ucl_parser *parser,
|
|
|
|
|
|
| - | |
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -1231,7 +1221,7 @@ ucl_state_machine (struct ucl_parser *parser, UT_string **err)
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -1268,7 +1258,7 @@ ucl_state_machine (struct ucl_parser *parser, UT_string **err)
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -1283,7 +1273,7 @@ ucl_state_machine (struct ucl_parser *parser, UT_string **err)
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -1292,7 +1282,7 @@ ucl_state_machine (struct ucl_parser *parser, UT_string **err)
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -1320,7 +1310,7 @@ ucl_state_machine (struct ucl_parser *parser, UT_string **err)
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -1329,7 +1319,7 @@ ucl_state_machine (struct ucl_parser *parser, UT_string **err)
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -1343,20 +1333,20 @@ ucl_state_machine (struct ucl_parser *parser, UT_string **err)
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
|
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -1398,7 +1388,7 @@ ucl_parser_register_macro (struct ucl_parser *parser, const char *macro,
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -1413,14 +1403,14 @@ ucl_parser_add_chunk (struct ucl_parser *parser, const unsigned char *data,
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
| - | |
| + | |
|
|
|
|
|
modified external/libucl/src/ucl_util.c
@@ -220,7 +220,7 @@ ucl_copy_value_trash (ucl_object_t *obj)
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -256,15 +256,28 @@ ucl_parser_free (struct ucl_parser *parser)
|
|
|
|
|
|
| + | |
| + | |
| + | |
| + | |
|
|
|
|
|
|
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
|
|
| - | |
| + | |
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -279,7 +292,7 @@ ucl_pubkey_add (struct ucl_parser *parser, const unsigned char *key, size_t len,
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -345,7 +358,7 @@ ucl_fetch_url (const unsigned char *url, unsigned char **buf, size_t *buflen, UT
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -499,7 +512,7 @@ ucl_sig_check (const unsigned char *data, size_t datalen,
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -510,7 +523,7 @@ ucl_include_url (const unsigned char *data, size_t len,
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -522,7 +535,7 @@ ucl_include_url (const unsigned char *data, size_t len,
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -532,7 +545,7 @@ ucl_include_url (const unsigned char *data, size_t len,
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -556,7 +569,7 @@ ucl_include_url (const unsigned char *data, size_t len,
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -566,13 +579,13 @@ ucl_include_file (const unsigned char *data, size_t len,
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -594,7 +607,7 @@ ucl_include_file (const unsigned char *data, size_t len,
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -617,16 +630,16 @@ ucl_include_file (const unsigned char *data, size_t len,
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -638,31 +651,30 @@ ucl_include_handler (const unsigned char *data, size_t len, void* ud, UT_string
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
| - | |
| + | |
|
|
|
|
|
|
| - | |
| - | |
| + | |
|
|
|
|
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
modified libpkg/Makefile
@@ -143,5 +143,3 @@ NOMAN= yes
|
|
|
|
|
|
| - | |
| - | |
modified libpkg/pkg_config.c
@@ -807,12 +807,11 @@ load_repo_file(const char *repofile)
|
|
|
|
|
|
| - | |
|
|
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -821,7 +820,7 @@ load_repo_file(const char *repofile)
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -925,7 +924,6 @@ int
|
|
|
|
|
|
| - | |
|
|
|
|
|
@@ -1075,7 +1073,7 @@ pkg_init(const char *path, const char *reposdir)
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -1083,7 +1081,7 @@ pkg_init(const char *path, const char *reposdir)
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
modified libpkg/pkg_manifest.c
@@ -638,7 +638,6 @@ pkg_parse_manifest(struct pkg *pkg, char *buf, size_t len, struct pkg_manifest_k
|
|
|
|
|
|
| - | |
|
|
|
|
|
@@ -649,11 +648,11 @@ pkg_parse_manifest(struct pkg *pkg, char *buf, size_t len, struct pkg_manifest_k
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -695,7 +694,6 @@ pkg_parse_manifest_file(struct pkg *pkg, const char *file, struct pkg_manifest_k
|
|
|
|
|
|
| - | |
|
|
|
|
|
@@ -709,7 +707,7 @@ pkg_parse_manifest_file(struct pkg *pkg, const char *file, struct pkg_manifest_k
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -718,7 +716,7 @@ pkg_parse_manifest_file(struct pkg *pkg, const char *file, struct pkg_manifest_k
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
modified libpkg/plugins.c
@@ -539,7 +539,6 @@ pkg_plugin_parse(struct pkg_plugin *p)
|
|
|
|
|
|
| - | |
|
|
|
|
|
@@ -548,21 +547,19 @@ pkg_plugin_parse(struct pkg_plugin *p)
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
|
|
|
|
|
| - | |
| - | |
| - | |
| + | |
|
|
|
|
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
modified libpkg/update.c
@@ -195,20 +195,18 @@ load_fingerprint(const char *dir, const char *filename)
|
|
|
|
|
|
| - | |
|
|
|
|
|
|
|
|
|
|
| - | |
| - | |
| - | |
| + | |
| + | |
|
|
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|