diff options
| -rw-r--r-- | ChangeLog | 11 | ||||
| -rw-r--r-- | catgets/gencat.c | 4 | ||||
| -rw-r--r-- | include/stap-probe.h | 10 | ||||
| -rw-r--r-- | libio/libio.h | 2 |
4 files changed, 20 insertions, 7 deletions
diff --git a/ChangeLog b/ChangeLog index 4279eeedb3..f8210cdb41 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,16 @@ 2019-02-13 Joseph Myers <joseph@codesourcery.com> + * catgets/gencat.c (normalize_line): Use braces around empty + 'else' body. + * include/stap-probe.h [!USE_STAP_PROBE && !__ASSEMBLER__] + (STAP_PROBE0): Use do {} while (0) for do-nothing definition. + [!USE_STAP_PROBE && !__ASSEMBLER__] (STAP_PROBE1): Likewise. + [!USE_STAP_PROBE && !__ASSEMBLER__] (STAP_PROBE2): Likewise. + [!USE_STAP_PROBE && !__ASSEMBLER__] (STAP_PROBE3): Likewise. + [!USE_STAP_PROBE && !__ASSEMBLER__] (STAP_PROBE4): Likewise. + * libio/libio.h (_IO_funlockfile): Use ((void) 0) for do-nothing + definition. + * support/test-container.c (recursive_remove): Use FAIL_EXIT1 if execlp returns. diff --git a/catgets/gencat.c b/catgets/gencat.c index 9d6db7017e..51fd2a724e 100644 --- a/catgets/gencat.c +++ b/catgets/gencat.c @@ -1196,7 +1196,9 @@ normalize_line (const char *fname, size_t line, iconv_t cd, wchar_t *string, ++rp; } else - /* Simply ignore the backslash character. */; + { + /* Simply ignore the backslash character. */ + } break; } } diff --git a/include/stap-probe.h b/include/stap-probe.h index 8c26292edd..85f41c9162 100644 --- a/include/stap-probe.h +++ b/include/stap-probe.h @@ -60,11 +60,11 @@ /* Evaluate all the arguments and verify that N matches their number. */ # define LIBC_PROBE(name, n, ...) STAP_PROBE##n (__VA_ARGS__) -# define STAP_PROBE0() -# define STAP_PROBE1(a1) -# define STAP_PROBE2(a1, a2) -# define STAP_PROBE3(a1, a2, a3) -# define STAP_PROBE4(a1, a2, a3, a4) +# define STAP_PROBE0() do {} while (0) +# define STAP_PROBE1(a1) do {} while (0) +# define STAP_PROBE2(a1, a2) do {} while (0) +# define STAP_PROBE3(a1, a2, a3) do {} while (0) +# define STAP_PROBE4(a1, a2, a3, a4) do {} while (0) # else # define LIBC_PROBE(name, n, ...) /* Nothing. */ diff --git a/libio/libio.h b/libio/libio.h index d21162aab0..9c08c7eba1 100644 --- a/libio/libio.h +++ b/libio/libio.h @@ -240,7 +240,7 @@ extern int _IO_ftrylockfile (FILE *) __THROW; #define _IO_peekc(_fp) _IO_peekc_unlocked (_fp) #define _IO_flockfile(_fp) /**/ -#define _IO_funlockfile(_fp) /**/ +#define _IO_funlockfile(_fp) ((void) 0) #define _IO_ftrylockfile(_fp) /**/ #ifndef _IO_cleanup_region_start #define _IO_cleanup_region_start(_fct, _fp) /**/ |