Changeset 155d34f in mainline

Timestamp:

2025-05-07T11:08:31Z (5 weeks ago)

Author:

Miroslav Cimerman <mc@…>

Children:

56602e0

Parents:

af4ecb76

Message:

hr: rename hr_get_*_status_msg → hr_get_*_state_str

Location:

uspace

Files:

• lib/device/include/hr.h (modified) (1 diff)
• lib/device/src/hr.c (modified) (7 diffs)
• srv/bd/hr/raid1.c (modified) (1 diff)
• srv/bd/hr/raid5.c (modified) (1 diff)
• srv/bd/hr/util.c (modified) (3 diffs)

uspace/lib/device/include/hr.h

@@ -130 +130 @@
 extern errno_t           hr_add_hotspare(hr_t *, const char *, const char *);
 extern errno_t           hr_print_status(hr_t *);
-extern const char       *hr_get_vol_status_msg(hr_vol_status_t);
-extern const char       *hr_get_ext_status_msg(hr_ext_status_t);
+extern const char       *hr_get_vol_state_str(hr_vol_status_t);
+extern const char       *hr_get_ext_state_str(hr_ext_status_t);
 extern const char       *hr_get_layout_str(hr_layout_t);
 extern const char       *hr_get_metadata_type_str(hr_metadata_type_t);

uspace/lib/device/src/hr.c

@@ -225 +225 @@
         printf("devname: %s\n", devname);
 
-        printf("status: %s\n", hr_get_vol_status_msg(vol_info->status));
+        printf("status: %s\n", hr_get_vol_state_str(vol_info->status));
 
         printf("level: %d\n", vol_info->level);
@@ -264 +264 @@
                             (i == vol_info->extent_no - 1 &&
                             vol_info->layout == HR_RLQ_RAID4_N))
-                                printf("          P   %s    %zu       %s\n", hr_get_ext_status_msg(ext->status), i, devname);
+                                printf("          P   %s    %zu       %s\n", hr_get_ext_state_str(ext->status), i, devname);
                         else
-                                printf("              %s    %zu       %s\n", hr_get_ext_status_msg(ext->status), i, devname);
+                                printf("              %s    %zu       %s\n", hr_get_ext_state_str(ext->status), i, devname);
                 } else {
-                        printf("          %s    %zu       %s\n", hr_get_ext_status_msg(ext->status), i, devname);
+                        printf("          %s    %zu       %s\n", hr_get_ext_state_str(ext->status), i, devname);
                 }
         }
@@ -286 +286 @@
                 }
                 printf("            %s   %zu     %s\n",
-                    hr_get_ext_status_msg(ext->status), i, devname);
+                    hr_get_ext_state_str(ext->status), i, devname);
         }
 
@@ -477 +477 @@
 }
 
-const char *hr_get_vol_status_msg(hr_vol_status_t status)
+/** Get volume state string.
+ *
+ * @param state State value
+ *
+ * @return State string
+ */
+const char *hr_get_vol_state_str(hr_vol_status_t status)
 {
         switch (status) {
@@ -495 +501 @@
 }
 
-const char *hr_get_ext_status_msg(hr_ext_status_t status)
+/** Get extent state string.
+ *
+ * @param state State value
+ *
+ * @return State string
+ */
+const char *hr_get_ext_state_str(hr_ext_status_t status)
 {
         switch (status) {
@@ -517 +529 @@
 }
 
+/** Get volume layout string.
+ *
+ * @param layout Layout value
+ *
+ * @return Layout string
+ */
 const char *hr_get_layout_str(hr_layout_t layout)
 {
@@ -537 +555 @@
 }
 
+/** Get volume metadata type string.
+ *
+ * @param type Metadata type value
+ *
+ * @return Metadata type string
+ */
 const char *hr_get_metadata_type_str(hr_metadata_type_t type)
 {

uspace/srv/bd/hr/raid1.c

@@ -609 +609 @@
         if (hs_state != HR_EXT_HOTSPARE) {
                 HR_ERROR("hr_raid1_rebuild(): invalid hotspare state \"%s\", "
-                    "aborting rebuild\n", hr_get_ext_status_msg(hs_state));
+                    "aborting rebuild\n", hr_get_ext_state_str(hs_state));
                 rc = EINVAL;
                 goto error;

uspace/srv/bd/hr/raid5.c

@@ -745 +745 @@
         if (hs_state != HR_EXT_HOTSPARE) {
                 HR_ERROR("hr_raid5_rebuild(): invalid hotspare state \"%s\", "
-                    "aborting rebuild\n", hr_get_ext_status_msg(hs_state));
+                    "aborting rebuild\n", hr_get_ext_state_str(hs_state));
                 rc = EINVAL;
                 goto end;

uspace/srv/bd/hr/util.c

@@ -385 +385 @@
         hr_ext_status_t old = vol->extents[ext_idx].status;
         HR_NOTE("\"%s\": changing extent %zu state: %s -> %s\n",
-            vol->devname, ext_idx, hr_get_ext_status_msg(old),
-            hr_get_ext_status_msg(s));
+            vol->devname, ext_idx, hr_get_ext_state_str(old),
+            hr_get_ext_state_str(s));
         vol->extents[ext_idx].status = s;
 }
@@ -399 +399 @@
         hr_ext_status_t old = vol->hotspares[hs_idx].status;
         HR_NOTE("\"%s\": changing hotspare %zu state: %s -> %s\n",
-            vol->devname, hs_idx, hr_get_ext_status_msg(old),
-            hr_get_ext_status_msg(s));
+            vol->devname, hs_idx, hr_get_ext_state_str(old),
+            hr_get_ext_state_str(s));
         vol->hotspares[hs_idx].status = s;
 }
@@ -409 +409 @@
 
         HR_NOTE("\"%s\": changing volume state: %s -> %s\n", vol->devname,
-            hr_get_vol_status_msg(vol->status), hr_get_vol_status_msg(new));
+            hr_get_vol_state_str(vol->status), hr_get_vol_state_str(new));
         vol->status = new;
 }