diff options
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | src/output.h | 15 |
2 files changed, 17 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog index 216fc51..ade43e9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,6 +2,10 @@ * Optimize dash -c "command" to avoid a fork. +2011-05-22 Jonathan Nieder <jrnieder@gmail.com> + + * Make outc an inline function. + 2011-05-02 Kalle Olavi Niemitalo <kon@iki.fi> * Remove spurious space in descriptions of PS1, PS2, PS4. diff --git a/src/output.h b/src/output.h index d123301..f853e9d 100644 --- a/src/output.h +++ b/src/output.h @@ -97,10 +97,21 @@ freestdout() #define OUTPUT_ERR 01 /* error occurred on output */ #ifdef USE_GLIBC_STDIO -#define outc(c, o) putc((c), (o)->stream) +static inline void outc(int ch, struct output *file) +{ + putc(ch, file->stream); +} #define doformat(d, f, a) vfprintf((d)->stream, (f), (a)) #else -#define outc(c, file) ((file)->nextc == (file)->end ? outcslow((c), (file)) : (*(file)->nextc = (c), (file)->nextc++)) +static inline void outc(int ch, struct output *file) +{ + if (file->nextc == file->end) + outcslow(ch, file); + else { + *file->nextc = ch; + file->nextc++; + } +} #endif #define out1c(c) outc((c), out1) #define out2c(c) outcslow((c), out2) |