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

Timestamp:

2013-12-25T16:09:43Z (10 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/hdisk.c (modified) (12 diffs)

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