diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2012-11-28 10:19:29 +0100 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2012-11-28 10:19:29 +0100 |
| commit | e581c3d26ef7fc954bd271b348663a9e5e735ea5 (patch) | |
| tree | 3a1ef3a5affd9f99ebdbafa171c26f8a6d15f2bb /plugins/omstdout/omstdout.c | |
| parent | aaeb1945a7b7f8534edc04a03912c7942322fb83 (diff) | |
| parent | f161dfefd2455547847f0355b7a3a87063780a43 (diff) | |
| download | rsyslog-e581c3d26ef7fc954bd271b348663a9e5e735ea5.tar.gz rsyslog-e581c3d26ef7fc954bd271b348663a9e5e735ea5.tar.bz2 rsyslog-e581c3d26ef7fc954bd271b348663a9e5e735ea5.zip | |
Merge branch 'v7-stable'
Conflicts:
doc/imptcp.html
plugins/mmjsonparse/mmjsonparse.c
plugins/mmnormalize/mmnormalize.c
Diffstat (limited to 'plugins/omstdout/omstdout.c')
| -rw-r--r-- | plugins/omstdout/omstdout.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/plugins/omstdout/omstdout.c b/plugins/omstdout/omstdout.c index fb95e951..59f9c8bb 100644 --- a/plugins/omstdout/omstdout.c +++ b/plugins/omstdout/omstdout.c @@ -136,9 +136,13 @@ CODESTARTdoAction toWrite = (char*) ppString[0]; } len = strlen(toWrite); - write(1, toWrite, len); /* 1 is stdout! */ + /* the following if's are just to silence compiler warnings. If someone + * actually intends to use this module in production (why???), this code + * needs to be more solid. -- rgerhards, 2012-11-28 + */ + if(write(1, toWrite, len)) {}; /* 1 is stdout! */ if(pData->bEnsureLFEnding && toWrite[len-1] != '\n') { - write(1, "\n", 1); /* write missing LF */ + if(write(1, "\n", 1)) {}; /* write missing LF */ } ENDdoAction @@ -175,6 +179,7 @@ ENDmodExit BEGINqueryEtryPt CODESTARTqueryEtryPt CODEqueryEtryPt_STD_OMOD_QUERIES +CODEqueryEtryPt_STD_CONF2_CNFNAME_QUERIES ENDqueryEtryPt |