Changeset 9c4cf0d in mainline for uspace/app/sysinst/futil.c

Timestamp:

2017-04-02T11:24:06Z (7 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade

Children:

151f1cc

Parents:

b19e892

Message:

Rename close() to vfs_put()

This is motivated mainly by the fact that a file handle does not
necessarily correspond to an open file and close() was no longer the
the opposite operation to open().

File:

• uspace/app/sysinst/futil.c (modified) (4 diffs)

uspace/app/sysinst/futil.c

@@ -83 +83 @@
         } while (true);
 
-        (void) close(sf);
+        (void) vfs_put(sf);
 
-        rc = close(df);
+        rc = vfs_put(df);
         if (rc < 0)
                 return EIO;
@@ -166 +166 @@
 
         if (vfs_stat(sf, &st) != EOK) {
-                close(sf);
+                vfs_put(sf);
                 return EIO;
         }       
@@ -174 +174 @@
         data = calloc(fsize, 1);
         if (data == NULL) {
-                close(sf);
+                vfs_put(sf);
                 return ENOMEM;
         }
@@ -180 +180 @@
         nr = read(sf, (aoff64_t []) { 0 }, data, fsize);
         if (nr != (ssize_t)fsize) {
-                close(sf);
+                vfs_put(sf);
                 free(data);
                 return EIO;
         }
 
-        (void) close(sf);
+        (void) vfs_put(sf);
         *rdata = data;
         *rsize = fsize;