projects
/
musl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
remove unused MIN macro from getdelim source file
[musl]
/
src
/
internal
/
stdio_impl.h
diff --git
a/src/internal/stdio_impl.h
b/src/internal/stdio_impl.h
index
80646f8
..
7cdf729
100644
(file)
--- a/
src/internal/stdio_impl.h
+++ b/
src/internal/stdio_impl.h
@@
-2,28
+2,12
@@
#define _STDIO_IMPL_H
#include <stdio.h>
#define _STDIO_IMPL_H
#include <stdio.h>
-#include <stdlib.h>
-#include <stddef.h>
-#include <stdarg.h>
-#include <string.h>
-#include <inttypes.h>
-#include <wchar.h>
-#include <unistd.h>
-#include <fcntl.h>
-#include <limits.h>
-#include <errno.h>
-#include <termios.h>
-#include <sys/ioctl.h>
-#include <ctype.h>
-#include <sys/wait.h>
-#include <math.h>
-#include <float.h>
-#include <sys/uio.h>
#include "syscall.h"
#include "libc.h"
#define UNGET 8
#include "syscall.h"
#include "libc.h"
#define UNGET 8
+#define FFINALLOCK(f) ((f)->lock>=0 ? __lockfile((f)) : 0)
#define FLOCK(f) int __need_unlock = ((f)->lock>=0 ? __lockfile((f)) : 0)
#define FUNLOCK(f) if (__need_unlock) __unlockfile((f)); else
#define FLOCK(f) int __need_unlock = ((f)->lock>=0 ? __lockfile((f)) : 0)
#define FUNLOCK(f) if (__need_unlock) __unlockfile((f)); else
@@
-33,8
+17,9
@@
#define F_EOF 16
#define F_ERR 32
#define F_SVB 64
#define F_EOF 16
#define F_ERR 32
#define F_SVB 64
+#define F_APP 128
-struct _
_FILE_s
{
+struct _
IO_FILE
{
unsigned flags;
unsigned char *rpos, *rend;
int (*close)(FILE *);
unsigned flags;
unsigned char *rpos, *rend;
int (*close)(FILE *);
@@
-53,14
+38,16
@@
struct __FILE_s {
short dummy3;
signed char mode;
signed char lbf;
short dummy3;
signed char mode;
signed char lbf;
- int lock;
- int waiters;
+
volatile
int lock;
+
volatile
int waiters;
void *cookie;
off_t off;
char *getln_buf;
void *mustbezero_2;
unsigned char *shend;
off_t shlim, shcnt;
void *cookie;
off_t off;
char *getln_buf;
void *mustbezero_2;
unsigned char *shend;
off_t shlim, shcnt;
+ FILE *prev_locked, *next_locked;
+ struct __locale_struct *locale;
};
size_t __stdio_read(FILE *, unsigned char *, size_t);
};
size_t __stdio_read(FILE *, unsigned char *, size_t);
@@
-89,8
+76,9
@@
int __putc_unlocked(int, FILE *);
FILE *__fdopen(int, const char *);
int __fmodeflags(const char *);
FILE *__fdopen(int, const char *);
int __fmodeflags(const char *);
-#define OFLLOCK() LOCK(libc.ofl_lock)
-#define OFLUNLOCK() UNLOCK(libc.ofl_lock)
+FILE *__ofl_add(FILE *f);
+FILE **__ofl_lock(void);
+void __ofl_unlock(void);
#define feof(f) ((f)->flags & F_EOF)
#define ferror(f) ((f)->flags & F_ERR)
#define feof(f) ((f)->flags & F_EOF)
#define ferror(f) ((f)->flags & F_ERR)
@@
-98,7
+86,8
@@
int __fmodeflags(const char *);
#define getc_unlocked(f) \
( ((f)->rpos < (f)->rend) ? *(f)->rpos++ : __uflow((f)) )
#define getc_unlocked(f) \
( ((f)->rpos < (f)->rend) ? *(f)->rpos++ : __uflow((f)) )
-#define putc_unlocked(c, f) ( ((c)!=(f)->lbf && (f)->wpos<(f)->wend) \
+#define putc_unlocked(c, f) \
+ ( ((unsigned char)(c)!=(f)->lbf && (f)->wpos<(f)->wend) \
? *(f)->wpos++ = (c) : __overflow((f),(c)) )
/* Caller-allocated FILE * operations */
? *(f)->wpos++ = (c) : __overflow((f),(c)) )
/* Caller-allocated FILE * operations */