Changes in uspace/lib/mbr/libmbr.c [6e8e4e19:8559fa0] in mainline

File:

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

uspace/lib/mbr/libmbr.c

@@ -94 +94 @@
  */
 int mbr_read_mbr(mbr_label_t *label, service_id_t dev_handle)
-{
-        if (label == NULL)
-                return EINVAL;
-        
+{       
         int rc;
         
@@ -195 +192 @@
                 
                 rc_ext = decode_part(&(label->mbr->raw_data.pte[i]), p, 0);
-                printf("p: %d %u %u\n", rc_ext, p->start_addr, p->length);
                 mbr_set_flag(p, ST_LOGIC, false);
                 rc = mbr_add_partition(label, p);
@@ -207 +203 @@
                 if (rc_ext) {
                         ext = p;
-                        printf("ext: %u %u\n", p->start_addr, p->length);
                         label->parts->l_extended = &p->link;
                 }
@@ -231 +226 @@
 int mbr_write_partitions(mbr_label_t *label, service_id_t dev_handle)
 {
+        if (label->parts == NULL)
+                return EOK;
+        
+        if (label->mbr == NULL)
+                label->mbr = mbr_alloc_mbr();
+        
         int i = 0;
         int rc;
@@ -248 +249 @@
         for (i = 0; i < N_PRIMARY; i++) {
                 p = list_get_instance(l, mbr_part_t, link);     
-                printf("status: %hu\n", p->status);
                 encode_part(p, &(label->mbr->raw_data.pte[i]), 0, false);
                 l = l->next;
@@ -590 +590 @@
         list_foreach_safe(parts->list, cur_link, next) {
                 mbr_part_t *p = list_get_instance(cur_link, mbr_part_t, link);
+                list_remove(cur_link);
                 mbr_free_partition(p);
         }