Changeset b7fd2a0 in mainline for uspace/srv/fs/fat/fat_directory.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/srv/fs/fat/fat_directory.c (modified) (18 diffs)

uspace/srv/fs/fat/fat_directory.c

@@ -46 +46 @@
 #include <stdio.h>
 
-int fat_directory_open(fat_node_t *nodep, fat_directory_t *di)
+errno_t fat_directory_open(fat_node_t *nodep, fat_directory_t *di)
 {
         di->b = NULL;
@@ -62 +62 @@
 }
 
-int fat_directory_close(fat_directory_t *di)
-{
-        int rc = EOK;
+errno_t fat_directory_close(fat_directory_t *di)
+{
+        errno_t rc = EOK;
         
         if (di->b)
@@ -72 +72 @@
 }
 
-static int fat_directory_block_load(fat_directory_t *di)
+static errno_t fat_directory_block_load(fat_directory_t *di)
 {
         uint32_t i;
-        int rc;
+        errno_t rc;
 
         i = (di->pos * sizeof(fat_dentry_t)) / BPS(di->bs);
@@ -98 +98 @@
 }
 
-int fat_directory_next(fat_directory_t *di)
-{
-        int rc;
+errno_t fat_directory_next(fat_directory_t *di)
+{
+        errno_t rc;
 
         di->pos += 1;
@@ -110 +110 @@
 }
 
-int fat_directory_prev(fat_directory_t *di)
-{
-        int rc = EOK;
+errno_t fat_directory_prev(fat_directory_t *di)
+{
+        errno_t rc = EOK;
         
         if (di->pos > 0) {
@@ -126 +126 @@
 }
 
-int fat_directory_seek(fat_directory_t *di, aoff64_t pos)
+errno_t fat_directory_seek(fat_directory_t *di, aoff64_t pos)
 {
         aoff64_t _pos = di->pos;
-        int rc;
+        errno_t rc;
 
         di->pos = pos;
@@ -139 +139 @@
 }
 
-int fat_directory_get(fat_directory_t *di, fat_dentry_t **d)
-{
-        int rc;
+errno_t fat_directory_get(fat_directory_t *di, fat_dentry_t **d)
+{
+        errno_t rc;
         
         rc = fat_directory_block_load(di);
@@ -152 +152 @@
 }
 
-int fat_directory_read(fat_directory_t *di, char *name, fat_dentry_t **de)
+errno_t fat_directory_read(fat_directory_t *di, char *name, fat_dentry_t **de)
 {
         fat_dentry_t *d = NULL;
@@ -160 +160 @@
         int long_entry_count = 0;
         uint8_t checksum = 0;
-        int rc;
+        errno_t rc;
 
         void *data;
@@ -236 +236 @@
 }
 
-int fat_directory_erase(fat_directory_t *di)
-{
-        int rc;
+errno_t fat_directory_erase(fat_directory_t *di)
+{
+        errno_t rc;
         fat_dentry_t *d;
         bool flag = false;
@@ -267 +267 @@
 }
 
-int fat_directory_write(fat_directory_t *di, const char *name, fat_dentry_t *de)
-{
-        int rc;
+errno_t fat_directory_write(fat_directory_t *di, const char *name, fat_dentry_t *de)
+{
+        errno_t rc;
         void *data;
         fat_instance_t *instance;
@@ -348 +348 @@
 }
 
-int fat_directory_create_sfn(fat_directory_t *di, fat_dentry_t *de,
+errno_t fat_directory_create_sfn(fat_directory_t *di, fat_dentry_t *de,
     const char *lname)
 {
@@ -398 +398 @@
 }
 
-int fat_directory_write_dentry(fat_directory_t *di, fat_dentry_t *de)
+errno_t fat_directory_write_dentry(fat_directory_t *di, fat_dentry_t *de)
 {
         fat_dentry_t *d;
-        int rc;
+        errno_t rc;
 
         rc = fat_directory_get(di, &d);
@@ -412 +412 @@
 }
 
-int fat_directory_expand(fat_directory_t *di)
-{
-        int rc;
+errno_t fat_directory_expand(fat_directory_t *di)
+{
+        errno_t rc;
         fat_cluster_t mcl, lcl;
 
@@ -444 +444 @@
 }
 
-int fat_directory_lookup_free(fat_directory_t *di, size_t count)
+errno_t fat_directory_lookup_free(fat_directory_t *di, size_t count)
 {
         fat_dentry_t *d;
         size_t found;
         aoff64_t pos;
-        int rc;
+        errno_t rc;
         
         do {
@@ -485 +485 @@
 }
 
-int fat_directory_lookup_name(fat_directory_t *di, const char *name,
+errno_t fat_directory_lookup_name(fat_directory_t *di, const char *name,
     fat_dentry_t **de)
 {
@@ -506 +506 @@
 {
         fat_dentry_t *d;
-        int rc;
+        errno_t rc;
 
         fat_directory_seek(di, 0);
@@ -538 +538 @@
  * @return EOK on success, ENOENT if not found, EIO on I/O error
  */
-int fat_directory_vollabel_get(fat_directory_t *di, char *label)
+errno_t fat_directory_vollabel_get(fat_directory_t *di, char *label)
 {
         fat_dentry_t *d;
-        int rc;
+        errno_t rc;
 
         fat_directory_seek(di, 0);