Changeset b7fd2a0 in mainline for uspace/app/sysinst/sysinst.c

Timestamp:

2018-01-13T03:10:29Z (7 years ago)

Author:

Jiří Zárevúcky <zarevucky.jiri@…>

Branches:

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

Children:

a53ed3a

Parents:

36f0738

Message:

Use errno_t in all uspace and kernel code.

Change type of every variable, parameter and return value that holds an
<errno.h> constant to either errno_t (the usual case), or sys_errno_t
(some places in kernel). This is for the purpose of self-documentation,
as well as for type-checking with a bit of type definition hackery.

Although this is a massive commit, it is a simple text replacement, and thus
is very easy to verify. Simply do the following:

`
git checkout <this commit's hash>
git reset HEAD
<sup>git add .
tools/srepl '\berrno_t\b' int
git add .
tools/srepl '\bsys_errno_t\b' sysarg_t
git reset
git diff
`</sup>

While this doesn't ensure that the replacements are correct, it does ensure
that the commit doesn't do anything except those replacements. Since errno_t
is typedef'd to int in the usual case (and sys_errno_t to sysarg_t), even if
incorrect, this commit cannot change behavior.

File:

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

uspace/app/sysinst/sysinst.c

@@ -85 +85 @@
  * @return EOK on success or an error code
  */
-static int sysinst_label_dev(const char *dev, char **pdev)
+static errno_t sysinst_label_dev(const char *dev, char **pdev)
 {
         fdisk_t *fdisk;
@@ -93 +93 @@
         cap_spec_t cap;
         service_id_t sid;
-        int rc;
+        errno_t rc;
 
         printf("sysinst_label_dev(): get service ID '%s'\n", dev);
@@ -154 +154 @@
  * @return EOK on success or an error code
  */
-static int sysinst_fs_mount(const char *dev)
+static errno_t sysinst_fs_mount(const char *dev)
 {
         task_wait_t twait;
         task_exit_t texit;
-        int rc;
+        errno_t rc;
         int trc;
 
@@ -193 +193 @@
  * @return EOK on success or an error code
  */
-static int sysinst_copy_boot_files(void)
+static errno_t sysinst_copy_boot_files(void)
 {
         task_wait_t twait;
         task_exit_t texit;
-        int rc;
+        errno_t rc;
         int trc;
 
@@ -260 +260 @@
  * @return EOK on success or an error code
  */
-static int sysinst_copy_boot_blocks(const char *devp)
+static errno_t sysinst_copy_boot_blocks(const char *devp)
 {
         void *boot_img;
@@ -272 +272 @@
         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");
@@ -355 +355 @@
  * @return EOK on success or an error code
  */
-static int sysinst_install(const char *dev)
-{
-        int rc;
+static errno_t sysinst_install(const char *dev)
+{
+        errno_t rc;
         char *pdev;