diff options
Diffstat (limited to 'contrib/libucl/src/ucl_internal.h')
| -rw-r--r-- | contrib/libucl/src/ucl_internal.h | 51 |
1 files changed, 10 insertions, 41 deletions
diff --git a/contrib/libucl/src/ucl_internal.h b/contrib/libucl/src/ucl_internal.h index bdbe691d092b..0ac8de84c2ed 100644 --- a/contrib/libucl/src/ucl_internal.h +++ b/contrib/libucl/src/ucl_internal.h @@ -163,7 +163,6 @@ struct ucl_chunk { size_t remain; unsigned int line; unsigned int column; - unsigned priority; struct ucl_chunk *next; }; @@ -183,7 +182,7 @@ struct ucl_variable { char *value; size_t var_len; size_t value_len; - struct ucl_variable *prev, *next; + struct ucl_variable *next; }; struct ucl_parser { @@ -193,7 +192,6 @@ struct ucl_parser { int flags; ucl_object_t *top_obj; ucl_object_t *cur_obj; - char *cur_file; struct ucl_macro *macroes; struct ucl_stack *stack; struct ucl_chunk *chunks; @@ -204,12 +202,6 @@ struct ucl_parser { UT_string *err; }; -struct ucl_object_userdata { - ucl_object_t obj; - ucl_userdata_dtor dtor; - ucl_userdata_emitter emitter; -}; - /** * Unescape json string inplace * @param str @@ -224,11 +216,9 @@ size_t ucl_unescape_json_string (char *str, size_t len); * @param err error ptr * @return */ -bool ucl_include_handler (const unsigned char *data, size_t len, - const ucl_object_t *args, void* ud); +bool ucl_include_handler (const unsigned char *data, size_t len, void* ud); -bool ucl_try_include_handler (const unsigned char *data, size_t len, - const ucl_object_t *args, void* ud); +bool ucl_try_include_handler (const unsigned char *data, size_t len, void* ud); /** * Handle includes macro @@ -238,8 +228,7 @@ bool ucl_try_include_handler (const unsigned char *data, size_t len, * @param err error ptr * @return */ -bool ucl_includes_handler (const unsigned char *data, size_t len, - const ucl_object_t *args, void* ud); +bool ucl_includes_handler (const unsigned char *data, size_t len, void* ud); size_t ucl_strlcpy (char *dst, const char *src, size_t siz); size_t ucl_strlcpy_unsafe (char *dst, const char *src, size_t siz); @@ -275,7 +264,7 @@ ucl_create_err (UT_string **err, const char *fmt, ...) static inline bool ucl_maybe_parse_boolean (ucl_object_t *obj, const unsigned char *start, size_t len) { - const char *p = (const char *)start; + const unsigned char *p = start; bool ret = false, val = false; if (len == 5) { @@ -339,17 +328,14 @@ ucl_hash_search_obj (ucl_hash_t* hashlin, ucl_object_t *obj) return (const ucl_object_t *)ucl_hash_search (hashlin, obj->key, obj->keylen); } -static inline ucl_hash_t * ucl_hash_insert_object (ucl_hash_t *hashlin, - const ucl_object_t *obj, - bool ignore_case) UCL_WARN_UNUSED_RESULT; +static inline ucl_hash_t * +ucl_hash_insert_object (ucl_hash_t *hashlin, const ucl_object_t *obj) UCL_WARN_UNUSED_RESULT; static inline ucl_hash_t * -ucl_hash_insert_object (ucl_hash_t *hashlin, - const ucl_object_t *obj, - bool ignore_case) +ucl_hash_insert_object (ucl_hash_t *hashlin, const ucl_object_t *obj) { if (hashlin == NULL) { - hashlin = ucl_hash_create (ignore_case); + hashlin = ucl_hash_create (); } ucl_hash_insert (hashlin, obj, obj->key, obj->keylen); @@ -365,7 +351,7 @@ const struct ucl_emitter_context * ucl_emit_get_standard_context (enum ucl_emitter emit_type); /** - * Serialize string as JSON string + * Serialise string * @param str string to emit * @param buf target buffer */ @@ -373,27 +359,10 @@ void ucl_elt_string_write_json (const char *str, size_t size, struct ucl_emitter_context *ctx); /** - * Write multiline string using `EOD` as string terminator - * @param str - * @param size - * @param ctx - */ -void ucl_elt_string_write_multiline (const char *str, size_t size, - struct ucl_emitter_context *ctx); - -/** * Emit a single object to string * @param obj * @return */ unsigned char * ucl_object_emit_single_json (const ucl_object_t *obj); -/** - * Check whether a specified string is long and should be likely printed in - * multiline mode - * @param obj - * @return - */ -bool ucl_maybe_long_string (const ucl_object_t *obj); - #endif /* UCL_INTERNAL_H_ */ |