Changeset 283ea3d in mainline for uspace/lib/mbr/libmbr.c

Timestamp:

2013-07-28T22:52:16Z (12 years ago)

Author:

Dominik Taborsky (AT DOT) <brembyseznamcz>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

e3bc355

Parents:

8559fa0 (diff), 675de6d (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

libmbr, libgpt and hdisk fixes and polishing

File:

• uspace/lib/mbr/libmbr.c (modified) (3 diffs)

uspace/lib/mbr/libmbr.c

@@ -42 +42 @@
 #include <stdio.h>
 #include <stdlib.h>
+#include <str_error.h>
 
 #include "libmbr.h"
@@ -49 +50 @@
 static int decode_logical(mbr_label_t *, mbr_part_t *);
 static void encode_part(mbr_part_t *, pt_entry_t *, uint32_t, bool);
-static int check_overlap(mbr_part_t *, mbr_part_t *);
-static int check_encaps(mbr_part_t *, mbr_part_t *);
-static int check_preceeds(mbr_part_t *, mbr_part_t *);
-static mbr_err_val mbr_add_primary(mbr_label_t *label, mbr_part_t *p);
-static mbr_err_val mbr_add_logical(mbr_label_t *label, mbr_part_t *p);
+static bool check_overlap(mbr_part_t *, mbr_part_t *);
+static bool check_encaps(mbr_part_t *, mbr_part_t *);
+static bool check_preceeds(mbr_part_t *, mbr_part_t *);
+static mbr_err_val mbr_add_primary(mbr_label_t *, mbr_part_t *);
+static mbr_err_val mbr_add_logical(mbr_label_t *, mbr_part_t *);
 
 /** Allocate and initialize mbr_label_t structure */
@@ -759 +760 @@
 /** Check whether two partitions overlap
  * 
- * @return              1 for yes, 0 for no
- */
-static int check_overlap(mbr_part_t * p1, mbr_part_t * p2)
+ * @return              true/false
+ */
+static bool check_overlap(mbr_part_t * p1, mbr_part_t * p2)
 {
         if (p1->start_addr < p2->start_addr && p1->start_addr + p1->length <= p2->start_addr) {
-                return 0;
+                return false;
         } else if (p1->start_addr > p2->start_addr && p2->start_addr + p2->length <= p1->start_addr) {
-                return 0;
-        }
-
-        return 1;
+                return false;
+        }
+
+        return true;
 }
 
 /** Check whether one partition encapsulates the other
  * 
- * @return              1 for yes, 0 for no
- */
-static int check_encaps(mbr_part_t * inner, mbr_part_t * outer)
+ * @return              true/false
+ */
+static bool check_encaps(mbr_part_t * inner, mbr_part_t * outer)
 {
         if (inner->start_addr <= outer->start_addr || outer->start_addr + outer->length <= inner->start_addr) {
-                return 0;
+                return false;
         } else if (outer->start_addr + outer->length < inner->start_addr + inner->length) {
-                return 0;
-        }
-
-        return 1;
+                return false;
+        }
+
+        return true;
 }
 
 /** Check whether one partition preceeds the other
  * 
- * @return              1 for yes, 0 for no
- */
-static int check_preceeds(mbr_part_t * preceeder, mbr_part_t * precedee)
+ * @return              true/false
+ */
+static bool check_preceeds(mbr_part_t * preceeder, mbr_part_t * precedee)
 {
         return preceeder->start_addr < precedee->start_addr;