summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2011-10-17 15:26:11 +0200
committerRainer Gerhards <rgerhards@adiscon.com>2011-10-17 15:26:11 +0200
commit16f06168e10d0315cc5d65516043809edd9d2232 (patch)
tree7d28755836998e5ff6a6a6f7ecea1fd0d9077a22 /tests
parent0c7604dc27119122a3022c7bf094ffb5f8d59e6d (diff)
parentf84c8c4e9637748bd3a6a985bd12afa6b50e9797 (diff)
downloadrsyslog-16f06168e10d0315cc5d65516043809edd9d2232.tar.gz
rsyslog-16f06168e10d0315cc5d65516043809edd9d2232.tar.xz
rsyslog-16f06168e10d0315cc5d65516043809edd9d2232.zip
Merge branch 'v5-stable' into v5-devel
Conflicts: ChangeLog
Diffstat (limited to 'tests')
-rw-r--r--tests/tcpflood.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/tests/tcpflood.c b/tests/tcpflood.c
index 49b1e9e6..8485acbb 100644
--- a/tests/tcpflood.c
+++ b/tests/tcpflood.c
@@ -797,7 +797,7 @@ closeTLSSess(int i)
# else /* NO TLS available */
static void initTLS(void) {}
static void initTLSSess(int __attribute__((unused)) i) {}
-static int sendTLS(int i, char *buf, int lenBuf) { return 0; }
+static int sendTLS(int __attribute__((unused)) i, char __attribute__((unused)) *buf, int __attribute__((unused)) lenBuf) { return 0; }
static void closeTLSSess(int __attribute__((unused)) i) {}
# endif
@@ -889,7 +889,8 @@ int main(int argc, char *argv[])
# if defined(ENABLE_GNUTLS)
transport = TP_TLS;
# else
- fprintf(stderr, "compiled without TLS support!\n", optarg);
+ fprintf(stderr, "compiled without TLS support: "
+ "\"-Ttls\" not supported!\n");
exit(1);
# endif
} else {