Changes in uspace/lib/label/src/gpt.c [b7fd2a0:b33d140] in mainline

File:

• uspace/lib/label/src/gpt.c (modified) (21 diffs)

uspace/lib/label/src/gpt.c

@@ -46 +46 @@
 #include "gpt.h"
 
-static errno_t gpt_open(label_bd_t *, label_t **);
-static errno_t gpt_create(label_bd_t *, label_t **);
+static int gpt_open(label_bd_t *, label_t **);
+static int gpt_create(label_bd_t *, label_t **);
 static void gpt_close(label_t *);
-static errno_t gpt_destroy(label_t *);
-static errno_t gpt_get_info(label_t *, label_info_t *);
+static int gpt_destroy(label_t *);
+static int gpt_get_info(label_t *, label_info_t *);
 static label_part_t *gpt_part_first(label_t *);
 static label_part_t *gpt_part_next(label_part_t *);
 static void gpt_part_get_info(label_part_t *, label_part_info_t *);
-static errno_t gpt_part_create(label_t *, label_part_spec_t *, label_part_t **);
-static errno_t gpt_part_destroy(label_part_t *);
-static errno_t gpt_suggest_ptype(label_t *, label_pcnt_t, label_ptype_t *);
-
-static errno_t gpt_check_free_idx(label_t *, int);
-static errno_t gpt_check_free_range(label_t *, uint64_t, uint64_t);
+static int gpt_part_create(label_t *, label_part_spec_t *, label_part_t **);
+static int gpt_part_destroy(label_part_t *);
+static int gpt_suggest_ptype(label_t *, label_pcnt_t, label_ptype_t *);
+
+static int gpt_check_free_idx(label_t *, int);
+static int gpt_check_free_range(label_t *, uint64_t, uint64_t);
 
 static void gpt_unused_pte(gpt_entry_t *);
-static errno_t gpt_part_to_pte(label_part_t *, gpt_entry_t *);
-static errno_t gpt_pte_to_part(label_t *, gpt_entry_t *, int);
-static errno_t gpt_pte_update(label_t *, gpt_entry_t *, int);
-
-static errno_t gpt_update_pt_crc(label_t *, uint32_t);
+static int gpt_part_to_pte(label_part_t *, gpt_entry_t *);
+static int gpt_pte_to_part(label_t *, gpt_entry_t *, int);
+static int gpt_pte_update(label_t *, gpt_entry_t *, int);
+
+static int gpt_update_pt_crc(label_t *, uint32_t);
 static void gpt_hdr_compute_crc(gpt_header_t *, size_t);
-static errno_t gpt_hdr_get_crc(gpt_header_t *, size_t, uint32_t *);
-
-static errno_t gpt_pmbr_create(label_bd_t *, size_t, uint64_t);
-static errno_t gpt_pmbr_destroy(label_bd_t *, size_t);
+static int gpt_hdr_get_crc(gpt_header_t *, size_t, uint32_t *);
+
+static int gpt_pmbr_create(label_bd_t *, size_t, uint64_t);
+static int gpt_pmbr_destroy(label_bd_t *, size_t);
 
 const uint8_t efi_signature[8] = {
@@ -92 +92 @@
 };
 
-static errno_t gpt_open(label_bd_t *bd, label_t **rlabel)
+static int gpt_open(label_bd_t *bd, label_t **rlabel)
 {
         label_t *label = NULL;
@@ -111 +111 @@
         uint32_t hdr_crc;
         int i, j;
-        errno_t rc;
+        int rc;
 
         gpt_hdr[0] = NULL;
@@ -345 +345 @@
 }
 
-static errno_t gpt_create(label_bd_t *bd, label_t **rlabel)
+static int gpt_create(label_bd_t *bd, label_t **rlabel)
 {
         label_t *label = NULL;
@@ -362 +362 @@
         uuid_t disk_uuid;
         int i, j;
-        errno_t rc;
+        int rc;
 
         rc = bd->ops->get_bsize(bd->arg, &bsize);
@@ -510 +510 @@
 }
 
-static errno_t gpt_destroy(label_t *label)
+static int gpt_destroy(label_t *label)
 {
         gpt_header_t *gpt_hdr = NULL;
@@ -516 +516 @@
         label_part_t *part;
         int i;
-        errno_t rc;
+        int rc;
 
         part = gpt_part_first(label);
@@ -580 +580 @@
 }
 
