Changeset 132ab5d1 in mainline for uspace/app/sysinst/sysinst.c

Timestamp:

2018-01-30T03:20:45Z (8 years ago)

Author:

Jenda <jenda.jzqk73@…>

Branches:

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

Children:

5a6cc679

Parents:

8bfb163 (diff), 6a5d05b (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge commit '6a5d05bd2551e64111bea4f9332dd7448c26ce84' into forwardport

Separate return value from error code in gen_irq_code*().

File:

• uspace/app/sysinst/sysinst.c (modified) (9 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>
@@ -82 +83 @@
  * @param pdev Place to store partition device name
  *
- * @return EOK on success or error code
+ * @return EOK on success or an error code
  */
 static int sysinst_label_dev(const char *dev, char **pdev)
@@ -117 +118 @@
         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 +126 @@
         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 +142 @@
 
         /* 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 +152 @@
  *
  * @param dev Partition device
- * @return EOK on success or error code
+ * @return EOK on success or an error code
  */
 static int sysinst_fs_mount(const char *dev)
@@ -191 +191 @@
 /** Copy boot files.
  *
- * @return EOK on success or error code
+ * @return EOK on success or an error code
  */
 static int sysinst_copy_boot_files(void)
@@ -258 +258 @@
  *
  * @param devp Disk device
- * @return EOK on success or error code
+ * @return EOK on success or an error code
  */
 static int sysinst_copy_boot_blocks(const char *devp)
@@ -353 +353 @@
  *
  * @param dev Device to install to.
- * @return EOK on success or error code
+ * @return EOK on success or an error code
  */
 static int sysinst_install(const char *dev)