diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2012-08-29 22:17:49 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2012-09-22 01:58:24 -0700 |
| commit | 6238e1ae8d96191ee8a580a60ff5287f22f6f04d (patch) | |
| tree | 13a25cfa0e179e9168371ff23ef34ebb675d5fda /lib/pipe-filter-gi.c | |
| parent | 3384ca93a6b2ceaf9529ff25e162a184a6bc8967 (diff) | |
| download | gnulib-6238e1ae8d96191ee8a580a60ff5287f22f6f04d.tar.gz | |
pipe-filter-gi, pipe-filter-ii: better use of 'inline'
* lib/pipe-filter-aux.c: New file.
* lib/pipe-filter-aux.h (PIPE_FILTER_AUX_INLINE): New macro.
Replace all uses of 'static inline' with it.
Use _GL_INLINE_HEADER_BEGIN, _GL_INLINE_HEADER_END.
* lib/pipe-filter-gi.c (filter_init, filter_cleanup)
(filter_retcode): No real need for inline here.
* modules/pipe-filter-gi, modules/pipe-filter-ii:
(Files): Add lib/pipe-filter-aux.c.
(Depends-on): Add extern-inline.
(configure.ac): Do not require AC_C_INLINE.
(lib_SOURCES): Add pipe-filter-aux.c.
Diffstat (limited to 'lib/pipe-filter-gi.c')
| -rw-r--r-- | lib/pipe-filter-gi.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/lib/pipe-filter-gi.c b/lib/pipe-filter-gi.c index c1ccec34fe..8db5d85930 100644 --- a/lib/pipe-filter-gi.c +++ b/lib/pipe-filter-gi.c @@ -81,7 +81,7 @@ struct pipe_filter_gi /* Perform additional initializations. Return 0 if successful, -1 upon failure. */ -static inline int filter_init (struct pipe_filter_gi *filter); +static int filter_init (struct pipe_filter_gi *filter); /* Write count bytes starting at buf, while at the same time invoking the read iterator (the functions prepare_read/done_read) when needed. */ @@ -91,8 +91,8 @@ static void filter_loop (struct pipe_filter_gi *filter, /* Perform cleanup actions at the end. finish_reading is true if there was no error, or false if some error occurred already. */ -static inline void filter_cleanup (struct pipe_filter_gi *filter, - bool finish_reading); +static void filter_cleanup (struct pipe_filter_gi *filter, + bool finish_reading); #if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__ @@ -136,7 +136,7 @@ reader_thread_func (void *thread_arg) abort (); } -static inline int +static int filter_init (struct pipe_filter_gi *filter) { InitializeCriticalSection (&filter->lock); @@ -200,7 +200,7 @@ filter_loop (struct pipe_filter_gi *filter, const char *wbuf, size_t count) } } -static inline void +static void filter_cleanup (struct pipe_filter_gi *filter, bool finish_reading) { if (finish_reading) @@ -218,7 +218,7 @@ filter_cleanup (struct pipe_filter_gi *filter, bool finish_reading) #else /* Unix API. */ -static inline int +static int filter_init (struct pipe_filter_gi *filter) { #if !((defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__) @@ -459,7 +459,7 @@ filter_terminate (struct pipe_filter_gi *filter) Return 0 upon success, or (only if exit_on_error is false): - -1 with errno set upon failure, - the positive exit code of the subprocess if that failed. */ -static inline int +static int filter_retcode (struct pipe_filter_gi *filter) { if (filter->writer_errno != 0) |