diff options
| author | Michael Biebl <biebl@debian.org> | 2012-11-16 17:43:42 +0100 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2012-11-16 17:43:42 +0100 |
| commit | c1989fc95eb9581e78d4329404ed4b6b4d091288 (patch) | |
| tree | 2b124c87e02684b4f81cb2a275b466308587147e /plugins/imfile/imfile.c | |
| parent | 81a8fb3b4f10dd9a73b9d1bd7f629a2febed7ad2 (diff) | |
| parent | 792f31fe29bef0c9960d3951f266fc7b2c70a2fc (diff) | |
| download | rsyslog-c1989fc95eb9581e78d4329404ed4b6b4d091288.tar.gz | |
Merge tag 'upstream/7.2.2' into experimental
Upstream version 7.2.2
Diffstat (limited to 'plugins/imfile/imfile.c')
| -rw-r--r-- | plugins/imfile/imfile.c | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/plugins/imfile/imfile.c b/plugins/imfile/imfile.c index 453b6b0..188d692 100644 --- a/plugins/imfile/imfile.c +++ b/plugins/imfile/imfile.c @@ -308,14 +308,6 @@ finalize_it: /* submit everything that was not yet submitted */ CHKiRet(multiSubmitMsg(&pThis->multiSub)); } - ; /*EMPTY STATEMENT - needed to keep compiler happy - see below! */ - /* Note: the problem above is that pthread:cleanup_pop() is a macro which - * evaluates to something like "} while(0);". So the code would become - * "finalize_it: }", that is a label without a statement. The C standard does - * not permit this. So we add an empty statement "finalize_it: ; }" and - * everybody is happy. Note that without the ;, an error is reported only - * on some platforms/compiler versions. -- rgerhards, 2008-08-15 - */ pthread_cleanup_pop(0); if(pCStr != NULL) { |