Changeset 46577995 in mainline for uspace/lib/bithenge/src/file.c

Timestamp:

2018-01-04T20:50:52Z (7 years ago)

Author:

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

Children:

e211ea04

Parents:

facacc71

git-author:

Jiří Zárevúcky <zarevucky.jiri@…> (2018-01-04 20:47:53)

git-committer:

Jiří Zárevúcky <zarevucky.jiri@…> (2018-01-04 20:50:52)

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.

After this commit, HelenOS is free of code that mixes error codes with non-error
values on the assumption that error codes are negative.

File:

• uspace/lib/bithenge/src/file.c (modified) (7 diffs)

uspace/lib/bithenge/src/file.c

@@ -63 +63 @@
 }
 
-static int file_size(bithenge_blob_t *base, aoff64_t *size)
+static errno_t file_size(bithenge_blob_t *base, aoff64_t *size)
 {
         file_blob_t *blob = blob_as_file(base);
@@ -70 +70 @@
 }
 
-static int file_read(bithenge_blob_t *base, aoff64_t offset, char *buffer,
+static errno_t file_read(bithenge_blob_t *base, aoff64_t offset, char *buffer,
     aoff64_t *size)
 {
@@ -78 +78 @@
 
         size_t amount_read;
-        int rc = vfs_read(blob->fd, &offset, buffer, *size, &amount_read);
+        errno_t rc = vfs_read(blob->fd, &offset, buffer, *size, &amount_read);
         if (rc != EOK)
                 return errno;
@@ -98 +98 @@
 };
 
-static int new_file_blob(bithenge_node_t **out, int fd, bool needs_close)
+static errno_t new_file_blob(bithenge_node_t **out, int fd, bool needs_close)
 {
         assert(out);
 
         struct stat stat;
-        int rc = vfs_stat(fd, &stat);
+        errno_t rc = vfs_stat(fd, &stat);
         if (rc != EOK) {
                 if (needs_close)
@@ -141 +141 @@
  * @param filename The name of the file.
  * @return EOK on success or an error code from errno.h. */
-int bithenge_new_file_blob(bithenge_node_t **out, const char *filename)
+errno_t bithenge_new_file_blob(bithenge_node_t **out, const char *filename)
 {
         assert(filename);
 
         int fd;
-        int rc = vfs_lookup_open(filename, WALK_REGULAR, MODE_READ, &fd);
+        errno_t rc = vfs_lookup_open(filename, WALK_REGULAR, MODE_READ, &fd);
         if (rc != EOK)
                 return rc;
@@ -158 +158 @@
  * @param fd The file descriptor.
  * @return EOK on success or an error code from errno.h. */
-int bithenge_new_file_blob_from_fd(bithenge_node_t **out, int fd)
+errno_t bithenge_new_file_blob_from_fd(bithenge_node_t **out, int fd)
 {
         return new_file_blob(out, fd, false);
@@ -168 +168 @@
  * @param file The file pointer.
  * @return EOK on success or an error code from errno.h. */
-int bithenge_new_file_blob_from_file(bithenge_node_t **out, FILE *file)
+errno_t bithenge_new_file_blob_from_file(bithenge_node_t **out, FILE *file)
 {
         int fd = fileno(file);