-static errno_t gpt_get_info(label_t *label, label_info_t *linfo)
+static int gpt_get_info(label_t *label, label_info_t *linfo)
 {
         memset(linfo, 0, sizeof(label_info_t));
@@ -624 +624 @@
 }
 
-static errno_t gpt_part_create(label_t *label, label_part_spec_t *pspec,
+static int gpt_part_create(label_t *label, label_part_spec_t *pspec,
     label_part_t **rpart)
 {
         label_part_t *part;
         gpt_entry_t pte;
-        errno_t rc;
+        int rc;
 
         part = calloc(1, sizeof(label_part_t));
@@ -696 +696 @@
 }
 
-static errno_t gpt_part_destroy(label_part_t *part)
+static int gpt_part_destroy(label_part_t *part)
 {
         gpt_entry_t pte;
-        errno_t rc;
+        int rc;
 
         /* Prepare unused partition table entry */
@@ -715 +715 @@
 }
 
-static errno_t gpt_suggest_ptype(label_t *label, label_pcnt_t pcnt,
+static int gpt_suggest_ptype(label_t *label, label_pcnt_t pcnt,
     label_ptype_t *ptype)
 {
         const char *ptid;
-        errno_t rc;
+        int rc;
 
         ptid = NULL;
@@ -748 +748 @@
 
 /** Verify that the specified index is valid and free. */
-static errno_t gpt_check_free_idx(label_t *label, int index)
+static int gpt_check_free_idx(label_t *label, int index)
 {
         label_part_t *part;
@@ -771 +771 @@
 }
 
-static errno_t gpt_check_free_range(label_t *label, uint64_t block0,
+static int gpt_check_free_range(label_t *label, uint64_t block0,
     uint64_t nblocks)
 {
@@ -796 +796 @@
 }
 
-static errno_t gpt_part_to_pte(label_part_t *part, gpt_entry_t *pte)
+static int gpt_part_to_pte(label_part_t *part, gpt_entry_t *pte)
 {
         uint64_t eblock;
@@ -814 +814 @@
 }
 
-static errno_t gpt_pte_to_part(label_t *label, gpt_entry_t *pte, int index)
+static int gpt_pte_to_part(label_t *label, gpt_entry_t *pte, int index)
 {
         label_part_t *part;
@@ -856 +856 @@
  * @a pte.
  */
-static errno_t gpt_pte_update(label_t *label, gpt_entry_t *pte, int index)
+static int gpt_pte_update(label_t *label, gpt_entry_t *pte, int index)
 {
         size_t pos;
@@ -866 +866 @@
         uint32_t crc;
         int i;
-        errno_t rc;
+        int rc;
 
         /* Byte offset of partition entry */
@@ -921 +921 @@
 }
 
-static errno_t gpt_update_pt_crc(label_t *label, uint32_t crc)
+static int gpt_update_pt_crc(label_t *label, uint32_t crc)
 {
         gpt_header_t *gpt_hdr;
-        errno_t rc;
+        int rc;
         int i;
 
@@ -968 +968 @@
 }
 
-static errno_t gpt_hdr_get_crc(gpt_header_t *hdr, size_t hdr_size, uint32_t *crc)
+static int gpt_hdr_get_crc(gpt_header_t *hdr, size_t hdr_size, uint32_t *crc)
 {
         gpt_header_t *c;
@@ -985 +985 @@
 
 /** Create GPT Protective MBR */
-static errno_t gpt_pmbr_create(label_bd_t *bd, size_t bsize, uint64_t nblocks)
+static int gpt_pmbr_create(label_bd_t *bd, size_t bsize, uint64_t nblocks)
 {
         mbr_br_block_t *pmbr = NULL;
         uint64_t pmbr_nb;
-        errno_t rc;
+        int rc;
 
         pmbr = calloc(1, bsize);
@@ -1023 +1023 @@
 
 /** Destroy GPT Protective MBR */
-static errno_t gpt_pmbr_destroy(label_bd_t *bd, size_t bsize)
+static int gpt_pmbr_destroy(label_bd_t *bd, size_t bsize)
 {
         mbr_br_block_t *pmbr = NULL;
-        errno_t rc;
+        int rc;
 
         pmbr = calloc(1, bsize);