Changes in uspace/app/sysinst/sysinst.c [6c4eedf:1d6dd2a] in mainline

File:

• uspace/app/sysinst/sysinst.c (modified) (11 diffs)

uspace/app/sysinst/sysinst.c

@@ -44 +44 @@
 #include <stdio.h>
 #include <stdlib.h>
+#include <str_error.h>
 #include <task.h>
 #include <vfs/vfs.h>
+#include <str.h>
 
 #include "futil.h"
@@ -82 +84 @@
  * @param pdev Place to store partition device name
  *
- * @return EOK on success or error code
- */
-static int sysinst_label_dev(const char *dev, char **pdev)
+ * @return EOK on success or an error code
+ */
+static errno_t sysinst_label_dev(const char *dev, char **pdev)
 {
         fdisk_t *fdisk;
@@ -92 +94 @@
         cap_spec_t cap;
         service_id_t sid;
-        int rc;
+        errno_t rc;
 
         printf("sysinst_label_dev(): get service ID '%s'\n", dev);
@@ -117 +119 @@
         rc = fdisk_label_create(fdev, lt_mbr);
         if (rc != EOK) {
-                printf("Error creating label (%d).\n", rc);
+                printf("Error creating label: %s.\n", str_error(rc));
                 return rc;
         }
@@ -125 +127 @@
         rc = fdisk_part_get_max_avail(fdev, spc_pri, &cap);
         if (rc != EOK) {
-                printf("Error getting available capacity (%d).\n", rc);
+                printf("Error getting available capacity: %s.\n", str_error(rc));
                 return rc;
         }
@@ -141 +143 @@
 
         /* XXX libfdisk should give us the service name */
-        rc = asprintf(pdev, "%sp1", dev);
-        if (rc < 0)
+        if (asprintf(pdev, "%sp1", dev) < 0)
                 return ENOMEM;
 
@@ -152 +153 @@
  *
  * @param dev Partition device
- * @return EOK on success or error code
- */
-static int sysinst_fs_mount(const char *dev)
+ * @return EOK on success or an error code
+ */
+static errno_t sysinst_fs_mount(const char *dev)
 {
         task_wait_t twait;
         task_exit_t texit;
-        int rc;
+        errno_t rc;
         int trc;
 
@@ -191 +192 @@
 /** Copy boot files.
  *
- * @return EOK on success or error code
- */
-static int sysinst_copy_boot_files(void)
+ * @return EOK on success or an error code
+ */
+static errno_t sysinst_copy_boot_files(void)
 {
         task_wait_t twait;
         task_exit_t texit;
-        int rc;
+        errno_t rc;
         int trc;
 
@@ -258 +259 @@
  *
  * @param devp Disk device
- * @return EOK on success or error code
- */
-static int sysinst_copy_boot_blocks(const char *devp)
+ * @return EOK on success or an error code
+ */
+static errno_t sysinst_copy_boot_blocks(const char *devp)
 {
         void *boot_img;
@@ -272 +273 @@
         aoff64_t core_blocks;
         grub_boot_blocklist_t *first_bl, *bl;
-        int rc;
+        errno_t rc;
 
         printf("sysinst_copy_boot_blocks: Read boot block image.\n");
@@ -353 +354 @@
  *
  * @param dev Device to install to.
- * @return EOK on success or error code
- */
-static int sysinst_install(const char *dev)
-{
-        int rc;
+ * @return EOK on success or an error code
+ */
+static errno_t sysinst_install(const char *dev)
+{
+        errno_t rc;
         char *pdev;