Changeset 332 for trunk/kernel

Timestamp:

Aug 7, 2017, 10:06:31 AM (7 years ago)

Author:

max@…

Message:

vfs_kernel_move() return error_t, not a count.

File:

• trunk/kernel/libk/elf.c (modified) (3 diffs)

trunk/kernel/libk/elf.c

@@ -86 +86 @@
                                 uint32_t size )
 {
-        uint32_t  count;
+        error_t   error;
         xptr_t    buf_xp;
         void    * buf_ptr;
@@ -94 +94 @@
 
         // load .elf header
-        count = vfs_kernel_move( true,     // to_buffer
+        error = vfs_kernel_move( true,     // to_buffer
                                  file_xp,
                                  buf_xp,
                                  size );
 
-        if( count != size )
-        {
-                printk("\n[ERROR] in %s : cannot read ELF header size : %d / done = %d\n",
-               __FUNCTION__ , size , count );
+        if( error )
+        {
+                printk("\n[ERROR] in %s : cannot read ELF header size : %d\n",
+               __FUNCTION__ , size );
                 return -1;
         }
@@ -113 +113 @@
             (header->e_ident[EI_MAG3] != ELFMAG3) )
         {
-                printk("\n[ERROR] in %s : file %s not in ELF format\n", __FUNCTION__ );
+                printk("\n[ERROR] in %s : file not in ELF format\n", __FUNCTION__ );
                 return -1;
         }