nvme-print: Fix endurance_log whitespace changes

Signed-off-by: Tokunori Ikegami <ikegami.t@gmail.com>

diff --git a/nvme-print-binary.c b/nvme-print-binary.c
index 616d7313bcd26ff2ccd16541f8645f1592d7a322..3a4617a33598d55084f02ae70cf6f83ef9612d76 100644 (file)
--- a/nvme-print-binary.c
+++ b/nvme-print-binary.c
@@ -234,8 +234,8 @@ static void binary_supported_log(struct nvme_supported_log_pages *support_log,
        d_raw((unsigned char *)support_log, sizeof(*support_log));
 }
 
-static void binary_endurance_log(struct nvme_endurance_group_log *endurance_log,
-       __u16 group_id, const char *devname)
+static void binary_endurance_log(struct nvme_endurance_group_log *endurance_log, __u16 group_id,
+                                const char *devname)
 {
        return d_raw((unsigned char *)endurance_log, sizeof(*endurance_log));
 }

diff --git a/nvme-print-json.c b/nvme-print-json.c
index 525d26c90598314738c708783f7dabd2bc37f052..2962d971a2394e558953c472f37daccffe0cc2f4 100644 (file)
--- a/nvme-print-json.c
+++ b/nvme-print-json.c
@@ -454,51 +454,36 @@ void json_changed_ns_list_log(struct nvme_ns_list *log,
        json_free_object(root);
 }
 
-static void json_endurance_log(struct nvme_endurance_group_log *endurance_group,
-                              __u16 group_id, const char *devname)
+static void json_endurance_log(struct nvme_endurance_group_log *endurance_group, __u16 group_id,
+                              const char *devname)
 {
        struct json_object *root;
-
-       nvme_uint128_t endurance_estimate =
-               le128_to_cpu(endurance_group->endurance_estimate);
-       nvme_uint128_t data_units_read =
-               le128_to_cpu(endurance_group->data_units_read);
-       nvme_uint128_t data_units_written =
-               le128_to_cpu(endurance_group->data_units_written);
-       nvme_uint128_t media_units_written =
-               le128_to_cpu(endurance_group->media_units_written);
-       nvme_uint128_t host_read_cmds =
-               le128_to_cpu(endurance_group->host_read_cmds);
-       nvme_uint128_t host_write_cmds =
-               le128_to_cpu(endurance_group->host_write_cmds);
+       nvme_uint128_t endurance_estimate = le128_to_cpu(endurance_group->endurance_estimate);
+       nvme_uint128_t data_units_read = le128_to_cpu(endurance_group->data_units_read);
+       nvme_uint128_t data_units_written = le128_to_cpu(endurance_group->data_units_written);
+       nvme_uint128_t media_units_written = le128_to_cpu(endurance_group->media_units_written);
+       nvme_uint128_t host_read_cmds = le128_to_cpu(endurance_group->host_read_cmds);
+       nvme_uint128_t host_write_cmds = le128_to_cpu(endurance_group->host_write_cmds);
        nvme_uint128_t media_data_integrity_err =
-               le128_to_cpu(endurance_group->media_data_integrity_err);
+           le128_to_cpu(endurance_group->media_data_integrity_err);
        nvme_uint128_t num_err_info_log_entries =
-               le128_to_cpu(endurance_group->num_err_info_log_entries);
+           le128_to_cpu(endurance_group->num_err_info_log_entries);
 
        root = json_create_object();
 
-       json_object_add_value_int(root, "critical_warning",
-               endurance_group->critical_warning);
-       json_object_add_value_int(root, "avl_spare",
-               endurance_group->avl_spare);
+       json_object_add_value_int(root, "critical_warning", endurance_group->critical_warning);
+       json_object_add_value_int(root, "avl_spare", endurance_group->avl_spare);
        json_object_add_value_int(root, "avl_spare_threshold",
-               endurance_group->avl_spare_threshold);
-       json_object_add_value_int(root, "percent_used",
-               endurance_group->percent_used);
-       json_object_add_value_uint128(root, "endurance_estimate",
-               endurance_estimate);
+                                 endurance_group->avl_spare_threshold);
+       json_object_add_value_int(root, "percent_used", endurance_group->percent_used);
+       json_object_add_value_uint128(root, "endurance_estimate", endurance_estimate);
        json_object_add_value_uint128(root, "data_units_read", data_units_read);
