diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2023-04-03 08:17:38 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2023-04-03 08:17:38 +0000 |
| commit | d57675fc67455faf7c68d4003a1ce884779e2c7c (patch) | |
| tree | 3becd19ea8eda8827e45bf9e627d580fe614be64 /plugins/solidigm/solidigm-telemetry/config.c | |
| parent | Releasing debian version 2.4-1. (diff) | |
| download | nvme-cli-d57675fc67455faf7c68d4003a1ce884779e2c7c.tar.xz nvme-cli-d57675fc67455faf7c68d4003a1ce884779e2c7c.zip | |
Merging upstream version 2.4+really2.3.
This reverts commit f42531334c05b7f49ae43c0a27e347a487fb2667.
Diffstat (limited to 'plugins/solidigm/solidigm-telemetry/config.c')
| -rw-r--r-- | plugins/solidigm/solidigm-telemetry/config.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/plugins/solidigm/solidigm-telemetry/config.c b/plugins/solidigm/solidigm-telemetry/config.c index 5111703..781d786 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 struct json_object *obj, int version_major, - int version_minor, struct json_object **value) +static bool config_get_by_version(const json_object *obj, int version_major, + int version_minor, 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); - struct json_object *major_obj = NULL; + 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 struct json_object *obj, int version_maj return value != NULL; } -bool solidigm_config_get_by_token_version(const struct json_object *obj, int token_id, +bool solidigm_config_get_by_token_version(const json_object *obj, int token_id, int version_major, int version_minor, - struct json_object **value) + json_object **value) { - struct json_object *token_obj = NULL; + json_object *token_obj = NULL; char str_key[MAX_16BIT_NUM_AS_STRING_SIZE]; snprintf(str_key, sizeof(str_key), "%d", token_id); |