Changes in uspace/app/hdisk/func_gpt.c [c3cbbb2:dc76f4a] in mainline

File:

• uspace/app/hdisk/func_gpt.c (modified) (8 diffs)

uspace/app/hdisk/func_gpt.c

@@ -42 +42 @@
 #include "input.h"
 
-static int set_gpt_partition(tinput_t *, gpt_part_t *);
+static int set_gpt_partition(tinput_t *, gpt_part_t *, unsigned int);
 
 int construct_gpt_label(label_t *this)
@@ -68 +68 @@
         }
         
-        return set_gpt_partition(in, p);
+        return set_gpt_partition(in, p, this->alignment);
 }
 
@@ -80 +80 @@
         
         rc = gpt_remove_partition(this->data.gpt, idx);
-        if (rc != EOK) {
+        if (rc == ENOMEM) {
                 printf("Warning: running low on memory, not resizing...\n");
                 return rc;
+        } else if (rc == EINVAL) {
+                printf("Invalid index.\n");
+                return rc;
         }
         
@@ -102 +105 @@
 int print_gpt_parts(label_t *this)
 {
-        //int rc;
         printf("Current partition scheme (GPT):\n");
-        printf("\t\tStart:\tEnd:\tLength:\tType:\tName:\n");
+        printf("%15s %10s %10s Type: Name:\n", "Start:", "End:", "Length:");
         
         size_t i = 0;
@@ -117 +119 @@
                         printf("%15s %10s %10s Type: Name:\n", "Start:", "End:", "Length:");
                 
-                //printf("\t%10u %10u %10u %3d\n", iter->start_addr, iter->start_addr + iter->length,
-                //              iter->length, gpt_get_part_type(iter), gpt_get_part_name(iter));
+                
                 printf("%3u  %10llu %10llu %10llu    %3d %s\n", i-1, gpt_get_start_lba(iter), gpt_get_end_lba(iter),
                                 gpt_get_end_lba(iter) - gpt_get_start_lba(iter), gpt_get_part_type(iter),
@@ -125 +126 @@
         }
         
-        //return rc;
         return EOK;
 }
@@ -173 +173 @@
 }
 
-static int set_gpt_partition(tinput_t *in, gpt_part_t *p)
+static int set_gpt_partition(tinput_t *in, gpt_part_t *p, unsigned int alignment)
 {
         int rc;
@@ -181 +181 @@
         printf("Set starting address (number): ");
         sa = get_input_uint64(in);
+        if (sa % alignment != 0)
+                sa = gpt_get_next_aligned(sa, alignment);
         
         printf("Set end addres (number): ");