Changeset 333

Timestamp:

Aug 7, 2017, 10:11:25 AM (7 years ago)

Author:

max@…

Message:

vfs_user_move() returns an error_t, so don't return a count.

Location:

trunk/kernel

Files:

• libk/elf.c (modified) (2 diffs)
• vfs/vfs.c (modified) (1 diff)

trunk/kernel/libk/elf.c

@@ -219 +219 @@
         xptr_t       file_xp;          // extended pointer on created file descriptor
         uint32_t     file_id;          // file descriptor index (unused)
-        uint32_t     count;            // bytes counter
         error_t      error;
 
@@ -292 +291 @@
 
         // load seg descriptors array to local buffer
-        count = vfs_user_move( true,       // to_buffer
+        error = vfs_user_move( true,       // to_buffer
                                file_xp,
                                segs_base,
                                segs_size );
 
-        if( count != segs_size )
+        if( error )
         {
                 printk("\n[ERROR] in %s : cannot read segments descriptors\n", __FUNCTION__ );

trunk/kernel/vfs/vfs.c

@@ -713 +713 @@
 
         if( error ) return -1;
-        else        return size;
+        else        return 0;
     }
     else