Fork us on GitHub Follow us on Facebook Follow us on Twitter

Changeset 301ff30 in mainline


Ignore:
Timestamp:
2009-06-03T22:47:08Z (13 years ago)
Author:
Martin Decky <martin@…>
Branches:
lfn, master
Children:
99272a3
Parents:
98000fb
Message:

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

Location:
uspace
Files:
8 edited

Legend:

Unmodified
Added
Removed
  • uspace/lib/libc/generic/io/io.c

    r98000fb r301ff30  
    145145}
    146146
    147 FILE *fopen_node(fs_node_t *node, const char *mode)
     147FILE *fopen_node(inode_t *node, const char *mode)
    148148{
    149149        int flags;
     
    354354}
    355355
    356 void fnode(FILE *stream, fs_node_t *node)
     356void fnode(FILE *stream, inode_t *node)
    357357{
    358358        if (stream->fd >= 0) {
  • uspace/lib/libc/generic/loader.c

    r98000fb r301ff30  
    206206 *
    207207 */
    208 int loader_set_files(loader_t *ldr, fs_node_t *const files[])
     208int loader_set_files(loader_t *ldr, inode_t *const files[])
    209209{
    210210        /*
     
    212212         * compute size of the buffer needed.
    213213         */
    214         fs_node_t *const *ap = files;
     214        inode_t *const *ap = files;
    215215        size_t count = 0;
    216216        while (*ap != NULL) {
     
    219219        }
    220220       
    221         fs_node_t *files_buf = (fs_node_t *) malloc(count * sizeof(fs_node_t));
     221        inode_t *files_buf = (inode_t *) malloc(count * sizeof(inode_t));
    222222        if (files_buf == NULL)
    223223                return ENOMEM;
     
    232232        aid_t req = async_send_0(ldr->phone_id, LOADER_SET_FILES, &answer);
    233233        ipcarg_t rc = ipc_data_write_start(ldr->phone_id, (void *) files_buf,
    234             count * sizeof(fs_node_t));
     234            count * sizeof(inode_t));
    235235        if (rc != EOK) {
    236236                async_wait_for(req, NULL);
  • uspace/lib/libc/generic/task.c

    r98000fb r301ff30  
    101101       
    102102        /* Send default files */
    103         fs_node_t *files[4];
    104         fs_node_t stdin_node;
    105         fs_node_t stdout_node;
    106         fs_node_t stderr_node;
     103        inode_t *files[4];
     104        inode_t stdin_node;
     105        inode_t stdout_node;
     106        inode_t stderr_node;
    107107       
    108108        if ((stdin != NULL) && (stdin != &stdin_null)) {
  • uspace/lib/libc/generic/vfs/vfs.c

    r98000fb r301ff30  
    224224}
    225225
    226 int open_node(fs_node_t *node, int oflag)
     226int open_node(inode_t *node, int oflag)
    227227{
    228228        futex_down(&vfs_phone_futex);
     
    333333}
    334334
    335 void fd_node(int fildes, fs_node_t *node)
     335void fd_node(int fildes, inode_t *node)
    336336{
    337337        futex_down(&vfs_phone_futex);
  • uspace/lib/libc/include/loader/loader.h

    r98000fb r301ff30  
    5151extern int loader_set_pathname(loader_t *, const char *);
    5252extern int loader_set_args(loader_t *, char *const[]);
    53 extern int loader_set_files(loader_t *, fs_node_t *const[]);
     53extern int loader_set_files(loader_t *, inode_t *const[]);
    5454extern int loader_load_program(loader_t *);
    5555extern int loader_run(loader_t *);
  • uspace/lib/libc/include/loader/pcb.h

    r98000fb r301ff30  
    6161        int filc;
    6262        /** Preset files. */
    63         fs_node_t **filv;
     63        inode_t **filv;
    6464       
    6565        /*
  • uspace/lib/libc/include/vfs/vfs.h

    r98000fb r301ff30  
    4545        dev_handle_t dev_handle;
    4646        fs_index_t index;
    47 } fs_node_t;
     47} inode_t;
    4848
    4949extern char *absolutize(const char *, size_t *);
     
    5252    unsigned int flags);
    5353
    54 extern int open_node(fs_node_t *node, int oflag);
     54extern int open_node(inode_t *node, int oflag);
    5555extern int fd_phone(int);
    56 extern void fd_node(int, fs_node_t *);
     56extern void fd_node(int, inode_t *);
    5757
    58 extern FILE *fopen_node(fs_node_t *node, const char *);
     58extern FILE *fopen_node(inode_t *node, const char *);
    5959extern int fphone(FILE *);
    60 extern void fnode(FILE *stream, fs_node_t *node);
     60extern void fnode(FILE *stream, inode_t *node);
    6161
    6262#endif
  • uspace/srv/loader/main.c

    r98000fb r301ff30  
    8282static char **filv = NULL;
    8383/** Buffer holding all preset files */
    84 static fs_node_t *fil_buf = NULL;
     84static inode_t *fil_buf = NULL;
    8585
    8686static elf_info_t prog_info;
     
    243243        }
    244244       
    245         if ((buf_size % sizeof(fs_node_t)) != 0) {
     245        if ((buf_size % sizeof(inode_t)) != 0) {
    246246                ipc_answer_0(callid, EINVAL);
    247247                ipc_answer_0(rid, EINVAL);
     
    268268        ipc_data_write_finalize(callid, fil_buf, buf_size);
    269269       
    270         int count = buf_size / sizeof(fs_node_t);
     270        int count = buf_size / sizeof(inode_t);
    271271       
    272272        /* Allocate filvv */
    273         filv = malloc((count + 1) * sizeof(fs_node_t *));
     273        filv = malloc((count + 1) * sizeof(inode_t *));
    274274       
    275275        if (filv == NULL) {
Note: See TracChangeset for help on using the changeset viewer.