fix build with clang6

This commit is contained in:
jasper 2018-04-08 19:35:24 +00:00
parent 29f17d7e94
commit 7a13abcdec
2 changed files with 56 additions and 0 deletions

View File

@ -0,0 +1,36 @@
$OpenBSD: patch-src_slowhttptest_cc,v 1.1 2018/04/08 19:35:24 jasper Exp $
error: invalid suffix on literal; C++11 requires a space between literal and identifier
Index: src/slowhttptest.cc
--- src/slowhttptest.cc.orig
+++ src/slowhttptest.cc
@@ -560,20 +560,20 @@ void SlowHTTPTest::report_status(bool to_stats) {
!is_dosed_ * num_connections_);
}
} else {
- slowlog(LOG_INFO, cLGN"\nslow HTTP test status on "cGRN"%d"cLGN"th second:\n\n"
- cLGN"initializing:" cLGN" %d\n"
- cLGN"pending: " cLGN" %d\n"
- cLGN"connected: " cLGN" %d\n"
- cLGN"error: " cLGN" %d\n"
- cLGN"closed: " cLGN" %d\n"
- cLGN"service available:"cLGN" %s\n"cRST,
+ slowlog(LOG_INFO, cLGN "\nslow HTTP test status on " cGRN "%d" cLGN "th second:\n\n"
+ cLGN "initializing:" cLGN " %d\n"
+ cLGN "pending: " cLGN " %d\n"
+ cLGN "connected: " cLGN " %d\n"
+ cLGN "error: " cLGN " %d\n"
+ cLGN "closed: " cLGN " %d\n"
+ cLGN "service available:" cLGN " %s\n" cRST,
seconds_passed_,
initializing_,
connecting_,
connected_,
errored_,
closed_,
- is_dosed_ ? cLRD"NO"cRST: cLGN"YES"cRST);
+ is_dosed_ ? cLRD "NO" cRST: cLGN "YES" cRST);
}
}

View File

@ -0,0 +1,20 @@
$OpenBSD: patch-src_slowhttptestmain_cc,v 1.1 2018/04/08 19:35:24 jasper Exp $
error: invalid suffix on literal; C++11 requires a space between literal and identifier
Index: src/slowhttptestmain.cc
--- src/slowhttptestmain.cc.orig
+++ src/slowhttptestmain.cc
@@ -44,10 +44,10 @@ static void info() {
}
static void usage() {
printf(
- "\n"PACKAGE", a tool to test for slow HTTP "
+ "\n" PACKAGE ", a tool to test for slow HTTP "
"DoS vulnerabilities - version " VERSION "\n"
"Usage: "
- PACKAGE" [options ...]"
+ PACKAGE " [options ...]"
"\n"
"Test modes:\n"
" -H slow headers a.k.a. Slowloris (default)\n"