From 8e1dcd44fcad7826e5f8fa6c5caa6c23989518d9 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Fri, 7 Apr 2023 14:43:34 +0200 Subject: Merging upstream version 2.4+really2.4. Signed-off-by: Daniel Baumann --- plugins/solidigm/solidigm-telemetry/config.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'plugins/solidigm/solidigm-telemetry/config.c') diff --git a/plugins/solidigm/solidigm-telemetry/config.c b/plugins/solidigm/solidigm-telemetry/config.c index 781d786..5111703 100644 --- a/plugins/solidigm/solidigm-telemetry/config.c +++ b/plugins/solidigm/solidigm-telemetry/config.c @@ -11,15 +11,15 @@ // max 16 bit unsigned integer nummber 65535 #define MAX_16BIT_NUM_AS_STRING_SIZE 6 -static bool config_get_by_version(const json_object *obj, int version_major, - int version_minor, json_object **value) +static bool config_get_by_version(const struct json_object *obj, int version_major, + int version_minor, struct json_object **value) { char str_key[MAX_16BIT_NUM_AS_STRING_SIZE]; char str_subkey[MAX_16BIT_NUM_AS_STRING_SIZE]; snprintf(str_key, sizeof(str_key), "%d", version_major); snprintf(str_subkey, sizeof(str_subkey), "%d", version_minor); - json_object *major_obj = NULL; + struct json_object *major_obj = NULL; if (!json_object_object_get_ex(obj, str_key, &major_obj)) return false; @@ -28,11 +28,11 @@ static bool config_get_by_version(const json_object *obj, int version_major, return value != NULL; } -bool solidigm_config_get_by_token_version(const json_object *obj, int token_id, +bool solidigm_config_get_by_token_version(const struct json_object *obj, int token_id, int version_major, int version_minor, - json_object **value) + struct json_object **value) { - json_object *token_obj = NULL; + struct json_object *token_obj = NULL; char str_key[MAX_16BIT_NUM_AS_STRING_SIZE]; snprintf(str_key, sizeof(str_key), "%d", token_id); -- cgit v1.2.3