Changeset 6453e306 in mainline for uspace/app

Timestamp:

2013-12-25T16:09:43Z (12 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

Location:

uspace/app/hdisk

Files:

• common.h (modified) (3 diffs)
• func_gpt.c (modified) (13 diffs)
• func_gpt.h (modified) (3 diffs)
• func_mbr.c (modified) (13 diffs)
• func_mbr.h (modified) (3 diffs)
• func_none.c (modified) (6 diffs)
• func_none.h (modified) (3 diffs)
• hdisk.c (modified) (12 diffs)
• hdisk.h (modified) (3 diffs)
• input.c (modified) (6 diffs)
• input.h (modified) (3 diffs)

uspace/app/hdisk/common.h

@@ -1 +1 @@
 /*
- * Copyright (c) 2012, 2013 Dominik Taborsky
+ * Copyright (c) 2012-2013 Dominik Taborsky
  * All rights reserved.
  *
@@ -27 +27 @@
  */
 
- /** @addtogroup hdisk
+/** @addtogroup hdisk
  * @{
  */
@@ -45 +45 @@
 } layouts_t;
 
-union label_data {
-        mbr_label_t     *mbr;
-        gpt_label_t     *gpt;
-};
+typedef union {
+        mbr_label_t *mbr;
+        gpt_label_t *gpt;
+} label_data_t;
 
-typedef struct label label_t;
-
-struct label {
+typedef struct label {
         layouts_t layout;
-        aoff64_t nblocks;
+        aoff64_t blocks;
         service_id_t device;
-        union label_data data;
+        label_data_t data;
         unsigned int alignment;
-        int (* destroy_label)(label_t *);
-        int (* add_part)     (label_t *, tinput_t *);
-        int (* delete_part)  (label_t *, tinput_t *);
-        int (* new_label)    (label_t *);
-        int (* print_parts)  (label_t *);
-        int (* read_parts)   (label_t *);
-        int (* write_parts)  (label_t *);
-        int (* extra_funcs)  (label_t *, tinput_t *);
-};
+        int (* destroy_label)(struct label *);
+        int (* add_part)(struct label *, tinput_t *);
+        int (* delete_part)(struct label *, tinput_t *);
+        int (* new_label)(struct label *);
+        int (* print_parts)(struct label *);
+        int (* read_parts)(struct label *);
+        int (* write_parts)(struct label *);
+        int (* extra_funcs)(struct label *, tinput_t *);
+} label_t;
 
 #endif
-

uspace/app/hdisk/func_gpt.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2012, 2013 Dominik Taborsky
+ * Copyright (c) 2012-2013 Dominik Taborsky
  * All rights reserved.
  *
@@ -27 +27 @@
  */
 
- /** @addtogroup hdisk
+/** @addtogroup hdisk
  * @{
  */
@@ -39 +39 @@
 #include <sys/types.h>
 #include <sys/typefmt.h>
-
 #include "func_gpt.h"
 #include "input.h"
@@ -51 +50 @@
         this->alignment = 1;
         
-        this->add_part      = add_gpt_part;
-        this->delete_part   = delete_gpt_part;
+        this->add_part = add_gpt_part;
+        this->delete_part = delete_gpt_part;
         this->destroy_label = destroy_gpt_label;
-        this->new_label     = new_gpt_label;
-        this->print_parts   = print_gpt_parts;
-        this->read_parts    = read_gpt_parts;
-        this->write_parts   = write_gpt_parts;
-        this->extra_funcs   = extra_gpt_funcs;
+        this->new_label = new_gpt_label;
+        this->print_parts = print_gpt_parts;
+        this->read_parts = read_gpt_parts;
+        this->write_parts = write_gpt_parts;
+        this->extra_funcs = extra_gpt_funcs;
         
         return this->new_label(this);
@@ -65 +64 @@
 int add_gpt_part(label_t *this, tinput_t *in)
 {
-        gpt_part_t * p = gpt_get_partition(this->data.gpt);
-        if (p == NULL) {
+        gpt_part_t *partition = gpt_get_partition(this->data.gpt);
+        if (partition == NULL)
                 return ENOMEM;
-        }
-        
-        return set_gpt_partition(in, p, this);
+        
+        return set_gpt_partition(in, partition, this);
 }
 
 int delete_gpt_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);
