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 | |
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')
-rw-r--r-- | lib/pipe-filter-aux.c | 43 | ||||
-rw-r--r-- | lib/pipe-filter-aux.h | 14 | ||||
-rw-r--r-- | lib/pipe-filter-gi.c | 14 |
3 files changed, 60 insertions, 11 deletions
diff --git a/lib/pipe-filter-aux.c b/lib/pipe-filter-aux.c new file mode 100644 index 0000000000..68c4a4ffb7 --- /dev/null +++ b/lib/pipe-filter-aux.c @@ -0,0 +1,43 @@ +/* Auxiliary code for filtering of data through a subprocess. + Copyright (C) 2012 Free Software Foundation, Inc. + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see <http://www.gnu.org/licenses/>. */ + +#include <config.h> + +#define PIPE_FILTER_AUX_INLINE _GL_EXTERN_INLINE + +#include "pipe-filter.h" + +#include <errno.h> +#include <fcntl.h> +#include <stdbool.h> +#include <stdint.h> +#include <stdlib.h> +#include <unistd.h> +#if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__ +# include <windows.h> +#else +# include <signal.h> +# include <sys/select.h> +#endif + +#include "error.h" +#include "spawn-pipe.h" +#include "wait-process.h" +#include "gettext.h" + +#define _(str) gettext (str) + +#include "pipe-filter-aux.h" diff --git a/lib/pipe-filter-aux.h b/lib/pipe-filter-aux.h index 38fa164ba6..713c1a0088 100644 --- a/lib/pipe-filter-aux.h +++ b/lib/pipe-filter-aux.h @@ -15,6 +15,10 @@ You should have received a copy of the GNU General Public License along with this program. If not, see <http://www.gnu.org/licenses/>. */ +_GL_INLINE_HEADER_BEGIN +#ifndef PIPE_FILTER_AUX_INLINE +# define PIPE_FILTER_AUX_INLINE _GL_INLINE +#endif #ifndef SSIZE_MAX # define SSIZE_MAX ((ssize_t) (SIZE_MAX / 2)) @@ -39,7 +43,7 @@ These functions can return -1/EINTR even though we don't have any signal handlers set up, namely when we get interrupted via SIGSTOP. */ -static inline int +PIPE_FILTER_AUX_INLINE int nonintr_close (int fd) { int retval; @@ -53,7 +57,7 @@ nonintr_close (int fd) #undef close /* avoid warning related to gnulib module unistd */ #define close nonintr_close -static inline ssize_t +PIPE_FILTER_AUX_INLINE ssize_t nonintr_read (int fd, void *buf, size_t count) { ssize_t retval; @@ -66,7 +70,7 @@ nonintr_read (int fd, void *buf, size_t count) } #define read nonintr_read -static inline ssize_t +PIPE_FILTER_AUX_INLINE ssize_t nonintr_write (int fd, const void *buf, size_t count) { ssize_t retval; @@ -82,7 +86,7 @@ nonintr_write (int fd, const void *buf, size_t count) # if HAVE_SELECT -static inline int +PIPE_FILTER_AUX_INLINE int nonintr_select (int n, fd_set *readfds, fd_set *writefds, fd_set *exceptfds, struct timeval *timeout) { @@ -111,3 +115,5 @@ nonintr_select (int n, fd_set *readfds, fd_set *writefds, fd_set *exceptfds, # define IS_EAGAIN(errcode) ((errcode) == EAGAIN) # endif #endif + +_GL_INLINE_HEADER_END 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) |