Changeset b7fd2a0 in mainline for uspace/app/fdisk/fdisk.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/fdisk/fdisk.c (modified) (16 diffs)

uspace/app/fdisk/fdisk.c

@@ -68 +68 @@
 } devac_t;
 
-static int fdsk_pcnt_fs_format(vol_part_cnt_t pcnt, vol_fstype_t fstype,
+static errno_t fdsk_pcnt_fs_format(vol_part_cnt_t pcnt, vol_fstype_t fstype,
     char **rstr)
 {
-        int rc;
+        errno_t rc;
         char *s;
 
@@ -97 +97 @@
 
 /** Confirm user selection. */
-static int fdsk_confirm(const char *msg, bool *rconfirm)
+static errno_t fdsk_confirm(const char *msg, bool *rconfirm)
 {
         tinput_t *tinput = NULL;
         char *answer;
-        int rc;
+        errno_t rc;
 
         tinput = tinput_new();
@@ -146 +146 @@
 
 /** Device selection */
-static int fdsk_dev_sel_choice(service_id_t *rsvcid)
+static errno_t fdsk_dev_sel_choice(service_id_t *rsvcid)
 {
         fdisk_dev_list_t *devlist = NULL;
@@ -159 +159 @@
         void *sel;
         int ndevs;
-        int rc;
+        errno_t rc;
 
         rc = nchoice_create(&choice);
@@ -281 +281 @@
 }
 
-static int fdsk_create_label(fdisk_dev_t *dev)
+static errno_t fdsk_create_label(fdisk_dev_t *dev)
 {
         nchoice_t *choice = NULL;
@@ -287 +287 @@
         char *sltype = NULL;
         int i;
-        int rc;
+        errno_t rc;
 
         rc = nchoice_create(&choice);
@@ -341 +341 @@
 }
 
-static int fdsk_delete_label(fdisk_dev_t *dev)
+static errno_t fdsk_delete_label(fdisk_dev_t *dev)
 {
         bool confirm;
-        int rc;
+        errno_t rc;
 
         rc = fdsk_confirm("Warning. Any data on disk will be lost. "
@@ -365 +365 @@
 }
 
-static int fdsk_erase_disk(fdisk_dev_t *dev)
+static errno_t fdsk_erase_disk(fdisk_dev_t *dev)
 {
         bool confirm;
-        int rc;
+        errno_t rc;
 
         rc = fdsk_confirm("Warning. Any data on disk will be lost. "
@@ -389 +389 @@
 }
 
-static int fdsk_select_fstype(vol_fstype_t *fstype)
+static errno_t fdsk_select_fstype(vol_fstype_t *fstype)
 {
         nchoice_t *choice = NULL;
@@ -395 +395 @@
         char *sfstype;
         int i;
-        int rc;
+        errno_t rc;
 
         rc = nchoice_create(&choice);
@@ -444 +444 @@
 }
 
-static int fdsk_create_part(fdisk_dev_t *dev, label_pkind_t pkind)
+static errno_t fdsk_create_part(fdisk_dev_t *dev, label_pkind_t pkind)
 {
-        int rc;
+        errno_t rc;
         fdisk_part_spec_t pspec;
         cap_spec_t cap;
@@ -553 +553 @@
 }
 
-static int fdsk_delete_part(fdisk_dev_t *dev)
+static errno_t fdsk_delete_part(fdisk_dev_t *dev)
 {
         nchoice_t *choice = NULL;
@@ -565 +565 @@
         bool confirm;
         void *sel;
-        int rc;
+        errno_t rc;
 
         rc = nchoice_create(&choice);
@@ -700 +700 @@
 
 /** Device menu */
-static int fdsk_dev_menu(fdisk_dev_t *dev)
+static errno_t fdsk_dev_menu(fdisk_dev_t *dev)
 {
         nchoice_t *choice = NULL;
@@ -717 +717 @@
         char *spkind;
         const char *label;
-        int rc;
+        errno_t rc;
         int npart;
         void *sel;
@@ -1079 +1079 @@
         service_id_t svcid;
         fdisk_dev_t *dev;
-        int rc;
+        errno_t rc;
 
         rc = fdisk_create(&fdisk);