Deleted Added
full compact
ucl.h (302408) ucl.h (307790)
1/* Copyright (c) 2013-2015, Vsevolod Stakhov
2 * All rights reserved.
3 *
4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions are met:
6 * * Redistributions of source code must retain the above copyright
7 * notice, this list of conditions and the following disclaimer.
8 * * Redistributions in binary form must reproduce the above copyright

--- 1002 unchanged lines hidden (view full) ---

1011 */
1012UCL_EXTERN bool ucl_parser_add_string_priority (struct ucl_parser *parser,
1013 const char *data, size_t len, unsigned priority);
1014
1015/**
1016 * Load and add data from a file
1017 * @param parser parser structure
1018 * @param filename the name of file
1/* Copyright (c) 2013-2015, Vsevolod Stakhov
2 * All rights reserved.
3 *
4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions are met:
6 * * Redistributions of source code must retain the above copyright
7 * notice, this list of conditions and the following disclaimer.
8 * * Redistributions in binary form must reproduce the above copyright

--- 1002 unchanged lines hidden (view full) ---

1011 */
1012UCL_EXTERN bool ucl_parser_add_string_priority (struct ucl_parser *parser,
1013 const char *data, size_t len, unsigned priority);
1014
1015/**
1016 * Load and add data from a file
1017 * @param parser parser structure
1018 * @param filename the name of file
1019 * @param err if *err is NULL it is set to parser error
1020 * @return true if chunk has been added and false in case of error
1021 */
1022UCL_EXTERN bool ucl_parser_add_file (struct ucl_parser *parser,
1023 const char *filename);
1024
1025/**
1026 * Load and add data from a file
1027 * @param parser parser structure
1028 * @param filename the name of file
1019 * @return true if chunk has been added and false in case of error
1020 */
1021UCL_EXTERN bool ucl_parser_add_file (struct ucl_parser *parser,
1022 const char *filename);
1023
1024/**
1025 * Load and add data from a file
1026 * @param parser parser structure
1027 * @param filename the name of file
1029 * @param err if *err is NULL it is set to parser error
1030 * @param priority the desired priority of a chunk (only 4 least significant bits
1031 * are considered for this parameter)
1032 * @return true if chunk has been added and false in case of error
1033 */
1034UCL_EXTERN bool ucl_parser_add_file_priority (struct ucl_parser *parser,
1035 const char *filename, unsigned priority);
1036
1037/**
1028 * @param priority the desired priority of a chunk (only 4 least significant bits
1029 * are considered for this parameter)
1030 * @return true if chunk has been added and false in case of error
1031 */
1032UCL_EXTERN bool ucl_parser_add_file_priority (struct ucl_parser *parser,
1033 const char *filename, unsigned priority);
1034
1035/**
1036 * Load and add data from a file
1037 * @param parser parser structure
1038 * @param filename the name of file
1039 * @param priority the desired priority of a chunk (only 4 least significant bits
1040 * are considered for this parameter)
1041 * @param strat Merge strategy to use while parsing this file
1042 * @param parse_type Parser type to use while parsing this file
1043 * @return true if chunk has been added and false in case of error
1044 */
1045UCL_EXTERN bool ucl_parser_add_file_full (struct ucl_parser *parser, const char *filename,
1046 unsigned priority, enum ucl_duplicate_strategy strat,
1047 enum ucl_parse_type parse_type);
1048
1049/**
1038 * Load and add data from a file descriptor
1039 * @param parser parser structure
1040 * @param filename the name of file
1041 * @param err if *err is NULL it is set to parser error
1042 * @return true if chunk has been added and false in case of error
1043 */
1044UCL_EXTERN bool ucl_parser_add_fd (struct ucl_parser *parser,
1045 int fd);

--- 399 unchanged lines hidden ---
1050 * Load and add data from a file descriptor
1051 * @param parser parser structure
1052 * @param filename the name of file
1053 * @param err if *err is NULL it is set to parser error
1054 * @return true if chunk has been added and false in case of error
1055 */
1056UCL_EXTERN bool ucl_parser_add_fd (struct ucl_parser *parser,
1057 int fd);

--- 399 unchanged lines hidden ---