-       json_object_add_value_uint128(root, "data_units_written",
-               data_units_written);
-       json_object_add_value_uint128(root, "media_units_written",
-               media_units_written);
+       json_object_add_value_uint128(root, "data_units_written", data_units_written);
+       json_object_add_value_uint128(root, "media_units_written", media_units_written);
        json_object_add_value_uint128(root, "host_read_cmds", host_read_cmds);
        json_object_add_value_uint128(root, "host_write_cmds", host_write_cmds);
-       json_object_add_value_uint128(root, "media_data_integrity_err",
-               media_data_integrity_err);
-       json_object_add_value_uint128(root, "num_err_info_log_entries",
-               num_err_info_log_entries);
+       json_object_add_value_uint128(root, "media_data_integrity_err", media_data_integrity_err);
+       json_object_add_value_uint128(root, "num_err_info_log_entries", num_err_info_log_entries);
 
        json_print_object(root, NULL);
        printf("\n");

diff --git a/nvme-print-stdout.c b/nvme-print-stdout.c
index 48c693a24efe17848f3c41b00a79149e1b6728bc..0fdf92c7b673113ea96f1fe195705dbec0db97a4 100644 (file)
--- a/nvme-print-stdout.c
+++ b/nvme-print-stdout.c
@@ -3709,41 +3709,30 @@ static void stdout_supported_log(struct nvme_supported_log_pages *support_log,
        }
 }
 
-static void stdout_endurance_log(struct nvme_endurance_group_log *endurance_log,
-                                __u16 group_id, const char *devname)
+static void stdout_endurance_log(struct nvme_endurance_group_log *endurance_log, __u16 group_id,
+                                const char *devname)
 {
-       printf("Endurance Group Log for NVME device:%s Group ID:%x\n", devname,
-               group_id);
-       printf("critical warning        : %u\n",
-               endurance_log->critical_warning);
+       printf("Endurance Group Log for NVME device:%s Group ID:%x\n", devname, group_id);
+       printf("critical_warning        : %u\n", endurance_log->critical_warning);
        printf("avl_spare               : %u\n", endurance_log->avl_spare);
-       printf("avl_spare_threshold     : %u\n",
-               endurance_log->avl_spare_threshold);
+       printf("avl_spare_threshold     : %u\n", endurance_log->avl_spare_threshold);
        printf("percent_used            : %u%%\n", endurance_log->percent_used);
        printf("endurance_estimate      : %s\n",
-               uint128_t_to_l10n_string(
-                       le128_to_cpu(endurance_log->endurance_estimate)));
+              uint128_t_to_l10n_string(le128_to_cpu(endurance_log->endurance_estimate)));
        printf("data_units_read         : %s\n",
-               uint128_t_to_l10n_string(
-                       le128_to_cpu(endurance_log->data_units_read)));
+              uint128_t_to_l10n_string(le128_to_cpu(endurance_log->data_units_read)));
        printf("data_units_written      : %s\n",
-               uint128_t_to_l10n_string(
-                       le128_to_cpu(endurance_log->data_units_written)));
+              uint128_t_to_l10n_string(le128_to_cpu(endurance_log->data_units_written)));
        printf("media_units_written     : %s\n",
-               uint128_t_to_l10n_string(
-                       le128_to_cpu(endurance_log->media_units_written)));
+              uint128_t_to_l10n_string(le128_to_cpu(endurance_log->media_units_written)));
        printf("host_read_cmds          : %s\n",
-               uint128_t_to_l10n_string(
-                       le128_to_cpu(endurance_log->host_read_cmds)));
+              uint128_t_to_l10n_string(le128_to_cpu(endurance_log->host_read_cmds)));
        printf("host_write_cmds         : %s\n",
-               uint128_t_to_l10n_string(
-                       le128_to_cpu(endurance_log->host_write_cmds)));
+              uint128_t_to_l10n_string(le128_to_cpu(endurance_log->host_write_cmds)));
        printf("media_data_integrity_err: %s\n",
-               uint128_t_to_l10n_string(
-                       le128_to_cpu(endurance_log->media_data_integrity_err)));
+              uint128_t_to_l10n_string(le128_to_cpu(endurance_log->media_data_integrity_err)));
        printf("num_err_info_log_entries: %s\n",
-               uint128_t_to_l10n_string(
-                       le128_to_cpu(endurance_log->num_err_info_log_entries)));
+              uint128_t_to_l10n_string(le128_to_cpu(endurance_log->num_err_info_log_entries)));
 }
 
 static void stdout_smart_log(struct nvme_smart_log *smart, unsigned int nsid,