Changeset 56602e0 in mainline for uspace/lib/device/src/hr.c

Timestamp:

2025-05-07T11:27:25Z (5 weeks ago)

Author:

Miroslav Cimerman <mc@…>

Children:

964e897

Parents:

155d34f

git-author:

Miroslav Cimerman <mc@…> (2025-05-07 11:26:23)

git-committer:

Miroslav Cimerman <mc@…> (2025-05-07 11:27:25)

Message:

hr: rename all strings status' -> state'

File:

• uspace/lib/device/src/hr.c (modified) (8 diffs)

uspace/lib/device/src/hr.c

@@ -225 +225 @@
         printf("devname: %s\n", devname);
 
-        printf("status: %s\n", hr_get_vol_state_str(vol_info->status));
+        printf("state: %s\n", hr_get_vol_state_str(vol_info->state));
 
         printf("level: %d\n", vol_info->level);
@@ -246 +246 @@
 
         if (vol_info->level == HR_LVL_4)
-                printf("extents: [P] [status] [index] [devname]\n");
+                printf("extents: [P] [state] [index] [devname]\n");
         else
-                printf("extents: [status] [index] [devname]\n");
+                printf("extents: [state] [index] [devname]\n");
         for (i = 0; i < vol_info->extent_no; i++) {
                 ext = &vol_info->extents[i];
-                if (ext->status == HR_EXT_MISSING || ext->status == HR_EXT_NONE) {
+                if (ext->state == HR_EXT_MISSING || ext->state == HR_EXT_NONE) {
                         devname = (char *) "MISSING-devname";
                 } else {
@@ -264 +264 @@
                             (i == vol_info->extent_no - 1 &&
                             vol_info->layout == HR_RLQ_RAID4_N))
-                                printf("          P   %s    %zu       %s\n", hr_get_ext_state_str(ext->status), i, devname);
+                                printf("          P   %s    %zu       %s\n", hr_get_ext_state_str(ext->state), i, devname);
                         else
-                                printf("              %s    %zu       %s\n", hr_get_ext_state_str(ext->status), i, devname);
+                                printf("              %s    %zu       %s\n", hr_get_ext_state_str(ext->state), i, devname);
                 } else {
-                        printf("          %s    %zu       %s\n", hr_get_ext_state_str(ext->status), i, devname);
+                        printf("          %s    %zu       %s\n", hr_get_ext_state_str(ext->state), i, devname);
                 }
         }
@@ -275 +275 @@
                 return EOK;
 
-        printf("hotspares: [status] [index] [devname]\n");
+        printf("hotspares: [state] [index] [devname]\n");
         for (i = 0; i < vol_info->hotspare_no; i++) {
                 ext = &vol_info->hotspares[i];
-                if (ext->status == HR_EXT_MISSING) {
+                if (ext->state == HR_EXT_MISSING) {
                         devname = (char *) "MISSING-devname";
                 } else {
@@ -286 +286 @@
                 }
                 printf("            %s   %zu     %s\n",
-                    hr_get_ext_state_str(ext->status), i, devname);
+                    hr_get_ext_state_str(ext->state), i, devname);
         }
 
@@ -414 +414 @@
  * @return EOK on success or an error code
  */
-errno_t hr_print_status(hr_t *hr)
+errno_t hr_print_state(hr_t *hr)
 {
         errno_t rc, retval;
@@ -483 +483 @@
  * @return State string
  */
-const char *hr_get_vol_state_str(hr_vol_status_t status)
-{
-        switch (status) {
+const char *hr_get_vol_state_str(hr_vol_state_t state)
+{
+        switch (state) {
         case HR_VOL_NONE:
                 return "NONE/UNKNOWN";
@@ -507 +507 @@
  * @return State string
  */
-const char *hr_get_ext_state_str(hr_ext_status_t status)
-{
-        switch (status) {
+const char *hr_get_ext_state_str(hr_ext_state_t state)
+{
+        switch (state) {
         case HR_EXT_NONE:
                 return "NONE/UNKNOWN";