diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2009-04-17 15:19:57 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2009-04-17 15:19:57 +0200 |
| commit | 889a0a1da8b2fb74b04647a345f64fce6c36708f (patch) | |
| tree | 8539b700025b7c97202a5f777cdbb171a1e6ae8b | |
| parent | 09ca443377ec85364160e965920ab6f56a374d88 (diff) | |
| download | rsyslog-889a0a1da8b2fb74b04647a345f64fce6c36708f.tar.gz rsyslog-889a0a1da8b2fb74b04647a345f64fce6c36708f.tar.xz rsyslog-889a0a1da8b2fb74b04647a345f64fce6c36708f.zip | |
some cleanup
... mostly removal of compile-time warnings (thanks to Michael
Biebl for suggesting to look after that)
| -rw-r--r-- | ChangeLog | 2 | ||||
| -rw-r--r-- | plugins/imgssapi/imgssapi.c | 1 | ||||
| -rw-r--r-- | plugins/omgssapi/omgssapi.c | 2 | ||||
| -rw-r--r-- | runtime/nsd_gtls.c | 2 | ||||
| -rw-r--r-- | tools/msggen.c | 2 |
5 files changed, 6 insertions, 3 deletions
@@ -1,4 +1,6 @@ --------------------------------------------------------------------------- +Version 4.3.1 [DEVEL] (rgerhards), 2009-04-?? +--------------------------------------------------------------------------- Version 4.3.0 [DEVEL] (rgerhards), 2009-04-17 - new feature: new output plugin omprog, which permits to start program and feed it (via its stdin) with syslog messages. If the program diff --git a/plugins/imgssapi/imgssapi.c b/plugins/imgssapi/imgssapi.c index debe935e..b9d7dfe3 100644 --- a/plugins/imgssapi/imgssapi.c +++ b/plugins/imgssapi/imgssapi.c @@ -249,7 +249,6 @@ onErrClose(tcps_sess_t *pSess) static rsRetVal doOpenLstnSocks(tcpsrv_t *pSrv) { - int *pRet = NULL; gsssrv_t *pGSrv; DEFiRet; diff --git a/plugins/omgssapi/omgssapi.c b/plugins/omgssapi/omgssapi.c index e0cc8af6..361f657f 100644 --- a/plugins/omgssapi/omgssapi.c +++ b/plugins/omgssapi/omgssapi.c @@ -444,7 +444,7 @@ CODESTARTdoAction /* error! */ dbgprintf("error forwarding via tcp, suspending\n"); pData->eDestState = eDestFORW_SUSP; - iRet = RS_RET_SUSPENDED; + ABORT_FINALIZE(RS_RET_SUSPENDED); } break; } diff --git a/runtime/nsd_gtls.c b/runtime/nsd_gtls.c index 3a79a015..5786e191 100644 --- a/runtime/nsd_gtls.c +++ b/runtime/nsd_gtls.c @@ -82,6 +82,7 @@ static gnutls_certificate_credentials xcred; static gnutls_dh_params dh_params; #ifdef DEBUG +#if 0 /* uncomment, if needed some time again -- DEV Debug only */ /* This defines a log function to be provided to GnuTLS. It hopefully * helps us track down hard to find problems. * rgerhards, 2008-06-20 @@ -90,6 +91,7 @@ static void logFunction(int level, const char *msg) { dbgprintf("GnuTLS log msg, level %d: %s\n", level, msg); } +#endif #endif /* #ifdef DEBUG */ diff --git a/tools/msggen.c b/tools/msggen.c index 7990a3c8..06244c18 100644 --- a/tools/msggen.c +++ b/tools/msggen.c @@ -24,7 +24,7 @@ #include <stdio.h> #include <syslog.h> -int main(int argc, char *argv[]) +int main(int __attribute__((unused)) argc, char __attribute__((unused)) *argv[]) { int i; |