Changeset b7fd2a0 in mainline for uspace/srv/fs/exfat/exfat_directory.c

Timestamp:

2018-01-13T03:10:29Z (8 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/srv/fs/exfat/exfat_directory.c (modified) (18 diffs)

uspace/srv/fs/exfat/exfat_directory.c

@@ -60 +60 @@
 }
 
-int exfat_directory_open(exfat_node_t *nodep, exfat_directory_t *di)
+errno_t exfat_directory_open(exfat_node_t *nodep, exfat_directory_t *di)
 {
         exfat_directory_init(di);
@@ -76 +76 @@
 }
 
-int exfat_directory_open_parent(exfat_directory_t *di, 
+errno_t exfat_directory_open_parent(exfat_directory_t *di, 
     service_id_t service_id, exfat_cluster_t firstc, bool fragmented)
 {
@@ -88 +88 @@
 }
 
-int exfat_directory_close(exfat_directory_t *di)
-{
-        int rc = EOK;
+errno_t exfat_directory_close(exfat_directory_t *di)
+{
+        errno_t rc = EOK;
         
         if (di->b) {
@@ -100 +100 @@
 }
 
-static int exfat_directory_block_load(exfat_directory_t *di)
+static errno_t exfat_directory_block_load(exfat_directory_t *di)
 {
         uint32_t i;
-        int rc = EOK;
+        errno_t rc = EOK;
 
         i = (di->pos * sizeof(exfat_dentry_t)) / BPS(di->bs);
@@ -133 +133 @@
 }
 
-int exfat_directory_next(exfat_directory_t *di)
-{
-        int rc;
+errno_t exfat_directory_next(exfat_directory_t *di)
+{
+        errno_t rc;
 
         di->pos += 1;
@@ -145 +145 @@
 }
 
-int exfat_directory_prev(exfat_directory_t *di)
-{
-        int rc = EOK;
+errno_t exfat_directory_prev(exfat_directory_t *di)
+{
+        errno_t rc = EOK;
         
         if (di->pos > 0) {
@@ -161 +161 @@
 }
 
-int exfat_directory_seek(exfat_directory_t *di, aoff64_t pos)
+errno_t exfat_directory_seek(exfat_directory_t *di, aoff64_t pos)
 {
         aoff64_t _pos = di->pos;
-        int rc;
+        errno_t rc;
 
         di->pos = pos;
@@ -174 +174 @@
 }
 
-int exfat_directory_get(exfat_directory_t *di, exfat_dentry_t **d)
-{
-        int rc;
+errno_t exfat_directory_get(exfat_directory_t *di, exfat_dentry_t **d)
+{
+        errno_t rc;
         
         rc = exfat_directory_block_load(di);
@@ -187 +187 @@
 }
 
-int exfat_directory_find(exfat_directory_t *di, exfat_dentry_clsf_t type,
+errno_t exfat_directory_find(exfat_directory_t *di, exfat_dentry_clsf_t type,
     exfat_dentry_t **d)
 {
@@ -201 +201 @@
 }
 
-int
+errno_t
 exfat_directory_find_continue(exfat_directory_t *di, exfat_dentry_clsf_t type,
     exfat_dentry_t **d)
 {
-        int rc;
+        errno_t rc;
         rc = exfat_directory_next(di);
         if (rc != EOK)
@@ -213 +213 @@
 
 
-int exfat_directory_read_file(exfat_directory_t *di, char *name, size_t size, 
+errno_t exfat_directory_read_file(exfat_directory_t *di, char *name, size_t size, 
     exfat_file_dentry_t *df, exfat_stream_dentry_t *ds)
 {
         uint16_t wname[EXFAT_FILENAME_LEN + 1];
         exfat_dentry_t *d = NULL;
-        int rc;
+        errno_t rc;
         int i;
         size_t offset = 0;
@@ -261 +261 @@
 }
 
-int exfat_directory_read_vollabel(exfat_directory_t *di, char *label,
+errno_t exfat_directory_read_vollabel(exfat_directory_t *di, char *label,
     size_t size)
 {
         uint16_t wlabel[EXFAT_VOLLABEL_LEN + 1];
         exfat_dentry_t *d = NULL;
-        int rc;
+        errno_t rc;
         aoff64_t start_pos = 0;
 
@@ -303 +303 @@
 }
 
-int exfat_directory_sync_file(exfat_directory_t *di, exfat_file_dentry_t *df, 
+errno_t exfat_directory_sync_file(exfat_directory_t *di, exfat_file_dentry_t *df, 
     exfat_stream_dentry_t *ds)
 {
-        int rc;
+        errno_t rc;
         int i, count;
         exfat_dentry_t *array = NULL, *de;
@@ -367 +367 @@
 }
 
-int exfat_directory_write_file(exfat_directory_t *di, const char *name)
+errno_t exfat_directory_write_file(exfat_directory_t *di, const char *name)
 {
         fs_node_t *fn;
@@ -374 +374 @@
         exfat_dentry_t df, ds, *de;
         uint16_t wname[EXFAT_FILENAME_LEN + 1];
-        int rc;
+        errno_t rc;
         int i;
         size_t uctable_chars, j;
@@ -474 +474 @@
 }
 
-int exfat_directory_erase_file(exfat_directory_t *di, aoff64_t pos)
-{
-        int rc;
+errno_t exfat_directory_erase_file(exfat_directory_t *di, aoff64_t pos)
+{
+        errno_t rc;
         int count;
         exfat_dentry_t *de;
@@ -502 +502 @@
 }
 
-int exfat_directory_expand(exfat_directory_t *di)
-{
-        int rc;
+errno_t exfat_directory_expand(exfat_directory_t *di)
+{
+        errno_t rc;
 
         if (!di->nodep)
@@ -521 +521 @@
 }
 
-int exfat_directory_lookup_free(exfat_directory_t *di, size_t count)
-{
-        int rc;
+errno_t exfat_directory_lookup_free(exfat_directory_t *di, size_t count)
+{
+        errno_t rc;
         exfat_dentry_t *d;
         size_t found;