summaryrefslogtreecommitdiffstats
path: root/plugins
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2008-08-15 12:21:26 +0200
committerRainer Gerhards <rgerhards@adiscon.com>2008-08-15 12:21:26 +0200
commit3aa86ed554aeb05c386e99d605ddc220250d35d2 (patch)
tree2ca9c573c31af792b3560da3295fee8e443b6b87 /plugins
parentbf3a0f72885e2f171678197271ea6248a8614d98 (diff)
downloadrsyslog-3aa86ed554aeb05c386e99d605ddc220250d35d2.tar.gz
rsyslog-3aa86ed554aeb05c386e99d605ddc220250d35d2.tar.xz
rsyslog-3aa86ed554aeb05c386e99d605ddc220250d35d2.zip
fixed cross-platform compile problem introduced with recent change
...which fixed the imfile segfault issue.
Diffstat (limited to 'plugins')
-rw-r--r--plugins/imfile/imfile.c19
1 files changed, 13 insertions, 6 deletions
diff --git a/plugins/imfile/imfile.c b/plugins/imfile/imfile.c
index 6b7f516e..2df1aaf7 100644
--- a/plugins/imfile/imfile.c
+++ b/plugins/imfile/imfile.c
@@ -183,18 +183,18 @@ static void pollFileCancelCleanup(void *pArg)
static rsRetVal pollFile(fileInfo_t *pThis, int *pbHadFileData)
{
cstr_t *pCStr = NULL;
- int bMustPopCleanup = 0;
DEFiRet;
ASSERT(pbHadFileData != NULL);
+ /* Note: we must do pthread_cleanup_push() immediately, because the POXIS macros
+ * otherwise do not work if I include the _cleanup_pop() inside an if... -- rgerhards, 2008-08-14
+ */
+ pthread_cleanup_push(pollFileCancelCleanup, &pCStr);
if(pThis->pStrm == NULL) {
CHKiRet(openFile(pThis)); /* open file */
}
- pthread_cleanup_push(pollFileCancelCleanup, &pCStr);
- bMustPopCleanup = 1;
-
/* loop below will be exited when strmReadLine() returns EOF */
while(1) {
CHKiRet(strmReadLine(pThis->pStrm, &pCStr));
@@ -204,8 +204,15 @@ static rsRetVal pollFile(fileInfo_t *pThis, int *pbHadFileData)
}
finalize_it:
- if(bMustPopCleanup)
- pthread_cleanup_pop(0);
+ /*EMPTY - just to keep the compiler happy, do NOT remove*/;
+ /* 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) {
rsCStrDestruct(&pCStr);