Repository: trafficserver Updated Branches: refs/heads/master bde10b778 -> de1bcc7a6
TS-2957: fix linux build warnings Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/de1bcc7a Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/de1bcc7a Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/de1bcc7a Branch: refs/heads/master Commit: de1bcc7a666f7e690b07e47ac5e7c468b2dc853e Parents: bde10b7 Author: James Peach <[email protected]> Authored: Wed Jul 30 11:05:31 2014 -0700 Committer: James Peach <[email protected]> Committed: Wed Jul 30 11:05:31 2014 -0700 ---------------------------------------------------------------------- plugins/experimental/sslheaders/expand.cc | 2 +- plugins/experimental/sslheaders/sslheaders.cc | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/trafficserver/blob/de1bcc7a/plugins/experimental/sslheaders/expand.cc ---------------------------------------------------------------------- diff --git a/plugins/experimental/sslheaders/expand.cc b/plugins/experimental/sslheaders/expand.cc index caaefb9..483121a 100644 --- a/plugins/experimental/sslheaders/expand.cc +++ b/plugins/experimental/sslheaders/expand.cc @@ -115,7 +115,7 @@ bool SslHdrExpandX509Field(BIO * bio, X509 * x509, ExpansionField field) { // Rewind the BIO. - BIO_reset(bio); + (void)BIO_reset(bio); if (field < countof(expansions)) { expansions[field](x509, bio); http://git-wip-us.apache.org/repos/asf/trafficserver/blob/de1bcc7a/plugins/experimental/sslheaders/sslheaders.cc ---------------------------------------------------------------------- diff --git a/plugins/experimental/sslheaders/sslheaders.cc b/plugins/experimental/sslheaders/sslheaders.cc index 0380e52..09db31c 100644 --- a/plugins/experimental/sslheaders/sslheaders.cc +++ b/plugins/experimental/sslheaders/sslheaders.cc @@ -21,6 +21,8 @@ #include <openssl/ssl.h> #include <openssl/x509.h> +#include <memory> + static void SslHdrExpand(SSL *, const SslHdrInstance::expansion_list&, TSMBuffer, TSMLoc); static int @@ -273,7 +275,7 @@ TSRemapDeleteInstance(void * instance) } TSRemapStatus -TSRemapDoRemap(void * instance, TSHttpTxn txn, TSRemapRequestInfo * rri) +TSRemapDoRemap(void * instance, TSHttpTxn txn, TSRemapRequestInfo * /* rri */) { SslHdrInstance * hdr = (SslHdrInstance *)instance;
