Changeset 76d6169 in mainline

Timestamp:

2011-08-18T16:05:58Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

cdc8ee2d

Parents:

221ab41a

Message:

Get rid of fopen_handle().

Location:

uspace/lib/c

Files:

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

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

@@ -104 +104 @@
 {
         if (filc > 0) {
-                stdin = fopen_handle(0);
+                stdin = fdopen(0, "r");
         } else {
                 stdin = &stdin_null;
@@ -111 +111 @@
         
         if (filc > 1) {
-                stdout = fopen_handle(1);
+                stdout = fdopen(1, "w");
         } else {
                 stdout = &stdout_klog;
@@ -118 +118 @@
         
         if (filc > 2) {
-                stderr = fopen_handle(2);
+                stderr = fdopen(2, "w");
         } else {
                 stderr = &stderr_klog;
@@ -285 +285 @@
 }
 
-FILE *fopen_handle(int fd)
-{
-        /* Open file. */
-        FILE *stream = malloc(sizeof(FILE));
-        if (stream == NULL) {
-                errno = ENOMEM;
-                return NULL;
-        }
-        
-        stream->fd = fd;
-        stream->error = false;
-        stream->eof = false;
-        stream->klog = false;
-        stream->sess = NULL;
-        stream->need_sync = false;
-        _setvbuf(stream);
-        
-        list_append(&stream->link, &files);
-        
-        return stream;
-}
-
 int fclose(FILE *stream)
 {

uspace/lib/c/include/vfs/vfs.h

@@ -52 +52 @@
 extern int unmount(const char *);
 
-extern FILE *fopen_handle(int);
 extern int fhandle(FILE *, int *);