From 0e14f8284f185c005ccb0ca11405e05ba7431776 Mon Sep 17 00:00:00 2001 From: Vojtech Trefny Date: Thu, 4 Dec 2025 15:21:37 +0100 Subject: [PATCH] nvme: Fix typo in BD_NVME_SANITIZE_STATUS_IN_PROG*R*ESS Unfortunately we need to keep the "progess" member as well now. --- src/lib/plugin_apis/nvme.api | 6 ++++-- src/plugins/nvme/nvme-info.c | 2 +- src/plugins/nvme/nvme.h | 6 ++++-- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/src/lib/plugin_apis/nvme.api b/src/lib/plugin_apis/nvme.api index 1f8bb01d..b37b54e9 100644 --- a/src/lib/plugin_apis/nvme.api +++ b/src/lib/plugin_apis/nvme.api @@ -886,7 +886,8 @@ typedef enum { /** * BDNVMESanitizeStatus: * @BD_NVME_SANITIZE_STATUS_NEVER_SANITIZED: The NVM subsystem has never been sanitized. - * @BD_NVME_SANITIZE_STATUS_IN_PROGESS: A sanitize operation is currently in progress. + * @BD_NVME_SANITIZE_STATUS_IN_PROGRESS: A sanitize operation is currently in progress. + * @BD_NVME_SANITIZE_STATUS_IN_PROGESS: Deprecated alias for %BD_NVME_SANITIZE_STATUS_IN_PROGRESS * @BD_NVME_SANITIZE_STATUS_SUCCESS: The most recent sanitize operation completed successfully including any additional media modification. * @BD_NVME_SANITIZE_STATUS_SUCCESS_NO_DEALLOC: The most recent sanitize operation for which No-Deallocate After Sanitize was requested has completed successfully with deallocation of all user data. * @BD_NVME_SANITIZE_STATUS_FAILED: The most recent sanitize operation failed. @@ -894,7 +895,8 @@ typedef enum { /* BpG-skip-end */ typedef enum { BD_NVME_SANITIZE_STATUS_NEVER_SANITIZED = 0, - BD_NVME_SANITIZE_STATUS_IN_PROGESS = 1, + BD_NVME_SANITIZE_STATUS_IN_PROGRESS = 1, + BD_NVME_SANITIZE_STATUS_IN_PROGESS = BD_NVME_SANITIZE_STATUS_IN_PROGRESS, BD_NVME_SANITIZE_STATUS_SUCCESS = 2, BD_NVME_SANITIZE_STATUS_SUCCESS_NO_DEALLOC = 3, BD_NVME_SANITIZE_STATUS_FAILED = 4, diff --git a/src/plugins/nvme/nvme-info.c b/src/plugins/nvme/nvme-info.c index 3373d201..fb99938c 100644 --- a/src/plugins/nvme/nvme-info.c +++ b/src/plugins/nvme/nvme-info.c @@ -1147,7 +1147,7 @@ BDNVMESanitizeLog * bd_nvme_get_sanitize_log (const gchar *device, GError **erro log->sanitize_status = BD_NVME_SANITIZE_STATUS_SUCCESS; break; case NVME_SANITIZE_SSTAT_STATUS_IN_PROGESS: - log->sanitize_status = BD_NVME_SANITIZE_STATUS_IN_PROGESS; + log->sanitize_status = BD_NVME_SANITIZE_STATUS_IN_PROGRESS; break; case NVME_SANITIZE_SSTAT_STATUS_COMPLETED_FAILED: log->sanitize_status = BD_NVME_SANITIZE_STATUS_FAILED; diff --git a/src/plugins/nvme/nvme.h b/src/plugins/nvme/nvme.h index 6e1866ec..1281ec48 100644 --- a/src/plugins/nvme/nvme.h +++ b/src/plugins/nvme/nvme.h @@ -468,14 +468,16 @@ typedef enum { /** * BDNVMESanitizeStatus: * @BD_NVME_SANITIZE_STATUS_NEVER_SANITIZED: The NVM subsystem has never been sanitized. - * @BD_NVME_SANITIZE_STATUS_IN_PROGESS: A sanitize operation is currently in progress. + * @BD_NVME_SANITIZE_STATUS_IN_PROGRESS: A sanitize operation is currently in progress. + * @BD_NVME_SANITIZE_STATUS_IN_PROGESS: Deprecated alias for %BD_NVME_SANITIZE_STATUS_IN_PROGRESS * @BD_NVME_SANITIZE_STATUS_SUCCESS: The most recent sanitize operation completed successfully including any additional media modification. * @BD_NVME_SANITIZE_STATUS_SUCCESS_NO_DEALLOC: The most recent sanitize operation for which No-Deallocate After Sanitize was requested has completed successfully with deallocation of all user data. * @BD_NVME_SANITIZE_STATUS_FAILED: The most recent sanitize operation failed. */ typedef enum { BD_NVME_SANITIZE_STATUS_NEVER_SANITIZED = 0, - BD_NVME_SANITIZE_STATUS_IN_PROGESS = 1, + BD_NVME_SANITIZE_STATUS_IN_PROGRESS = 1, + BD_NVME_SANITIZE_STATUS_IN_PROGESS = BD_NVME_SANITIZE_STATUS_IN_PROGRESS, BD_NVME_SANITIZE_STATUS_SUCCESS = 2, BD_NVME_SANITIZE_STATUS_SUCCESS_NO_DEALLOC = 3, BD_NVME_SANITIZE_STATUS_FAILED = 4,