Changeset 368ee04 in mainline for uspace/lib/c/include/elf/elf_mod.h

Timestamp:

2017-04-05T18:10:39Z (8 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

93ad8166

Parents:

39f892a9 (diff), 2166728 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge from lp:~jakub/helenos/vfs-2.5-cherrypick

This merge cherry-picks some of the changesets from Jiri Zarevucky's:

lp:~zarevucky-jiri/helenos/vfs-2.5

and then continues independently, yet sometime in a similar vein.

Roughly speaking, Jiri's branch is merged entirely up to its revision
1926 and then cherry-picked on and off until its revision 1965. Among
these changes are:

• relativization of the API,
• client-side roots,
• server-side mounts,
• inbox for passing arbitrary files from parent to child,
• some streamlining and cleanup.

Additional changes include:

• addressing issues introduced by the above changes,
• client-side I/O cursors (file positions),
• all HelenOS file system APIs begin with the vfs_ prefix and can be used after including vfs/vfs.h,
• removal of some POSIX-ish headers and definitions,
• additional cleanup.

File:

• uspace/lib/c/include/elf/elf_mod.h (modified) (1 diff)

uspace/lib/c/include/elf/elf_mod.h

@@ -108 +108 @@
 
 extern const char *elf_error(unsigned int);
-extern int elf_load_file(const char *, size_t, eld_flags_t, elf_finfo_t *);
+extern int elf_load_file(int, size_t, eld_flags_t, elf_finfo_t *);
+extern int elf_load_file_name(const char *, size_t, eld_flags_t, elf_finfo_t *);
 
 #endif