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

uspace/app/mkexfat/mkexfat.c

@@ -112 +112 @@
 vbr_checksum_update(void const *octets, size_t nbytes, uint32_t *checksum);
 
-static int
+static errno_t
 ebs_write(service_id_t service_id, exfat_cfg_t *cfg,
     int base, uint32_t *chksum);
 
-static int
+static errno_t
 bitmap_write(service_id_t service_id, exfat_cfg_t *cfg);
 
@@ -284 +284 @@
 }
 
-static int
+static errno_t
 bootsec_write(service_id_t service_id, exfat_cfg_t *cfg)
 {
@@ -290 +290 @@
         uint32_t vbr_checksum;
         uint32_t *chksum_sector;
-        int rc;
+        errno_t rc;
         unsigned idx;
 
@@ -346 +346 @@
  * @return  EOK on success or an error code.
  */
-static int
+static errno_t
 ebs_write(service_id_t service_id, exfat_cfg_t *cfg, int base,
     uint32_t *chksum)
@@ -352 +352 @@
         uint32_t *ebs = calloc(cfg->sector_size, sizeof(uint8_t));
         int i;
-        int rc;
+        errno_t rc;
 
         if (!ebs)
@@ -399 +399 @@
  * @return EOK on success or an error code.
  */
-static int
+static errno_t
 fat_initialize(service_id_t service_id, exfat_cfg_t *cfg)
 {
         unsigned long i;
         uint32_t *pfat;
-        int rc;
+        errno_t rc;
 
         pfat = calloc(cfg->sector_size, 1);
@@ -439 +439 @@
  * @return EOK on success or an error code.
  */
-static int
+static errno_t
 fat_allocate_clusters(service_id_t service_id, exfat_cfg_t *cfg,
     uint32_t cur_cls, unsigned long ncls)
 {
-        int rc;
+        errno_t rc;
         unsigned const fat_entries = cfg->sector_size / sizeof(uint32_t);
         aoff64_t fat_sec = cur_cls / fat_entries + FAT_SECTOR_START;
@@ -496 +496 @@
  * @return  EOK on success or an error code.
  */
-static int
+static errno_t
 bitmap_write(service_id_t service_id, exfat_cfg_t *cfg)
 {
         unsigned long i, sec;
         unsigned long allocated_cls;
-        int rc = EOK;
+        errno_t rc = EOK;
         bool need_reset = true;
 
@@ -544 +544 @@
 
 /** Write the upcase table to disk. */
-static int
+static errno_t
 upcase_table_write(service_id_t service_id, exfat_cfg_t *cfg)
 {
-        int rc = EOK;
+        errno_t rc = EOK;
         aoff64_t start_sec, nsecs, i;
         uint8_t *table_ptr;
@@ -595 +595 @@
  * @return   EOK on success or an error code.
  */
-static int
+static errno_t
 root_dentries_write(service_id_t service_id, exfat_cfg_t *cfg)
 {
@@ -601 +601 @@
         aoff64_t rootdir_sec;
         uint16_t wlabel[EXFAT_VOLLABEL_LEN + 1];
-        int rc;
+        errno_t rc;
         uint8_t *data;
         unsigned long i;
@@ -758 +758 @@
         char *dev_path;
         service_id_t service_id;
-        int rc;
+        errno_t rc;
         int c, opt_ind;
         aoff64_t user_fs_size = 0;