-        
-        rc = gpt_remove_partition(this->data.gpt, idx);
+        printf("Index of the partition to delete (counted from 0): ");
+        size_t idx = get_input_size_t(in);
+        
+        int rc = gpt_remove_partition(this->data.gpt, idx);
         if (rc == ENOMEM) {
-                printf("Warning: running low on memory, not resizing...\n");
+                printf("Warning: Running out on memory, not resizing.\n");
                 return rc;
         } else if (rc == EINVAL) {
@@ -107 +102 @@
 int print_gpt_parts(label_t *this)
 {
-        printf("Current partition scheme (GPT)(number of blocks: %" PRIu64 "):\n", this->nblocks);
-        printf("%15s %10s %10s Type: Name:\n", "Start:", "End:", "Length:");
+        printf("Current partition scheme: GPT\n");
+        printf("Number of blocks: %" PRIu64 "\n", this->blocks);
         
         size_t i = 0;
-        
         gpt_part_foreach (this->data.gpt, iter) {
-                i++;
-                
                 if (gpt_get_part_type(iter) == GPT_PTE_UNUSED)
                         continue;
                 
                 if (i % 20 == 0)
-                        printf("%15s %10s %10s Type: Name:\n", "Start:", "End:", "Length:");
-                
+                        printf("%15s %10s %10s Type: Name:\n",
+                            "Start:", "End:", "Length:");
                 
                 printf("%3zu  %10" PRIu64 " %10" PRIu64 " %10" PRIu64 "    %3zu %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), gpt_get_part_name(iter));
-                
+                   i, 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), gpt_get_part_name(iter));
+                
+                i++;
         }
         
@@ -134 +127 @@
 int read_gpt_parts(label_t *this)
 {
-        int rc;
-        
-        rc = gpt_read_header(this->data.gpt, this->device);
-        if (rc != EOK) {
-                printf("Error: Reading header failed: %d (%s)\n", rc, str_error(rc));
+        int rc = gpt_read_header(this->data.gpt, this->device);
+        if (rc != EOK) {
+                printf("Error: Reading header failed: %d (%s)\n", rc,
+                    str_error(rc));
                 return rc;
         }
@@ -144 +136 @@
         rc = gpt_read_partitions(this->data.gpt);
         if (rc != EOK) {
-                printf("Error: Reading partitions failed: %d (%s)\n", rc, str_error(rc));
+                printf("Error: Reading partitions failed: %d (%s)\n", rc,
+                    str_error(rc));
                 return rc;
         }
@@ -153 +146 @@
 int write_gpt_parts(label_t *this)
 {
-        int rc;
-        printf("test1\n");
-        rc = gpt_write_partitions(this->data.gpt, this->device);
-        if (rc != EOK) {
-                printf("Error: Writing partitions failed: %d (%s)\n", rc, str_error(rc));
-                return rc;
-        }
-        printf("test2\n");
+        int rc = gpt_write_partitions(this->data.gpt, this->device);
+        if (rc != EOK) {
+                printf("Error: Writing partitions failed: %d (%s)\n", rc,
+                    str_error(rc));
+                return rc;
+        }
+        
         return EOK;
 }
@@ -170 +162 @@
 }
 
-static int set_gpt_partition(tinput_t *in, gpt_part_t *p, label_t * this)
-{
-        int rc;
-        
-        uint64_t sa, ea;
-        
+static int set_gpt_partition(tinput_t *in, gpt_part_t *partition, label_t *this)
+{
         printf("Set starting address: ");
-        sa = get_input_uint64(in);
-        if (this->alignment != 0 && this->alignment != 1 && sa % this->alignment != 0)
+        uint64_t sa = get_input_uint64(in);
+        if ((this->alignment != 0) && (this->alignment != 1) &&
+            (sa % this->alignment != 0))
                 sa = gpt_get_next_aligned(sa, this->alignment);
         
-        printf("Set end address (max: %" PRIu64 "): ", this->nblocks);
-        ea = get_input_uint64(in);
+        printf("Set end address (max: %" PRIu64 "): ", this->blocks);
+        uint64_t ea = get_input_uint64(in);
         
         if (ea <= sa) {
@@ -189 +178 @@
         }
         
-        gpt_set_start_lba(p, sa);
-        gpt_set_end_lba(p, ea);
-        
-        /* See global.c from libgpt for all partition types. */
+        gpt_set_start_lba(partition, sa);
+        gpt_set_end_lba(partition, ea);
+        
         printf("Choose type: ");
         print_part_types();
         printf("Set type (1 for HelenOS System): ");
         size_t idx = get_input_size_t(in);
-        gpt_set_part_type(p, idx);
-        
-        gpt_set_random_uuid(p->part_id);
-        
+        gpt_set_part_type(partition, idx);
+        
+        gpt_set_random_uuid(partition->part_id);
+        
+        printf("Name the partition: ");
         char *name;
-        printf("Name the partition: ");
-        rc = get_input_line(in, &name);
+        int rc = get_input_line(in, &name);
         if (rc != EOK) {
                 printf("Error reading name: %d (%s)\n", rc, str_error(rc));
@@ -209 +197 @@
         }
         
-        gpt_set_part_name(p, name, str_size(name));
+        gpt_set_part_name(partition, name, str_size(name));
         
         return EOK;
@@ -216 +204 @@
 static void print_part_types(void)
 {
-        int c;
-        int count = 0;
-        const struct partition_type * ptype = gpt_ptypes;
+        unsigned int count = 0;
+        const partition_type_t *ptype = gpt_ptypes;
         
         do {
+                printf("%u: %s\n", count, ptype->desc);
+                count++;
+                ptype++;
+                
                 if (count % 10 == 0) {
                         printf("Print (more) partition types? (y/n)\n");
-                        c = getchar();
+                        int c = getchar();
                         if (c == 'n')
                                 return;
                 }
-                
-                printf("%d: %s\n", count, ptype->desc);
-                ++count;
-                ++ptype;
         } while (ptype->guid != NULL);
 }
-

uspace/app/hdisk/func_gpt.h

@@ -1 +1 @@
 /*
- * Copyright (c) 2012, 2013 Dominik Taborsky
+ * Copyright (c) 2012-2013 Dominik Taborsky
  * All rights reserved.
  *
@@ -27 +27 @@
  */
 
- /** @addtogroup hdisk
+/** @addtogroup hdisk
  * @{
  */
@@ -34 +34 @@
 
 #ifndef __FUNC_GPT_H__
-#define __FUNC_GPT_H__
+#define __FUNC_GPT_H__
 
 #include <loc.h>
 #include <tinput.h>
 #include <libgpt.h>
-
 #include "common.h"
 
 extern int construct_gpt_label(label_t *);
-extern int add_gpt_part     (label_t *, tinput_t *);
-extern int delete_gpt_part  (label_t *, tinput_t *);
+extern int add_gpt_part(label_t *, tinput_t *);
+extern int delete_gpt_part(label_t *, tinput_t *);
 extern int destroy_gpt_label(label_t *);
-extern int new_gpt_label    (label_t *);
-extern int print_gpt_parts  (label_t *);
-extern int read_gpt_parts   (label_t *);
-extern int write_gpt_parts  (label_t *);
-extern int extra_gpt_funcs  (label_t *, tinput_t *);
+extern int new_gpt_label(label_t *);
+extern int print_gpt_parts(label_t *);
+extern int read_gpt_parts(label_t *);
+extern int write_gpt_parts(label_t *);
+extern int extra_gpt_funcs(label_t *, tinput_t *);
 
 #endif

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;
+}

uspace/app/hdisk/func_mbr.h

@@ -1 +1 @@
 /*
- * Copyright (c) 2012, 2013 Dominik Taborsky
+ * Copyright (c) 2012-2013 Dominik Taborsky
  * All rights reserved.
  *
@@ -27 +27 @@
  */
 
- /** @addtogroup hdisk
+/** @addtogroup hdisk
  * @{
  */
@@ -34 +34 @@
 
 #ifndef __FUNC_MBR_H__
-#define __FUNC_MBR_H__
+#define __FUNC_MBR_H__
 
 #include <loc.h>
 #include <tinput.h>
 #include <libmbr.h>
-
 #include "common.h"
 
 extern int construct_mbr_label(label_t *);
-extern int add_mbr_part     (label_t *, tinput_t *);
-extern int delete_mbr_part  (label_t *, tinput_t *);
+extern int add_mbr_part(label_t *, tinput_t *);
+extern int delete_mbr_part(label_t *, tinput_t *);
 extern int destroy_mbr_label(label_t *);
-extern int new_mbr_label    (label_t *);
-extern int print_mbr_parts  (label_t *);
-extern int read_mbr_parts   (label_t *);
-extern int write_mbr_parts  (label_t *);
-extern int extra_mbr_funcs  (label_t *, tinput_t *);
+extern int new_mbr_label(label_t *);
+extern int print_mbr_parts(label_t *);
+extern int read_mbr_parts(label_t *);
+extern int write_mbr_parts(label_t *);
+extern int extra_mbr_funcs(label_t *, tinput_t *);
 
 #endif

uspace/app/hdisk/func_none.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2012, 2013 Dominik Taborsky
+ * Copyright (c) 2012-2013 Dominik Taborsky
  * All rights reserved.
  *
@@ -27 +27 @@
  */
 
- /** @addtogroup hdisk
+/** @addtogroup hdisk
  * @{
  */
@@ -33 +33 @@
  */
 
-
 #include <errno.h>
-
 #include "func_none.h"
 
 static void not_implemented(void);
-
 
 int construct_none_label(label_t *this)
@@ -45 +42 @@
         this->layout = LYT_NONE;
         
-        this->add_part      = add_none_part;
-        this->delete_part   = delete_none_part;
+        this->add_part = add_none_part;
+        this->delete_part = delete_none_part;
         this->destroy_label = destroy_none_label;
-        this->new_label     = new_none_label;
-        this->print_parts   = print_none_parts;
-        this->read_parts    = read_none_parts;
-        this->write_parts   = write_none_parts;
-        this->extra_funcs   = extra_none_funcs;
+        this->new_label = new_none_label;
+        this->print_parts = print_none_parts;
+        this->read_parts = read_none_parts;
+        this->write_parts = write_none_parts;
+        this->extra_funcs = extra_none_funcs;
         
         return EOK;
 }
 
-int add_none_part(label_t *this, tinput_t * in)
+int add_none_part(label_t *this, tinput_t *in)
 {
         not_implemented();
@@ -63 +60 @@
 }
 
-int delete_none_part(label_t *this, tinput_t * in)
+int delete_none_part(label_t *this, tinput_t *in)
 {
         not_implemented();
@@ -104 +101 @@
 }
 
-static void not_implemented()
+static void not_implemented(void)
 {
         printf("No format selected.\n");

uspace/app/hdisk/func_none.h

@@ -1 +1 @@
 /*
- * Copyright (c) 2012, 2013 Dominik Taborsky
+ * Copyright (c) 2012-2013 Dominik Taborsky
  * All rights reserved.
  *
@@ -27 +27 @@
  */
 
- /** @addtogroup hdisk
+/** @addtogroup hdisk
  * @{
  */
@@ -34 +34 @@
 
 #ifndef __FUNC_NONE_H__
-#define __FUNC_NONE_H__
+#define __FUNC_NONE_H__
 
 #include <loc.h>
 #include <tinput.h>
-
 #include "common.h"
 
 extern int construct_none_label(label_t *);
-extern int add_none_part     (label_t *, tinput_t *);
-extern int delete_none_part  (label_t *, tinput_t *);
+extern int add_none_part(label_t *, tinput_t *);
+extern int delete_none_part(label_t *, tinput_t *);
 extern int destroy_none_label(label_t *);
-extern int new_none_label    (label_t *);
-extern int print_none_parts  (label_t *);
-extern int read_none_parts   (label_t *);
-extern int write_none_parts  (label_t *);
-extern int extra_none_funcs  (label_t *, tinput_t *);
+extern int new_none_label(label_t *);
+extern int print_none_parts(label_t *);
+extern int read_none_parts(label_t *);
+extern int write_none_parts(label_t *);
+extern int extra_none_funcs(label_t *, tinput_t *);
 
 #endif

uspace/app/hdisk/hdisk.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2012, 2013 Dominik Taborsky
+ * Copyright (c) 2012-2013 Dominik Taborsky
  * All rights reserved.
  *
@@ -27 +27 @@
  */
 
- /** @addtogroup hdisk
+/** @addtogroup hdisk
  * @{
  */
@@ -47 +47 @@
 #include <tinput.h>
 #include <str_error.h>
-
 #include "hdisk.h"
 #include "input.h"
@@ -54 +53 @@
 #include "func_none.h"
 
-int interact(void);
-void print_help(void);
-void select_label_format(tinput_t *);
-void construct_label(layouts_t);
-void free_label(void);
-int try_read(void);
-int try_read_mbr(void);
-int try_read_gpt(void);
-void set_alignment(tinput_t *);
-
+static int interact(void);
+static void print_help(void);
+static void select_label_format(tinput_t *);
+static void construct_label(layouts_t);
+static void free_label(void);
+static int try_read(void);
+static int try_read_mbr(void);
+static int try_read_gpt(void);
+static void set_alignment(tinput_t *);
 
 static label_t label;
 
-int main(int argc, char ** argv)
+int main(int argc, char *argv[])
 {
         if (argc == 1) {
                 printf("Missing argument. Please specify a device to operate on.\n");
-                return -1;
-        }
-        
-        int rc;
+                return 1;
+        }
+        
         service_id_t dev_handle;
-        
-        rc = loc_service_get_id(argv[1], &dev_handle, IPC_FLAG_BLOCKING);
+        int rc = loc_service_get_id(argv[1], &dev_handle, IPC_FLAG_BLOCKING);
         if (rc != EOK) {
                 printf("Unknown device. Exiting.\n");
-                return -1;
+                return 2;
         }
         
@@ -89 +85 @@
         if (rc != EOK) {
                 printf("Error during libblock init: %d - %s.\n", rc, str_error(rc));
-                return -1;
-        }
-        
-        aoff64_t nblocks;
-        rc = block_get_nblocks(dev_handle, &nblocks);
+                return 3;
+        }
+        
+        aoff64_t blocks;
+        rc = block_get_nblocks(dev_handle, &blocks);
         block_fini(dev_handle);
         if (rc != EOK) {
-                printf(LIBMBR_NAME ": Error while getting number of blocks: %d - %s.\n", rc, str_error(rc));
-                return -1;
-        }
-        
-        label.nblocks = nblocks;
+                printf("Error while getting number of blocks: %d - %s.\n",
+                    rc, str_error(rc));
+                return 4;
+        }
+        
+        label.blocks = blocks;
         
         rc = try_read_mbr();
@@ -116 +113 @@
         
 interact:
-        
-        rc = interact();
-        
-        return rc;
+        return interact();
 }
 
 /** Interact with user */
