diff options
author | Mark Lindner <mark.a.lindner@gmail.com> | 2022-11-22 10:35:32 -0700 |
---|---|---|
committer | Mark Lindner <mark.a.lindner@gmail.com> | 2022-11-22 10:35:32 -0700 |
commit | 935062924d2031de52c5e171cc8ef72cce0785e2 (patch) | |
tree | 9221c3023a21ab3a2a266f1310c948379878e04f | |
parent | ba33788dbc11de9d0e0ef77a0119d5c4393aafe7 (diff) | |
download | libconfig-935062924d2031de52c5e171cc8ef72cce0785e2.tar.gz |
Fixed inconsistent use of short vs. unsigned short in some APIs.
-rw-r--r-- | doc/libconfig.texi | 8 | ||||
-rw-r--r-- | lib/libconfig.c | 4 | ||||
-rw-r--r-- | lib/libconfig.h | 14 |
3 files changed, 13 insertions, 13 deletions
diff --git a/doc/libconfig.texi b/doc/libconfig.texi index 0d35600..19c4684 100644 --- a/doc/libconfig.texi +++ b/doc/libconfig.texi @@ -1020,8 +1020,8 @@ option. They are obsoleted by the @code{config_set_option()} and @end deftypefun -@deftypefun short config_get_default_format (@w{config_t * @var{config}}) -@deftypefunx void config_set_default_format (@w{config_t * @var{config}}, @w{short @var{format}}) +@deftypefun {unsigned short} config_get_default_format (@w{config_t * @var{config}}) +@deftypefunx void config_set_default_format (@w{config_t * @var{config}}, @w{unsigned short @var{format}}) These functions, which are implemented as macros, get and set the default external format for settings in the configuration @@ -1134,8 +1134,8 @@ be freed by the caller. @end deftypefun -@deftypefun short config_setting_get_format (@w{config_setting_t * @var{setting}}) -@deftypefunx int config_setting_set_format (@w{config_setting_t * @var{setting}}, @w{short @var{format}}) +@deftypefun {unsigned short} config_setting_get_format (@w{config_setting_t * @var{setting}}) +@deftypefunx int config_setting_set_format (@w{config_setting_t * @var{setting}}, @w{unsigned short @var{format}}) These functions get and set the external format for the setting @var{setting}. diff --git a/lib/libconfig.c b/lib/libconfig.c index 7d69691..c43413a 100644 --- a/lib/libconfig.c +++ b/lib/libconfig.c @@ -1198,7 +1198,7 @@ int config_setting_set_string(config_setting_t *setting, const char *value) /* ------------------------------------------------------------------------- */ -int config_setting_set_format(config_setting_t *setting, short format) +int config_setting_set_format(config_setting_t *setting, unsigned short format) { if(((setting->type != CONFIG_TYPE_INT) && (setting->type != CONFIG_TYPE_INT64)) @@ -1212,7 +1212,7 @@ int config_setting_set_format(config_setting_t *setting, short format) /* ------------------------------------------------------------------------- */ -short config_setting_get_format(const config_setting_t *setting) +unsigned short config_setting_get_format(const config_setting_t *setting) { return(setting->format != 0 ? setting->format : setting->config->default_format); diff --git a/lib/libconfig.h b/lib/libconfig.h index ea253c1..a67ce77 100644 --- a/lib/libconfig.h +++ b/lib/libconfig.h @@ -82,8 +82,8 @@ typedef union config_value_t typedef struct config_setting_t { char *name; - short type; - short format; + unsigned short type; + unsigned short format; config_value_t value; struct config_setting_t *parent; struct config_t *config; @@ -134,7 +134,7 @@ extern LIBCONFIG_API int config_read(config_t *config, FILE *stream); extern LIBCONFIG_API void config_write(const config_t *config, FILE *stream); extern LIBCONFIG_API void config_set_default_format(config_t *config, - short format); + unsigned short format); extern LIBCONFIG_API void config_set_options(config_t *config, int options); extern LIBCONFIG_API int config_get_options(const config_t *config); @@ -212,8 +212,8 @@ extern LIBCONFIG_API int config_setting_set_string(config_setting_t *setting, const char *value); extern LIBCONFIG_API int config_setting_set_format(config_setting_t *setting, - short format); -extern LIBCONFIG_API short config_setting_get_format( + unsigned short format); +extern LIBCONFIG_API unsigned short config_setting_get_format( const config_setting_t *setting); extern LIBCONFIG_API int config_setting_get_int_elem( @@ -327,10 +327,10 @@ extern LIBCONFIG_API int config_lookup_string(const config_t *config, ((C)->root) #define /* void */ config_set_default_format(/* config_t * */ C, \ - /* short */ F) \ + /* unsigned short */ F) \ (C)->default_format = (F) -#define /* short */ config_get_default_format(/* config_t * */ C) \ +#define /* unsigned short */ config_get_default_format(/* config_t * */ C) \ ((C)->default_format) #define /* unsigned short */ config_setting_source_line( \ |