libnvme: reuse NBFT descriptor offset calculation

Author: flaviens

libnvme/src/nvme/nbft.c

@@ -656,6 +656,12 @@ static int read_security(struct libnvme_global_ctx *ctx, struct libnbft_info *nb
 	return 0;
 }
 
+static void *descriptor_at(__u8 *descriptors, size_t descriptor_len,
+		size_t index)
+{
+	return descriptors + index * descriptor_len;
+}
+
 static void read_hfi_descriptors(struct libnvme_global_ctx *ctx,
 		struct libnbft_info *nbft, int num_hfi,
 		__u8 *raw_hfi_array, size_t hfi_len)
@@ -665,7 +671,7 @@ static void read_hfi_descriptors(struct libnvme_global_ctx *ctx,
 	nbft->hfi_list = calloc(num_hfi + 1, sizeof(struct libnbft_hfi *));
 	for (i = 0, cnt = 0; i < num_hfi; i++) {
 		struct nbft_hfi *raw_hfi =
-			(struct nbft_hfi *)(raw_hfi_array + i * hfi_len);
+			descriptor_at(raw_hfi_array, hfi_len, i);
 
 		if (read_hfi(ctx, nbft, raw_hfi,
 				&nbft->hfi_list[cnt]) == 0)
@@ -683,7 +689,7 @@ static void read_security_descriptors(struct libnvme_global_ctx *ctx,
 		sizeof(struct libnbft_security *));
 	for (i = 0, cnt = 0; i < num_sec; i++) {
 		struct nbft_security *raw_security =
-			(struct nbft_security *)(raw_sec_array + i * sec_len);
+			descriptor_at(raw_sec_array, sec_len, i);
 
 		if (read_security(ctx, nbft, raw_security,
 				&nbft->security_list[cnt]) == 0)
@@ -701,7 +707,7 @@ static void read_discovery_descriptors(struct libnvme_global_ctx *ctx,
 		calloc(num_disc + 1, sizeof(struct libnbft_discovery *));
 	for (i = 0, cnt = 0; i < num_disc; i++) {
 		struct nbft_discovery *raw_discovery =
-			(struct nbft_discovery *)(raw_disc_array + i * disc_len);
+			descriptor_at(raw_disc_array, disc_len, i);
 
 		if (read_discovery(ctx, nbft, raw_discovery,
 				&nbft->discovery_list[cnt]) == 0)
@@ -719,7 +725,7 @@ static void read_ssns_descriptors(struct libnvme_global_ctx *ctx,
 		 calloc(num_ssns + 1, sizeof(struct libnbft_subsystem_ns *));
 	for (i = 0, cnt = 0; i < num_ssns; i++) {
 		struct nbft_ssns *raw_ssns =
-			(struct nbft_ssns *)(raw_ssns_array + i * ssns_len);
+			descriptor_at(raw_ssns_array, ssns_len, i);
 
 		if (read_ssns(ctx, nbft, raw_ssns,
 				&nbft->subsystem_ns_list[cnt]) == 0)