-int interact()
-{
-        int input;
-        tinput_t *in;
-        
-        in = tinput_new();
+int interact(void)
+{
+        tinput_t *in = tinput_new();
         if (in == NULL) {
                 printf("Failed initing input. Free some memory.\n");
@@ -137 +128 @@
         printf("Welcome to hdisk.\nType 'h' for help.\n");
         
-        while (1) {
+        while (true) {
                 printf("# ");
-                input = getchar();
+                int input = getchar();
                 printf("%c\n", input);
                 
@@ -187 +178 @@
 end:
         tinput_destroy(in);
-        
         return EOK;
 }
@@ -194 +184 @@
 {
         printf(
-                "\t 'a' \t\t Add partition.\n"
-                "\t 'd' \t\t Delete partition.\n"
-                "\t 'e' \t\t Extra functions (per label format).\n"
-                "\t 'f' \t\t Switch the format of the partition label.\n"
-                "\t 'h' \t\t Prints help. See help for more.\n"
-                "\t 'l' \t\t Set alignment.\n"
-                "\t 'n' \t\t Create new label (discarding the old one).\n"
-                "\t 'p' \t\t Prints label contents.\n"
-                "\t 'q' \t\t Quit.\n"
-                "\t 'r' \t\t Read label from disk.\n"
-                "\t 'w' \t\t Write label to disk.\n"
-                );
-
-}
-
-void select_label_format(tinput_t * in)
+            "\t 'a' \t\t Add partition.\n"
+            "\t 'd' \t\t Delete partition.\n"
+            "\t 'e' \t\t Extra functions (per label format).\n"
+            "\t 'f' \t\t Switch the format of the partition label.\n"
+            "\t 'h' \t\t Prints help. See help for more.\n"
+            "\t 'l' \t\t Set alignment.\n"
+            "\t 'n' \t\t Create new label (discarding the old one).\n"
+            "\t 'p' \t\t Prints label contents.\n"
+            "\t 'q' \t\t Quit.\n"
+            "\t 'r' \t\t Read label from disk.\n"
+            "\t 'w' \t\t Write label to disk.\n");
+}
+
+void select_label_format(tinput_t *in)
 {
         printf("Available formats are: \n"
-                        "1) MBR\n"
-                        "2) GPT\n"
-              );
+            "1) MBR\n"
+            "2) GPT\n");
         
         uint8_t val = get_input_uint8(in);
@@ -253 +240 @@
 }
 
-int try_read()
-{
-        
+int try_read(void)
+{
         return label.read_parts(&label);
 }
 
-int try_read_mbr()
+int try_read_mbr(void)
 {
         construct_label(LYT_MBR);
@@ -265 +251 @@
 }
 
-int try_read_gpt()
+int try_read_gpt(void)
 {
         construct_label(LYT_GPT);
@@ -277 +263 @@
         printf("Alignment set to %u sectors.\n", label.alignment);
 }
-
-
-

uspace/app/hdisk/hdisk.h

@@ -1 +1 @@
 /*
- * Copyright (c) 2012, 2013 Dominik Taborsky
+ * Copyright (c) 2012-2013 Dominik Taborsky
  * All rights reserved.
  *
@@ -27 +27 @@
  */
 
- /** @addtogroup hdisk
+/** @addtogroup hdisk
  * @{
  */
 /** @file
  */
+
+#ifndef __HDISK_H__
+#define __HDISK_H__
 
 #include "common.h"
@@ -38 +41 @@
         label.layout = LYT_NONE
 
+#endif

uspace/app/hdisk/input.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2012, 2013 Dominik Taborsky
+ * Copyright (c) 2012-2013 Dominik Taborsky
  * All rights reserved.
  *
@@ -27 +27 @@
  */
 
- /** @addtogroup hdisk
+/** @addtogroup hdisk
  * @{
  */
@@ -36 +36 @@
 #include <errno.h>
 #include <stdlib.h>
-
 #include "input.h"
 
 typedef int (*conv_f)(const char *, char **, unsigned int, bool, void *);
-static int convert(tinput_t * in, conv_f str_f, void * val);
 
-int get_input_line(tinput_t * in, char ** str)
+static int convert(tinput_t *, conv_f, void *);
+
+int get_input_line(tinput_t *in, char **str)
 {
-        int rc;
-        rc = tinput_read(in, str);
-        if (rc == ENOENT) {
-                /* User requested exit */
+        int rc = tinput_read(in, str);
+        if (rc == ENOENT)
                 return EINTR;
-        }
-        if (rc != EOK) {
-                /* Error in communication with console */
+        
+        if (rc != EOK)
                 return rc;
-        }
+        
         /* Check for empty input. */
         if (str_cmp(*str, "") == 0) {
@@ -60 +57 @@
                 return EINVAL;
         }
-
+        
         return EOK;
 }
 
-uint8_t get_input_uint8(tinput_t * in)
+uint8_t get_input_uint8(tinput_t *in)
 {
-        int rc;
         uint32_t val;
-        
-        rc = convert(in, (conv_f) str_uint8_t, &val);
-        if (rc != EOK) {
-                errno = rc;
-                return 0;
-        }
-        
-        return val;
-}
-
-uint32_t get_input_uint32(tinput_t * in)
-{
-        int rc;
-        uint32_t val;
-        
-        rc = convert(in, (conv_f) str_uint32_t, &val);
-        if (rc != EOK) {
-                errno = rc;
-                return 0;
-        }
-        
-        return val;
-}
-
-uint64_t get_input_uint64(tinput_t * in)
-{
-        int rc;
-        uint64_t val;
-        
-        rc = convert(in, (conv_f) str_uint64_t, &val);
-        if (rc != EOK) {
-                errno = rc;
-                return 0;
-        }
-        
-        return val;
-}
-
-size_t get_input_size_t(tinput_t * in)
-{
-        int rc;
-        size_t val;
-        
-        rc = convert(in, (conv_f) str_size_t, &val);
+        int rc = convert(in, (conv_f) str_uint8_t, &val);
         if (rc != EOK) {
                 errno = rc;
@@ -121 +74 @@
 }
 
-static int convert(tinput_t * in, conv_f str_f, void * val)
+uint32_t get_input_uint32(tinput_t *in)
 {
-        int rc;
-        char * str;
+        uint32_t val;
+        int rc = convert(in, (conv_f) str_uint32_t, &val);
+        if (rc != EOK) {
+                errno = rc;
+                return 0;
+        }
         
-        rc = get_input_line(in, &str);
+        errno = EOK;
+        return val;
+}
+
+uint64_t get_input_uint64(tinput_t *in)
+{
+        uint64_t val;
+        int rc = convert(in, (conv_f) str_uint64_t, &val);
+        if (rc != EOK) {
+                errno = rc;
+                return 0;
+        }
+        
+        errno = EOK;
+        return val;
+}
+
+size_t get_input_size_t(tinput_t *in)
+{
+        size_t val;
+        int rc = convert(in, (conv_f) str_size_t, &val);
+        if (rc != EOK) {
+                errno = rc;
+                return 0;
+        }
+        
+        errno = EOK;
+        return val;
+}
+
+static int convert(tinput_t *in, conv_f str_f, void *val)
+{
+        char *str;
+        int rc = get_input_line(in, &str);
         if (rc != EOK) {
                 printf("Error reading input.\n");
@@ -133 +123 @@
         
         rc = str_f(str, NULL, 10, true, val);
-        if (rc != EOK) {
+        if (rc != EOK)
                 printf("Invalid value.\n");
-        }
         
         free(str);
         return rc;
 }
-

uspace/app/hdisk/input.h

@@ -1 +1 @@
 /*
- * Copyright (c) 2012, 2013 Dominik Taborsky
+ * Copyright (c) 2012-2013 Dominik Taborsky
  * All rights reserved.
  *
@@ -27 +27 @@
  */
 
- /** @addtogroup hdisk
+/** @addtogroup hdisk
  * @{
  */
@@ -34 +34 @@
 
 #ifndef __INPUT_H__
-#define __INPUT_H__
+#define __INPUT_H__
 
 #include <tinput.h>
 
-extern int              get_input_line(tinput_t * in, char ** str);
-extern uint8_t  get_input_uint8(tinput_t * in);
-extern uint32_t get_input_uint32(tinput_t * in);
-extern uint64_t get_input_uint64(tinput_t * in);
-extern size_t   get_input_size_t(tinput_t * in);
+extern int get_input_line(tinput_t *, char **);
+extern uint8_t get_input_uint8(tinput_t *);
+extern uint32_t get_input_uint32(tinput_t *);
+extern uint64_t get_input_uint64(tinput_t *);
+extern size_t get_input_size_t(tinput_t *);
 
 #endif