From f6a80e0dc8b5e9fc1a4ede81d7d98d7e6ef35d6e Mon Sep 17 00:00:00 2001 From: iceman1001 Date: Sun, 7 Apr 2019 20:34:42 +0200 Subject: [PATCH] funcArgNamesDifferent --- client/jansson/jansson.h | 4 ++-- client/jansson/jansson_private.h | 3 +-- client/jansson/utf.h | 2 +- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/client/jansson/jansson.h b/client/jansson/jansson.h index e282674f3..6f42d68c1 100644 --- a/client/jansson/jansson.h +++ b/client/jansson/jansson.h @@ -320,12 +320,12 @@ int json_path_set(json_t *json, const char *path, json_t *value, size_t flags, j typedef size_t (*json_load_callback_t)(void *buffer, size_t buflen, void *data); -json_t *json_loads(const char *input, size_t flags, json_error_t *error) JANSSON_ATTRS(warn_unused_result); +json_t *json_loads(const char *string, size_t flags, json_error_t *error) JANSSON_ATTRS(warn_unused_result); json_t *json_loadb(const char *buffer, size_t buflen, size_t flags, json_error_t *error) JANSSON_ATTRS(warn_unused_result); json_t *json_loadf(FILE *input, size_t flags, json_error_t *error) JANSSON_ATTRS(warn_unused_result); json_t *json_loadfd(int input, size_t flags, json_error_t *error) JANSSON_ATTRS(warn_unused_result); json_t *json_load_file(const char *path, size_t flags, json_error_t *error) JANSSON_ATTRS(warn_unused_result); -json_t *json_load_callback(json_load_callback_t callback, void *data, size_t flags, json_error_t *error) JANSSON_ATTRS(warn_unused_result); +json_t *json_load_callback(json_load_callback_t callback, void *arg, size_t flags, json_error_t *error) JANSSON_ATTRS(warn_unused_result); /* encoding */ diff --git a/client/jansson/jansson_private.h b/client/jansson/jansson_private.h index 5957f70b2..094d79e75 100644 --- a/client/jansson/jansson_private.h +++ b/client/jansson/jansson_private.h @@ -84,12 +84,11 @@ void jsonp_error_vset(json_error_t *error, int line, int column, /* Locale independent string<->double conversions */ int jsonp_strtod(strbuffer_t *strbuffer, double *out); -int jsonp_dtostr(char *buffer, size_t size, double value, int prec); +int jsonp_dtostr(char *buffer, size_t size, double value, int precision); /* Wrappers for custom memory functions */ void *jsonp_malloc(size_t size) JANSSON_ATTRS(warn_unused_result); void jsonp_free(void *ptr); -char *jsonp_strndup(const char *str, size_t length) JANSSON_ATTRS(warn_unused_result); char *jsonp_strdup(const char *str) JANSSON_ATTRS(warn_unused_result); char *jsonp_strndup(const char *str, size_t len) JANSSON_ATTRS(warn_unused_result); diff --git a/client/jansson/utf.h b/client/jansson/utf.h index e182df78f..0ca69253e 100644 --- a/client/jansson/utf.h +++ b/client/jansson/utf.h @@ -20,7 +20,7 @@ int utf8_encode(int32_t codepoint, char *buffer, size_t *size); size_t utf8_check_first(char byte); size_t utf8_check_full(const char *buffer, size_t size, int32_t *codepoint); -const char *utf8_iterate(const char *buffer, size_t size, int32_t *codepoint); +const char *utf8_iterate(const char *buffer, size_t bufsize, int32_t *codepoint); int utf8_check_string(const char *string, size_t length);