Changeset 301ff30 in mainline for uspace/srv/loader/main.c

Timestamp:

2009-06-03T22:47:08Z (15 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

99272a3

Parents:

98000fb

Message:

rename libc's fs_node_t to inode_t to avoid type conflict with VFS

File:

• uspace/srv/loader/main.c (modified) (3 diffs)

uspace/srv/loader/main.c

@@ -82 +82 @@
 static char **filv = NULL;
 /** Buffer holding all preset files */
-static fs_node_t *fil_buf = NULL;
+static inode_t *fil_buf = NULL;
 
 static elf_info_t prog_info;
@@ -243 +243 @@
         }
         
-        if ((buf_size % sizeof(fs_node_t)) != 0) {
+        if ((buf_size % sizeof(inode_t)) != 0) {
                 ipc_answer_0(callid, EINVAL);
                 ipc_answer_0(rid, EINVAL);
@@ -268 +268 @@
         ipc_data_write_finalize(callid, fil_buf, buf_size);
         
-        int count = buf_size / sizeof(fs_node_t);
+        int count = buf_size / sizeof(inode_t);
         
         /* Allocate filvv */
-        filv = malloc((count + 1) * sizeof(fs_node_t *));
+        filv = malloc((count + 1) * sizeof(inode_t *));
         
         if (filv == NULL) {