Couldn't find wdiff. Falling back to builtin diff colouring...
| libconfig.h | | libconfig.h | |
| /* ------------------------------------------------------------------------
---- | | /* ------------------------------------------------------------------------
---- | |
| libconfig - A library for processing structured configuration files | | libconfig - A library for processing structured configuration files | |
|
| Copyright (C) 2005-2008 Mark A Lindner | | Copyright (C) 2005-2009 Mark A Lindner | |
| | | | |
| This file is part of libconfig. | | This file is part of libconfig. | |
| | | | |
| This library is free software; you can redistribute it and/or | | This library is free software; you can redistribute it and/or | |
| modify it under the terms of the GNU Lesser General Public License | | modify it under the terms of the GNU Lesser General Public License | |
| as published by the Free Software Foundation; either version 2.1 of | | as published by the Free Software Foundation; either version 2.1 of | |
| the License, or (at your option) any later version. | | the License, or (at your option) any later version. | |
| | | | |
| This library is distributed in the hope that it will be useful, but | | This library is distributed in the hope that it will be useful, but | |
| WITHOUT ANY WARRANTY; without even the implied warranty of | | WITHOUT ANY WARRANTY; without even the implied warranty of | |
| | | | |
| skipping to change at line 127 | | skipping to change at line 127 | |
| const config_setting_t *setting); | | const config_setting_t *setting); | |
| extern LIBCONFIG_API long long config_setting_get_int64( | | extern LIBCONFIG_API long long config_setting_get_int64( | |
| const config_setting_t *setting); | | const config_setting_t *setting); | |
| extern LIBCONFIG_API double config_setting_get_float( | | extern LIBCONFIG_API double config_setting_get_float( | |
| const config_setting_t *setting); | | const config_setting_t *setting); | |
| extern LIBCONFIG_API int config_setting_get_bool( | | extern LIBCONFIG_API int config_setting_get_bool( | |
| const config_setting_t *setting); | | const config_setting_t *setting); | |
| extern LIBCONFIG_API const char *config_setting_get_string( | | extern LIBCONFIG_API const char *config_setting_get_string( | |
| const config_setting_t *setting); | | const config_setting_t *setting); | |
| | | | |
|
| | | extern LIBCONFIG_API int config_setting_lookup_int( | |
| | | const config_setting_t *setting, const char *name, long *value); | |
| | | extern LIBCONFIG_API int config_setting_lookup_int64( | |
| | | const config_setting_t *setting, const char *name, long long *value); | |
| | | extern LIBCONFIG_API int config_setting_lookup_float( | |
| | | const config_setting_t *setting, const char *name, double *value); | |
| | | extern LIBCONFIG_API int config_setting_lookup_bool( | |
| | | const config_setting_t *setting, const char *name, int *value); | |
| | | extern LIBCONFIG_API int config_setting_lookup_string( | |
| | | const config_setting_t *setting, const char *name, const char **value); | |
| | | | |
| extern LIBCONFIG_API int config_setting_set_int(config_setting_t *setting, | | extern LIBCONFIG_API int config_setting_set_int(config_setting_t *setting, | |
| long value); | | long value); | |
| extern LIBCONFIG_API int config_setting_set_int64(config_setting_t *setting
, | | extern LIBCONFIG_API int config_setting_set_int64(config_setting_t *setting
, | |
| long long value); | | long long value); | |
| extern LIBCONFIG_API int config_setting_set_float(config_setting_t *setting
, | | extern LIBCONFIG_API int config_setting_set_float(config_setting_t *setting
, | |
| double value); | | double value); | |
| extern LIBCONFIG_API int config_setting_set_bool(config_setting_t *setting, | | extern LIBCONFIG_API int config_setting_set_bool(config_setting_t *setting, | |
| int value); | | int value); | |
| extern LIBCONFIG_API int config_setting_set_string(config_setting_t *settin
g, | | extern LIBCONFIG_API int config_setting_set_string(config_setting_t *settin
g, | |
| const char *value); | | const char *value); | |
| | | | |
| skipping to change at line 224 | | skipping to change at line 235 | |
| extern LIBCONFIG_API int config_setting_remove_elem(config_setting_t *paren
t, | | extern LIBCONFIG_API int config_setting_remove_elem(config_setting_t *paren
t, | |
| unsigned int idx); | | unsigned int idx); | |
| extern LIBCONFIG_API void config_setting_set_hook(config_setting_t *setting
, | | extern LIBCONFIG_API void config_setting_set_hook(config_setting_t *setting
, | |
| void *hook); | | void *hook); | |
| | | | |
| #define config_setting_get_hook(S) ((S)->hook) | | #define config_setting_get_hook(S) ((S)->hook) | |
| | | | |
| extern LIBCONFIG_API config_setting_t *config_lookup(const config_t *config
, | | extern LIBCONFIG_API config_setting_t *config_lookup(const config_t *config
, | |
| const char *path); | | const char *path); | |
| | | | |
|
| extern LIBCONFIG_API long config_lookup_int(const config_t *config, | | extern LIBCONFIG_API int config_lookup_int(const config_t *config, | |
| const char *path); | | const char *path, long *value); | |
| extern LIBCONFIG_API long long config_lookup_int64(const config_t *config, | | extern LIBCONFIG_API int config_lookup_int64(const config_t *config, | |
| const char *path); | | const char *path, | |
| extern LIBCONFIG_API double config_lookup_float(const config_t *config, | | long long *value); | |
| const char *path); | | extern LIBCONFIG_API int config_lookup_float(const config_t *config, | |
| | | const char *path, double *valu
e); | |
| extern LIBCONFIG_API int config_lookup_bool(const config_t *config, | | extern LIBCONFIG_API int config_lookup_bool(const config_t *config, | |
|
| const char *path); | | const char *path, int *value); | |
| extern LIBCONFIG_API const char *config_lookup_string(const config_t *confi
g, | | extern LIBCONFIG_API int config_lookup_string(const config_t *config, | |
| const char *path); | | const char *path, | |
| | | const char **value); | |
| | | | |
| #define /* config_setting_t * */ config_root_setting( \ | | #define /* config_setting_t * */ config_root_setting( \ | |
| /* const config_t * */ C) \ | | /* const config_t * */ C) \ | |
| ((C)->root) | | ((C)->root) | |
| | | | |
| #define /* unsigned short */ config_setting_source_line( \ | | #define /* unsigned short */ config_setting_source_line( \ | |
| /* const config_t */ C) \ | | /* const config_t */ C) \ | |
| ((C)->line) | | ((C)->line) | |
| | | | |
| #define /* const char * */ config_error_text(/* const config_t * */ C) \ | | #define /* const char * */ config_error_text(/* const config_t * */ C) \ | |
| | | | |
End of changes. 4 change blocks. |
| 10 lines changed or deleted | | 23 lines changed or added | |
|
| libconfig.h++ | | libconfig.h++ | |
| /* ------------------------------------------------------------------------
---- | | /* ------------------------------------------------------------------------
---- | |
| libconfig - A library for processing structured configuration files | | libconfig - A library for processing structured configuration files | |
|
| Copyright (C) 2005-2008 Mark A Lindner | | Copyright (C) 2005-2009 Mark A Lindner | |
| | | | |
| This file is part of libconfig. | | This file is part of libconfig. | |
| | | | |
| This library is free software; you can redistribute it and/or | | This library is free software; you can redistribute it and/or | |
| modify it under the terms of the GNU Lesser General Public License | | modify it under the terms of the GNU Lesser General Public License | |
| as published by the Free Software Foundation; either version 2.1 of | | as published by the Free Software Foundation; either version 2.1 of | |
| the License, or (at your option) any later version. | | the License, or (at your option) any later version. | |
| | | | |
| This library is distributed in the hope that it will be useful, but | | This library is distributed in the hope that it will be useful, but | |
| WITHOUT ANY WARRANTY; without even the implied warranty of | | WITHOUT ANY WARRANTY; without even the implied warranty of | |
| | | | |
| skipping to change at line 290 | | skipping to change at line 290 | |
| void remove(unsigned int idx) | | void remove(unsigned int idx) | |
| throw(SettingTypeException, SettingNotFoundException); | | throw(SettingTypeException, SettingNotFoundException); | |
| | | | |
| inline Setting & add(const std::string & name, Type type) | | inline Setting & add(const std::string & name, Type type) | |
| throw(SettingNameException, SettingTypeException) | | throw(SettingNameException, SettingTypeException) | |
| { return(add(name.c_str(), type)); } | | { return(add(name.c_str(), type)); } | |
| | | | |
| Setting & add(const char *name, Type type) | | Setting & add(const char *name, Type type) | |
| throw(SettingNameException, SettingTypeException); | | throw(SettingNameException, SettingTypeException); | |
| | | | |
|
| Setting & add(Type type) | | Setting & add(Type type) throw(SettingTypeException); | |
| throw(SettingTypeException); | | | |
| | | | |
| inline bool exists(const std::string & name) const throw() | | inline bool exists(const std::string & name) const throw() | |
| { return(exists(name.c_str())); } | | { return(exists(name.c_str())); } | |
| | | | |
| bool exists(const char *name) const throw(); | | bool exists(const char *name) const throw(); | |
| | | | |
| int getLength() const throw(); | | int getLength() const throw(); | |
| const char *getName() const throw(); | | const char *getName() const throw(); | |
| std::string getPath() const; | | std::string getPath() const; | |
| int getIndex() const throw(); | | int getIndex() const throw(); | |
| | | | |
| skipping to change at line 359 | | skipping to change at line 358 | |
| void read(FILE *stream) throw(ParseException); | | void read(FILE *stream) throw(ParseException); | |
| void write(FILE *stream) const; | | void write(FILE *stream) const; | |
| | | | |
| void readFile(const char *filename) throw(FileIOException, ParseExcepti
on); | | void readFile(const char *filename) throw(FileIOException, ParseExcepti
on); | |
| void writeFile(const char *filename) throw(FileIOException); | | void writeFile(const char *filename) throw(FileIOException); | |
| | | | |
| inline Setting & lookup(const std::string &path) const | | inline Setting & lookup(const std::string &path) const | |
| throw(SettingNotFoundException) | | throw(SettingNotFoundException) | |
| { return(lookup(path.c_str())); } | | { return(lookup(path.c_str())); } | |
| | | | |
|
| Setting & lookup(const char *path) const | | Setting & lookup(const char *path) const throw(SettingNotFoundException
); | |
| throw(SettingNotFoundException); | | | |
| | | | |
| inline bool exists(const std::string & path) const throw() | | inline bool exists(const std::string & path) const throw() | |
| { return(exists(path.c_str())); } | | { return(exists(path.c_str())); } | |
| | | | |
| bool exists(const char *path) const throw(); | | bool exists(const char *path) const throw(); | |
| | | | |
| bool lookupValue(const char *path, bool &value) const throw(); | | bool lookupValue(const char *path, bool &value) const throw(); | |
| bool lookupValue(const char *path, long &value) const throw(); | | bool lookupValue(const char *path, long &value) const throw(); | |
| bool lookupValue(const char *path, unsigned long &value) const throw(); | | bool lookupValue(const char *path, unsigned long &value) const throw(); | |
| bool lookupValue(const char *path, int &value) const throw(); | | bool lookupValue(const char *path, int &value) const throw(); | |
| bool lookupValue(const char *path, unsigned int &value) const throw(); | | bool lookupValue(const char *path, unsigned int &value) const throw(); | |
| bool lookupValue(const char *path, long long &value) const throw(); | | bool lookupValue(const char *path, long long &value) const throw(); | |
| bool lookupValue(const char *path, unsigned long long &value) | | bool lookupValue(const char *path, unsigned long long &value) | |
| const throw(); | | const throw(); | |
| bool lookupValue(const char *path, double &value) const throw(); | | bool lookupValue(const char *path, double &value) const throw(); | |
| bool lookupValue(const char *path, float &value) const throw(); | | bool lookupValue(const char *path, float &value) const throw(); | |
| bool lookupValue(const char *path, const char *&value) const throw(); | | bool lookupValue(const char *path, const char *&value) const throw(); | |
| bool lookupValue(const char *path, std::string &value) const throw(); | | bool lookupValue(const char *path, std::string &value) const throw(); | |
| | | | |
|
| inline bool lookupValue(const std::string &path, bool &value) | | inline bool lookupValue(const std::string &path, bool &value) const thr
ow() | |
| const throw() | | | |
| { return(lookupValue(path.c_str(), value)); } | | { return(lookupValue(path.c_str(), value)); } | |
| | | | |
|
| inline bool lookupValue(const std::string &path, long &value) | | inline bool lookupValue(const std::string &path, long &value) const thr
ow() | |
| const throw() | | | |
| { return(lookupValue(path.c_str(), value)); } | | { return(lookupValue(path.c_str(), value)); } | |
| | | | |
| inline bool lookupValue(const std::string &path, unsigned long &value) | | inline bool lookupValue(const std::string &path, unsigned long &value) | |
| const throw() | | const throw() | |
| { return(lookupValue(path.c_str(), value)); } | | { return(lookupValue(path.c_str(), value)); } | |
| | | | |
| inline bool lookupValue(const std::string &path, int &value) const thro
w() | | inline bool lookupValue(const std::string &path, int &value) const thro
w() | |
| { return(lookupValue(path.c_str(), value)); } | | { return(lookupValue(path.c_str(), value)); } | |
| | | | |
| inline bool lookupValue(const std::string &path, unsigned int &value) | | inline bool lookupValue(const std::string &path, unsigned int &value) | |
| | | | |
| skipping to change at line 407 | | skipping to change at line 403 | |
| { return(lookupValue(path.c_str(), value)); } | | { return(lookupValue(path.c_str(), value)); } | |
| | | | |
| inline bool lookupValue(const std::string &path, long long &value) | | inline bool lookupValue(const std::string &path, long long &value) | |
| const throw() | | const throw() | |
| { return(lookupValue(path.c_str(), value)); } | | { return(lookupValue(path.c_str(), value)); } | |
| | | | |
| inline bool lookupValue(const std::string &path, | | inline bool lookupValue(const std::string &path, | |
| unsigned long long &value) const throw() | | unsigned long long &value) const throw() | |
| { return(lookupValue(path.c_str(), value)); } | | { return(lookupValue(path.c_str(), value)); } | |
| | | | |
|
| inline bool lookupValue(const std::string &path, double &value) const | | inline bool lookupValue(const std::string &path, double &value) | |
| throw() | | const throw() | |
| { return(lookupValue(path.c_str(), value)); } | | { return(lookupValue(path.c_str(), value)); } | |
| | | | |
|
| inline bool lookupValue(const std::string &path, float &value) const | | inline bool lookupValue(const std::string &path, float &value) | |
| throw() | | const throw() | |
| { return(lookupValue(path.c_str(), value)); } | | { return(lookupValue(path.c_str(), value)); } | |
| | | | |
|
| inline bool lookupValue(const std::string &path, const char *&value) co
nst | | inline bool lookupValue(const std::string &path, const char *&value) | |
| throw() | | const throw() | |
| { return(lookupValue(path.c_str(), value)); } | | { return(lookupValue(path.c_str(), value)); } | |
| | | | |
|
| inline bool lookupValue(const std::string &path, std::string &value) co
nst | | inline bool lookupValue(const std::string &path, std::string &value) | |
| throw() | | const throw() | |
| { return(lookupValue(path.c_str(), value)); } | | { return(lookupValue(path.c_str(), value)); } | |
| | | | |
| Setting & getRoot() const; | | Setting & getRoot() const; | |
| }; | | }; | |
| | | | |
| } // namespace libconfig | | } // namespace libconfig | |
| | | | |
| #endif // __libconfig_hpp | | #endif // __libconfig_hpp | |
| | | | |
End of changes. 9 change blocks. |
| 17 lines changed or deleted | | 13 lines changed or added | |
|