You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by zw...@apache.org on 2012/02/19 02:04:48 UTC
git commit: TS-1115 Fix build for Intel ICC again
Updated Branches:
refs/heads/master c2cd672cf -> 03d858fce
TS-1115 Fix build for Intel ICC again
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/03d858fc
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/03d858fc
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/03d858fc
Branch: refs/heads/master
Commit: 03d858fce9a5a028a61fd976c5062c2bd39956b0
Parents: c2cd672
Author: Leif Hedstrom <zw...@apache.org>
Authored: Sat Feb 18 18:04:36 2012 -0700
Committer: Leif Hedstrom <zw...@apache.org>
Committed: Sat Feb 18 18:04:36 2012 -0700
----------------------------------------------------------------------
proxy/ControlMatcher.cc | 2 +-
proxy/InkAPI.cc | 2 +-
proxy/Makefile.am | 8 +----
proxy/UglyLogStubs.cc | 69 +++++++++++---------------------------
proxy/api/ts/ts.h.in | 2 +-
proxy/logging/LogAccess.cc | 2 +-
6 files changed, 25 insertions(+), 60 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/03d858fc/proxy/ControlMatcher.cc
----------------------------------------------------------------------
diff --git a/proxy/ControlMatcher.cc b/proxy/ControlMatcher.cc
index 0d68911..df7e41b 100644
--- a/proxy/ControlMatcher.cc
+++ b/proxy/ControlMatcher.cc
@@ -423,7 +423,7 @@ template<class Data, class Result> void HostRegexMatcher<Data, Result>::Match(RD
r = pcre_exec(this->re_array[i], NULL, url_str, strlen(url_str), 0, 0, NULL, 0);
if (r != -1) {
Debug("matcher", "%s Matched %s with regex at line %d",
- this->matcher_name, url_str, this->data_array[i].line_num);
+ const_cast<char*>(this->matcher_name), url_str, this->data_array[i].line_num);
this->data_array[i].UpdateMatch(result, rdata);
} else {
// An error has occured
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/03d858fc/proxy/InkAPI.cc
----------------------------------------------------------------------
diff --git a/proxy/InkAPI.cc b/proxy/InkAPI.cc
index 210ffba..89ce991 100644
--- a/proxy/InkAPI.cc
+++ b/proxy/InkAPI.cc
@@ -2337,7 +2337,7 @@ TSStringPercentDecode(const char *str, size_t str_len, char* dst, size_t dst_siz
sdk_assert(sdk_sanity_check_null_ptr((void*)str) == TS_SUCCESS);
sdk_assert(sdk_sanity_check_null_ptr((void*)dst) == TS_SUCCESS);
- if (str_len < 0)
+ if (0 == str_len)
str_len = strlen(str);
// return unescapifyStr(str);
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/03d858fc/proxy/Makefile.am
----------------------------------------------------------------------
diff --git a/proxy/Makefile.am b/proxy/Makefile.am
index 34544af..56fc5bd 100644
--- a/proxy/Makefile.am
+++ b/proxy/Makefile.am
@@ -183,11 +183,6 @@ traffic_logcat_LDADD = \
@LIBEXPAT@ @LIBDEMANGLE@ @LIBMLD@ @LIBEXC@ @LIBICONV@ -lm @LIBPROFILER@ \
@LIBEXECINFO@
-if BUILD_TESTS
- traffic_logcat_LDADD += RegressionSM.o \
- TestHook.o
-endif
-
traffic_logstats_SOURCES = logstats.cc
traffic_logstats_LDFLAGS = @EXTRA_CXX_LDFLAGS@ @LIBTOOL_LINK_FLAGS@
traffic_logstats_LDADD = \
@@ -264,8 +259,7 @@ traffic_sac_LDADD = \
@LIBEXECINFO@
if BUILD_TESTS
- traffic_sac_LDADD += RegressionSM.o \
- TestHook.o
+ traffic_sac_LDADD += RegressionSM.o
endif
libTrafficServerStandalone_a_SOURCES = \
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/03d858fc/proxy/UglyLogStubs.cc
----------------------------------------------------------------------
diff --git a/proxy/UglyLogStubs.cc b/proxy/UglyLogStubs.cc
index 01d9a21..abc7fa4 100644
--- a/proxy/UglyLogStubs.cc
+++ b/proxy/UglyLogStubs.cc
@@ -37,12 +37,7 @@
#include "P_Net.h"
-int cache_config_mutex_retry_delay = 2;
-
-DNSConnection::Options const DNSConnection::DEFAULT_OPTIONS;
-
int fds_limit = 8000;
-UDPNetProcessor& udpNet; // = udpNetInternal;
ClassAllocator<UDPPacketInternal> udpPacketAllocator("udpPacketAllocator");
@@ -59,19 +54,6 @@ UDPNetProcessor::FreeBandwidth(Continuation * udpConn)
ink_release_assert(false);
}
-NetProcessor& netProcessor; // = unix_netProcessor;
-
-Action *
-UnixNetProcessor::connect_re_internal(Continuation * cont, sockaddr const* target, NetVCOptions * opt)
-{
- NOWARN_UNUSED(cont);
- NOWARN_UNUSED(target);
- NOWARN_UNUSED(opt);
- ink_release_assert(false);
- return NULL;
-}
-
-
#include "InkAPIInternal.h"
ConfigUpdateCbTable *global_config_cbs = NULL;
@@ -82,16 +64,6 @@ ConfigUpdateCbTable::invoke(const char *name)
ink_release_assert(false);
}
-const char *
-event_int_to_string(int event, int blen, char *buffer)
-{
- NOWARN_UNUSED(event);
- NOWARN_UNUSED(blen);
- NOWARN_UNUSED(buffer);
- ink_release_assert(false);
- return NULL;
-}
-
struct Machine { static Machine* instance(); };
Machine* Machine::instance() {
ink_release_assert(false);
@@ -109,15 +81,6 @@ LogCollationAccept::~LogCollationAccept()
{
}
-//
-//int
-//LogHost::write(LogBuffer * lb)
-//{
-// NOWARN_UNUSED(lb);
-// ink_release_assert(false);
-// return 0;
-//}
-
#include "LogCollationClientSM.h"
LogCollationClientSM::LogCollationClientSM(LogHost * log_host):
Continuation(new_ProxyMutex()),
@@ -151,6 +114,7 @@ LogCollationClientSM::send(LogBuffer * log_buffer)
// TODO: The following was necessary only for Solaris, should examine more.
NetVCOptions const Connection::DEFAULT_OPTIONS;
NetProcessor::AcceptOptions const NetProcessor::DEFAULT_ACCEPT_OPTIONS;
+DNSConnection::Options const DNSConnection::DEFAULT_OPTIONS;
// TODO: This is even uglier, this actually gets called here when "defined".
NetProcessor::AcceptOptions&
@@ -168,19 +132,7 @@ NetProcessor::AcceptOptions::reset()
return *this;
}
-int
-net_accept(NetAccept * na, void *ep, bool blockable)
-{
- NOWARN_UNUSED(na);
- NOWARN_UNUSED(ep);
- NOWARN_UNUSED(blockable);
- ink_release_assert(false);
- return 0;
-}
-
-
// These are for clang / llvm
-
int
CacheVC::handleWrite(int event, Event *e)
{
@@ -189,3 +141,22 @@ CacheVC::handleWrite(int event, Event *e)
return 0;
ink_release_assert(false);
}
+
+
+// For Intel ICC
+int cache_config_mutex_retry_delay = 2;
+
+void
+SplitDNSConfig::reconfigure()
+{
+}
+
+ClassAllocator<CacheRemoveCont> cacheRemoveContAllocator("cacheRemoveCont");
+
+CacheHostTable::CacheHostTable(Cache *c, int typ)
+{
+ NOWARN_UNUSED(c);
+ NOWARN_UNUSED(typ);
+}
+
+CacheHostTable::~CacheHostTable() { }
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/03d858fc/proxy/api/ts/ts.h.in
----------------------------------------------------------------------
diff --git a/proxy/api/ts/ts.h.in b/proxy/api/ts/ts.h.in
index 8af9dce..341290d 100644
--- a/proxy/api/ts/ts.h.in
+++ b/proxy/api/ts/ts.h.in
@@ -1664,7 +1664,7 @@ extern "C"
guaranteed to be no longer than the source string.
@param str the string to decode (and possibly write to).
- @param str_len length of the input string (or -1).
+ @param str_len length of the input string (or 0).
@param dst output buffer (can be the same as src).
@param dst_len size of the output buffer.
@param length amount of data written to the destination buffer.
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/03d858fc/proxy/logging/LogAccess.cc
----------------------------------------------------------------------
diff --git a/proxy/logging/LogAccess.cc b/proxy/logging/LogAccess.cc
index b65cd54..018e2e8 100644
--- a/proxy/logging/LogAccess.cc
+++ b/proxy/logging/LogAccess.cc
@@ -1178,7 +1178,7 @@ LogAccess::unmarshal_ip_to_str(char **buf, char *dest, int len)
ts_ip_endpoint ip;
unmarshal_ip(buf, &ip);
- return ink_inet_ntop(&ip, dest, len) ? ::strlen(dest) : -1;
+ return ink_inet_ntop(&ip, dest, len) ? static_cast<int>(::strlen(dest)) : -1;
}
/*-------------------------------------------------------------------------