Changes in uspace/lib/c/include/stdio.h [4e6a610:55092672] in mainline

File:

• uspace/lib/c/include/stdio.h (modified) (7 diffs)

uspace/lib/c/include/stdio.h

@@ -1 +1 @@
 /*
  * Copyright (c) 2005 Martin Decky
- * Copyright (c) 2018 Jiri Svoboda
  * All rights reserved.
  *
@@ -37 +36 @@
 #define LIBC_STDIO_H_
 
-#include <offset.h>
 #include <stdarg.h>
 #include <io/verify.h>
-#include <_bits/NULL.h>
 #include <_bits/size_t.h>
 #include <_bits/wchar_t.h>
 #include <_bits/wint_t.h>
 
-/** Forward declaration */
-struct _IO_FILE;
-typedef struct _IO_FILE FILE;
-
-/** File position */
-typedef struct {
-        off64_t pos;
-} fpos_t;
-
-#ifndef _HELENOS_SOURCE
-#define _IONBF 0
-#define _IOLBF 1
-#define _IOFBF 2
-#endif
-
-/** Default size for stream I/O buffers */
-#define BUFSIZ  4096
-
 #define EOF  (-1)
-
-/** Max number of files that is guaranteed to be able to open at the same time */
-#define FOPEN_MAX VFS_MAX_OPEN_FILES
-
-/** Recommended size of fixed-size array for holding file names. */
-#define FILENAME_MAX 4096
-
-/** Length of "/tmp/tmp.XXXXXX" + 1 */
-#define L_tmpnam 16
 
 #ifndef SEEK_SET
@@ -86 +56 @@
 #endif
 
-/** Minimum number of unique temporary file names */
-#define TMP_MAX 1000000
+/** Default size for stream I/O buffers */
+#define BUFSIZ  4096
+
+/** Recommended size of fixed-size array for holding file names. */
+#define FILENAME_MAX 4096
+
+/** Forward declaration */
+struct _IO_FILE;
+typedef struct _IO_FILE FILE;
 
 extern FILE *stdin;
@@ -97 +74 @@
 extern int fgetc(FILE *);
 extern char *fgets(char *, int, FILE *);
-extern char *gets(char *, size_t) __attribute__((deprecated));
 
 extern int getchar(void);
@@ -128 +104 @@
 extern int vasprintf(char **, const char *, va_list);
 extern int asprintf(char **, const char *, ...)
+#endif
     _HELENOS_PRINTF_ATTRIBUTE(2, 3);
-#endif
 extern int vsnprintf(char *, size_t, const char *, va_list);
-
-extern int sprintf(char *, const char *, ...)
-    __attribute__((deprecated)) _HELENOS_PRINTF_ATTRIBUTE(2, 3);
-extern int vsprintf(char *, const char *, va_list) __attribute__((deprecated));
 
 /* Formatted input */
@@ -152 +124 @@
 extern size_t fwrite(const void *, size_t, size_t, FILE *);
 
-extern int fgetpos(FILE *, fpos_t *);
-extern int fsetpos(FILE *, const fpos_t *);
-
 extern int fseek(FILE *, long, int);
 extern void rewind(FILE *);
@@ -164 +133 @@
 extern void clearerr(FILE *);
 
-extern void perror(const char *);
-
 extern void setvbuf(FILE *, void *, int, size_t);
 extern void setbuf(FILE *, void *);
 
 /* Misc file functions */
+extern int rename(const char *, const char *);
 extern int remove(const char *);
-extern int rename(const char *, const char *);
 
-extern FILE *tmpfile(void);
-extern char *tmpnam(char *s) __attribute__((deprecated));
+#ifndef _HELENOS_SOURCE
+#define _IONBF 0
+#define _IOLBF 1
+#define _IOFBF 2
+
+extern char *gets(char *, size_t);
+
+#endif
 
 #ifdef _HELENOS_SOURCE