[04/13] gard: Replace is_valid_id with is_valid_record()

Message ID 20171108085918.12590-5-oohall@gmail.com
State New
Headers show
Series
  • [01/13] gard: show: Remove "Res Recovery" field
Related show

Commit Message

Oliver O'Halloran Nov. 8, 2017, 8:59 a.m.
It was annoying me.

Signed-off-by: Oliver O'Halloran <oohall@gmail.com>
---
 external/gard/gard.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

Patch

diff --git a/external/gard/gard.c b/external/gard/gard.c
index 9505293d745c..0c8ac47e74f1 100644
--- a/external/gard/gard.c
+++ b/external/gard/gard.c
@@ -182,9 +182,9 @@  static const char *path_type_to_str(enum path_type t)
 	return "Unknown";
 }
 
-static bool is_valid_id(uint32_t record_id)
+static bool is_valid_record(struct gard_record *g)
 {
-	return record_id != CLEARED_RECORD_ID;
+	return be32toh(g->record_id) != CLEARED_RECORD_ID;
 }
 
 static int do_iterate(struct gard_ctx *ctx,
@@ -246,7 +246,7 @@  static int count_valid_records_i(struct gard_ctx *ctx, int pos, struct gard_reco
 	if (!gard || !priv)
 		return -1;
 
-	if (is_valid_id(be32toh(gard->record_id)))
+	if (is_valid_record(gard))
 		(*(int *)priv)++;
 
 	return 0;
@@ -272,7 +272,7 @@  static int do_list_i(struct gard_ctx *ctx, int pos, struct gard_record *gard, vo
 	if (!gard)
 		return -1;
 
-	if (is_valid_id(be32toh(gard->record_id)))
+	if (is_valid_record(gard))
 		printf("| %08x | %08x | %-15s |\n", be32toh(gard->record_id), be32toh(gard->errlog_eid),
 		       path_type_to_str(gard->target_id.type_size >> PATH_TYPE_SHIFT));