Changeset be2a20ac in mainline for uspace/lib/c/generic/private/stdio.h

Timestamp:

2018-06-14T12:59:51Z (6 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

0ceeac3

Parents:

a55d76b1 (diff), 80f345c (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.

git-author:

Jiri Svoboda <jiri@…> (2018-06-14 12:55:40)

git-committer:

Jiri Svoboda <jiri@…> (2018-06-14 12:59:51)

Message:

Merge scanf family implementation.

File:

• uspace/lib/c/generic/private/stdio.h (modified) (3 diffs)

uspace/lib/c/generic/private/stdio.h

@@ -39 +39 @@
 #include <stdio.h>
 #include <async.h>
+#include <stddef.h>
 
 /** Maximum characters that can be pushed back by ungetc() */
 #define UNGETC_MAX 1
+
+/** Stream operations */
+typedef struct {
+        /** Read from stream */
+        size_t (*read)(void *buf, size_t size, size_t nmemb, FILE *stream);
+        /** Write to stream */
+        size_t (*write)(const void *buf, size_t size, size_t nmemb,
+            FILE *stream);
+        /** Flush stream */
+        int (*flush)(FILE *stream);
+} __stream_ops_t;
 
 struct _IO_FILE {
@@ -47 +59 @@
         link_t link;
 
+        /** Stream operations */
+        __stream_ops_t *ops;
+
         /** Underlying file descriptor. */
         int fd;
+
+        /** Instance argument */
+        void *arg;
 
         /** File position. */
@@ -58 +76 @@
         /** End-of-file indicator. */
         int eof;
-
-        /** KIO indicator */
-        int kio;
 
         /** Session to the file provider */