Changeset 9c4cf0d in mainline for uspace/app/viewer/viewer.c

Timestamp:

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

Author:

Jakub Jermar <jakub@…>

Branches:

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

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/viewer/viewer.c (modified) (3 diffs)

uspace/app/viewer/viewer.c

@@ -116 +116 @@
         int rc = vfs_stat(fd, &stat);
         if (rc != EOK) {
-                close(fd);
+                vfs_put(fd);
                 return false;
         }
@@ -122 +122 @@
         void *tga = malloc(stat.size);
         if (tga == NULL) {
-                close(fd);
+                vfs_put(fd);
                 return false;
         }
@@ -129 +129 @@
         if ((rd < 0) || (rd != (ssize_t) stat.size)) {
                 free(tga);
-                close(fd);
-                return false;
-        }
-        
-        close(fd);
+                vfs_put(fd);
+                return false;
+        }
+        
+        vfs_put(fd);
         
         *p_local_surface = decode_tga(tga, stat.size, 0);