Changeset 9ed3e1a in mainline for uspace/lib

Timestamp:

2013-11-12T08:37:39Z (12 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

a070eff

Parents:

9f9450bb (diff), 34cb6c8 (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 mainline changes

Location:

uspace/lib

Files:

• c/generic/rtld/module.c (modified) (4 diffs)
• c/generic/vfs/vfs.c (modified) (1 diff)
• c/include/stdio.h (modified) (1 diff)
• gui/window.c (modified) (1 diff)
• gui/window.h (modified) (1 diff)

uspace/lib/c/generic/rtld/module.c

@@ -93 +93 @@
 module_t *module_find(const char *name)
 {
-        module_t *m;
         const char *p, *soname;
 
@@ -107 +106 @@
 
         /* Traverse list of all modules. Not extremely fast, but simple */
-        list_foreach(runtime_env->modules, cur) {
-                DPRINTF("cur = %p\n", cur);
-                m = list_get_instance(cur, module_t, modules_link);
+        list_foreach(runtime_env->modules, modules_link, module_t, m) {
+                DPRINTF("m = %p\n", m);
                 if (str_cmp(m->dyn.soname, soname) == 0) {
                         return m; /* Found */
@@ -245 +243 @@
 void modules_process_relocs(module_t *start)
 {
-        module_t *m;
-
-        list_foreach(runtime_env->modules, cur) {
-                m = list_get_instance(cur, module_t, modules_link);
-
+        list_foreach(runtime_env->modules, modules_link, module_t, m) {
                 /* Skip rtld, since it has already been processed */
                 if (m != &runtime_env->rtld) {
@@ -261 +255 @@
 void modules_untag(void)
 {
-        module_t *m;
-
-        list_foreach(runtime_env->modules, cur) {
-                m = list_get_instance(cur, module_t, modules_link);
+        list_foreach(runtime_env->modules, modules_link, module_t, m) {
                 m->bfs_tag = false;
         }

uspace/lib/c/generic/vfs/vfs.c

@@ -742 +742 @@
 }
 
+int remove(const char *path)
+{
+        return unlink(path);
+}
+
 int chdir(const char *path)
 {

uspace/lib/c/include/stdio.h

@@ -151 +151 @@
 /* Misc file functions */
 extern int rename(const char *, const char *);
+extern int remove(const char *);
 
 #endif

uspace/lib/gui/window.c

@@ -529 +529 @@
 }
 
-window_t *window_open(char *winreg, bool is_main, bool is_decorated, 
+window_t *window_open(const char *winreg, bool is_main, bool is_decorated,
     const char *caption, sysarg_t x_offset, sysarg_t y_offset)
 {

uspace/lib/gui/window.h

@@ -66 +66 @@
  * If the window is declared as main, its closure causes termination of the
  * whole application. Note that opened window does not have any surface yet. */
-extern window_t *window_open(char *, bool, bool, const char *, sysarg_t, sysarg_t);
+extern window_t *window_open(const char *, bool, bool, const char *, sysarg_t,
+    sysarg_t);
 
 /**