Changeset 301ff30 in mainline for uspace/lib/libc

Timestamp:

2009-06-03T22:47:08Z (16 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

Location:

uspace/lib/libc

Files:

• generic/io/io.c (modified) (2 diffs)
• generic/loader.c (modified) (4 diffs)
• generic/task.c (modified) (1 diff)
• generic/vfs/vfs.c (modified) (2 diffs)
• include/loader/loader.h (modified) (1 diff)
• include/loader/pcb.h (modified) (1 diff)
• include/vfs/vfs.h (modified) (2 diffs)

uspace/lib/libc/generic/io/io.c

@@ -145 +145 @@
 }
 
-FILE *fopen_node(fs_node_t *node, const char *mode)
+FILE *fopen_node(inode_t *node, const char *mode)
 {
         int flags;
@@ -354 +354 @@
 }
 
-void fnode(FILE *stream, fs_node_t *node)
+void fnode(FILE *stream, inode_t *node)
 {
         if (stream->fd >= 0) {

uspace/lib/libc/generic/loader.c

@@ -206 +206 @@
  *
  */
-int loader_set_files(loader_t *ldr, fs_node_t *const files[])
+int loader_set_files(loader_t *ldr, inode_t *const files[])
 {
         /*
@@ -212 +212 @@
          * compute size of the buffer needed.
          */
-        fs_node_t *const *ap = files;
+        inode_t *const *ap = files;
         size_t count = 0;
         while (*ap != NULL) {
@@ -219 +219 @@
         }
         
-        fs_node_t *files_buf = (fs_node_t *) malloc(count * sizeof(fs_node_t));
+        inode_t *files_buf = (inode_t *) malloc(count * sizeof(inode_t));
         if (files_buf == NULL)
                 return ENOMEM;
@@ -232 +232 @@
         aid_t req = async_send_0(ldr->phone_id, LOADER_SET_FILES, &answer);
         ipcarg_t rc = ipc_data_write_start(ldr->phone_id, (void *) files_buf,
-            count * sizeof(fs_node_t));
+            count * sizeof(inode_t));
         if (rc != EOK) {
                 async_wait_for(req, NULL);

uspace/lib/libc/generic/task.c

@@ -101 +101 @@
         
         /* Send default files */
-        fs_node_t *files[4];
-        fs_node_t stdin_node;
-        fs_node_t stdout_node;
-        fs_node_t stderr_node;
+        inode_t *files[4];
+        inode_t stdin_node;
+        inode_t stdout_node;
+        inode_t stderr_node;
         
         if ((stdin != NULL) && (stdin != &stdin_null)) {

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

@@ -224 +224 @@
 }
 
-int open_node(fs_node_t *node, int oflag)
+int open_node(inode_t *node, int oflag)
 {
         futex_down(&vfs_phone_futex);
@@ -333 +333 @@
 }
 
-void fd_node(int fildes, fs_node_t *node)
+void fd_node(int fildes, inode_t *node)
 {
         futex_down(&vfs_phone_futex);

uspace/lib/libc/include/loader/loader.h

@@ -51 +51 @@
 extern int loader_set_pathname(loader_t *, const char *);
 extern int loader_set_args(loader_t *, char *const[]);
-extern int loader_set_files(loader_t *, fs_node_t *const[]);
+extern int loader_set_files(loader_t *, inode_t *const[]);
 extern int loader_load_program(loader_t *);
 extern int loader_run(loader_t *);

uspace/lib/libc/include/loader/pcb.h

@@ -61 +61 @@
         int filc;
         /** Preset files. */
-        fs_node_t **filv;
+        inode_t **filv;
         
         /*

uspace/lib/libc/include/vfs/vfs.h

@@ -45 +45 @@
         dev_handle_t dev_handle;
         fs_index_t index;
-} fs_node_t;
+} inode_t;
 
 extern char *absolutize(const char *, size_t *);
@@ -52 +52 @@
     unsigned int flags);
 
-extern int open_node(fs_node_t *node, int oflag);
+extern int open_node(inode_t *node, int oflag);
 extern int fd_phone(int);
-extern void fd_node(int, fs_node_t *);
+extern void fd_node(int, inode_t *);
 
-extern FILE *fopen_node(fs_node_t *node, const char *);
+extern FILE *fopen_node(inode_t *node, const char *);
 extern int fphone(FILE *);
-extern void fnode(FILE *stream, fs_node_t *node);
+extern void fnode(FILE *stream, inode_t *node);
 
 #endif