Changeset 6453e306 in mainline for uspace/app/hdisk/func_mbr.c

Timestamp:

2013-12-25T16:09:43Z (11 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

ac36aed

Parents:

d51beba3

Message:

basic code review and coding style cleanup

File:

• uspace/app/hdisk/func_mbr.c (modified) (13 diffs)

uspace/app/hdisk/func_mbr.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2012, 2013 Dominik Taborsky
+ * Copyright (c) 2012-2013 Dominik Taborsky
  * All rights reserved.
  *
@@ -27 +27 @@
  */
 
- /** @addtogroup hdisk
+/** @addtogroup hdisk
  * @{
  */
@@ -37 +37 @@
 #include <str_error.h>
 #include <sys/types.h>
-
 #include "func_mbr.h"
 #include "input.h"
@@ -62 +61 @@
 int add_mbr_part(label_t *this, tinput_t *in)
 {
-        int rc;
-        
-        mbr_part_t *part = mbr_alloc_partition();
-        
-        rc = set_mbr_partition(in, part, this);
+        mbr_part_t *partition = mbr_alloc_partition();
+        if (partition == NULL)
+                return ENOMEM;
+        
+        int rc = set_mbr_partition(in, partition, this);
         if (rc != EOK)
                 return rc;
         
-        rc = mbr_add_partition(this->data.mbr, part);
-        if (rc != ERR_OK) {
+        rc = mbr_add_partition(this->data.mbr, partition);
+        if (rc != ERR_OK)
                 printf("Error adding partition: %d\n", rc);
-        }
         
         return EOK;
@@ -80 +78 @@
 int delete_mbr_part(label_t *this, tinput_t *in)
 {
-        int rc;
-        size_t idx;
-        
-        printf("Number of the partition to delete (counted from 0): ");
-        idx = get_input_size_t(in);
-        
-        if (idx == 0 && errno != EOK)
-                return errno;
-        
-        rc = mbr_remove_partition(this->data.mbr, idx);
-        if (rc != EOK) {
+        printf("Index of the partition to delete (counted from 0): ");
+        size_t idx = get_input_size_t(in);
+        
+        if ((idx == 0) && (errno != EOK))
+                return errno;
+        
+        int rc = mbr_remove_partition(this->data.mbr, idx);
+        if (rc != EOK)
                 printf("Error: partition does not exist?\n");
-        }
         
         return EOK;
@@ -113 +107 @@
 }
 
-/** Print current partition scheme */
 int print_mbr_parts(label_t *this)
 {
-        int num = 0;
-        
-        printf("Current partition scheme (MBR)(number of blocks: %" PRIu64 "):\n", this->nblocks);
-        printf("\t\t%10s  %10s %10s %10s %7s\n", "Bootable:", "Start:", "End:", "Length:", "Type:");
-        
+        printf("Current partition scheme: MBR\n");
+        printf("Number of blocks: %" PRIu64 "\n", this->blocks);
+        printf("\t\t%10s  %10s %10s %10s %7s\n",
+            "Bootable:", "Start:", "End:", "Length:", "Type:");
+        
+        unsigned int num = 0;
         mbr_part_t *it;
-        
         for (it = mbr_get_first_partition(this->data.mbr); it != NULL;
              it = mbr_get_next_partition(this->data.mbr, it)) {
@@ -128 +121 @@
                         continue;
                 
-                printf("\tP%d:\t", num);
+                printf("\tP%u:\t", num);
                 if (mbr_get_flag(it, ST_BOOT))
                         printf("*");
@@ -134 +127 @@
                         printf(" ");
                 
-                printf("\t%10u %10u %10u %7u\n", it->start_addr, it->start_addr + it->length, it->length, it->type);
+                printf("\t%10u %10u %10u %7u\n", it->start_addr,
+                    it->start_addr + it->length, it->length, it->type);
                 
                 num++;
         }
         
-        printf("%d partitions found.\n", num);
+        printf("%u partitions found.\n", num);
         
         return EOK;
@@ -146 +140 @@
 int read_mbr_parts(label_t *this)
 {
-        int rc;
-        rc = mbr_read_mbr(this->data.mbr, this->device);
+        int rc = mbr_read_mbr(this->data.mbr, this->device);
         if (rc != EOK)
                 return rc;
@@ -164 +157 @@
 {
         int rc = mbr_write_partitions(this->data.mbr, this->device);
-        if (rc != EOK) {
-                printf("Error occured during writing: ERR: %d: %s\n", rc, str_error(rc));
-        }
+        if (rc != EOK)
+                printf("Error occured during writing: ERR: %d: %s\n", rc,
+                    str_error(rc));
         
         return rc;
@@ -177 +170 @@
 }
 
-static int set_mbr_partition(tinput_t *in, mbr_part_t *p, label_t * this)
-{
-        int c;
-        uint8_t type;
-        
+static int set_mbr_partition(tinput_t *in, mbr_part_t *partition, label_t *this)
+{
         printf("Primary (p) or logical (l): ");
-        c = getchar();
+        int c = getchar();
         printf("%c\n", c);
 
         switch (c) {
         case 'p':
-                mbr_set_flag(p, ST_LOGIC, false);
+                mbr_set_flag(partition, ST_LOGIC, false);
                 break;
         case 'l':
-                mbr_set_flag(p, ST_LOGIC, true);
+                mbr_set_flag(partition, ST_LOGIC, true);
                 break;
         default:
@@ -198 +188 @@
         }
         
-        printf("Set type (0-255): ");
-        type = get_input_uint8(in);
-        if (type == 0 && errno != EOK)
-                return errno;
-
-        ///TODO: there can only be one boolabel partition; let's do it just like fdisk
+        printf("Set type (0 - 255): ");
+        uint8_t type = get_input_uint8(in);
+        if ((type == 0) && (errno != EOK))
+                return errno;
+        
+        // FIXME: Make sure there is at most one bootable partition
         printf("Bootable? (y/n): ");
         c = getchar();
-        if (c != 'y' && c != 'Y' && c != 'n' && c != 'N') {
+        if ((c != 'y') && (c != 'Y') && (c != 'n') && (c != 'N')) {
                 printf("Invalid value. Cancelled.");
                 return EINVAL;
         }
+        
         printf("%c\n", c);
-        mbr_set_flag(p, ST_BOOT, (c == 'y' || c == 'Y') ? true : false);
-
-
-        uint32_t sa, ea;
-
+        mbr_set_flag(partition, ST_BOOT, (c == 'y' || c == 'Y') ? true : false);
+        
         printf("Set starting address: ");
-        sa = get_input_uint32(in);
-        if (sa == 0 && errno != EOK)
-                return errno;
-        
-        if (this->alignment != 0 && this->alignment != 1 && sa % this->alignment != 0) {
+        uint32_t sa = get_input_uint32(in);
+        if ((sa == 0) && (errno != EOK))
+                return errno;
+        
+        if ((this->alignment != 0) && (this->alignment != 1) &&
+            (sa % this->alignment != 0)) {
                 sa = mbr_get_next_aligned(sa, this->alignment);
-                printf("Starting address was aligned to %u.\n", sa);
-        }
-        
-        printf("Set end addres (max: %" PRIu64 "): ", this->nblocks);
-        ea = get_input_uint32(in);
-        if (ea == 0 && errno != EOK)
+                printf("Starting address was aligned to %" PRIu32 ".\n", sa);
+        }
+        
+        printf("Set end addres (max: %" PRIu64 "): ", this->blocks);
+        uint32_t ea = get_input_uint32(in);
+        if ((ea == 0) && (errno != EOK))
                 return errno;
         
@@ -236 +225 @@
         }
         
-        p->type = type;
-        p->start_addr = sa;
-        p->length = ea - sa;
-
-        return EOK;
-}
-
-
-
-
-
-
+        partition->type = type;
+        partition->start_addr = sa;
+        partition->length = ea - sa;
+        
+        return EOK;
+}