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 2010/09/21 19:20:12 UTC
svn commit: r999511 - in /trafficserver/traffic/trunk: iocore/cache/
iocore/hostdb/ proxy/ proxy/api/ts/ proxy/http2/ proxy/http2/remap/
proxy/mgmt2/cli2/ proxy/mgmt2/web2/
Author: zwoop
Date: Tue Sep 21 17:20:12 2010
New Revision: 999511
URL: http://svn.apache.org/viewvc?rev=999511&view=rev
Log:
TS-450 More ICC compiler warnings.
Also fixed a problem with building the http2/remap code outside
of http2 (a previous fix).
Modified:
trafficserver/traffic/trunk/iocore/cache/Cache.cc
trafficserver/traffic/trunk/iocore/cache/P_CacheInternal.h
trafficserver/traffic/trunk/iocore/hostdb/I_HostDBProcessor.h
trafficserver/traffic/trunk/proxy/Makefile.am
trafficserver/traffic/trunk/proxy/api/ts/ts.h
trafficserver/traffic/trunk/proxy/http2/Makefile.am
trafficserver/traffic/trunk/proxy/http2/remap/RemapPlugins.cc
trafficserver/traffic/trunk/proxy/http2/remap/UrlRewrite.cc
trafficserver/traffic/trunk/proxy/mgmt2/cli2/ConfigCmd.h
trafficserver/traffic/trunk/proxy/mgmt2/web2/WebConfigRender.cc
Modified: trafficserver/traffic/trunk/iocore/cache/Cache.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/iocore/cache/Cache.cc?rev=999511&r1=999510&r2=999511&view=diff
==============================================================================
--- trafficserver/traffic/trunk/iocore/cache/Cache.cc (original)
+++ trafficserver/traffic/trunk/iocore/cache/Cache.cc Tue Sep 21 17:20:12 2010
@@ -875,8 +875,8 @@ Part::db_check(bool fix)
(void) fix;
char tt[256];
printf(" Data for [%s]\n", hash_id);
- printf(" Length: %lld\n", (uint64)len);
- printf(" Write Position: %lld\n", (uint64) (header->write_pos - skip));
+ printf(" Length: %llu\n", (uint64)len);
+ printf(" Write Position: %llu\n", (uint64) (header->write_pos - skip));
printf(" Phase: %d\n", (int)!!header->phase);
ink_ctime_r(&header->create_time, tt);
tt[strlen(tt) - 1] = 0;
@@ -982,7 +982,7 @@ Part::init(char *s, off_t blocks, off_t
hash_id = (char *) malloc(hash_id_size);
ink_strncpy(hash_id, s, hash_id_size);
const size_t s_size = strlen(s);
- snprintf(hash_id + s_size, (hash_id_size - s_size), " %lld:%lld",
+ snprintf(hash_id + s_size, (hash_id_size - s_size), " %llu:%llu",
(uint64)dir_skip, (uint64)blocks);
hash_id_md5.encodeBuffer(hash_id, strlen(hash_id));
len = blocks * STORE_BLOCK_SIZE;
Modified: trafficserver/traffic/trunk/iocore/cache/P_CacheInternal.h
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/iocore/cache/P_CacheInternal.h?rev=999511&r1=999510&r2=999511&view=diff
==============================================================================
--- trafficserver/traffic/trunk/iocore/cache/P_CacheInternal.h (original)
+++ trafficserver/traffic/trunk/iocore/cache/P_CacheInternal.h Tue Sep 21 17:20:12 2010
@@ -682,6 +682,7 @@ CacheVC::die()
TS_INLINE int
CacheVC::handleWriteLock(int event, Event *e)
{
+ NOWARN_UNUSED(event);
cancel_trigger();
int ret = 0;
{
Modified: trafficserver/traffic/trunk/iocore/hostdb/I_HostDBProcessor.h
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/iocore/hostdb/I_HostDBProcessor.h?rev=999511&r1=999510&r2=999511&view=diff
==============================================================================
--- trafficserver/traffic/trunk/iocore/hostdb/I_HostDBProcessor.h (original)
+++ trafficserver/traffic/trunk/iocore/hostdb/I_HostDBProcessor.h Tue Sep 21 17:20:12 2010
@@ -431,7 +431,7 @@ struct HostDBProcessor: public Processor
HOSTDB_ROUND_ROBIN = 0,
HOSTDB_FORCE_DNS_RELOAD = 1,
HOSTDB_FORCE_DNS_ALWAYS = 2,
- HOSTDB_DO_NOT_ROUND_ROBIN = 4,
+ HOSTDB_DO_NOT_ROUND_ROBIN = 4
};
inkcoreapi Action *getbyname_re(Continuation * cont, char *hostname, int len = 0,
Modified: trafficserver/traffic/trunk/proxy/Makefile.am
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/Makefile.am?rev=999511&r1=999510&r2=999511&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/Makefile.am (original)
+++ trafficserver/traffic/trunk/proxy/Makefile.am Tue Sep 21 17:20:12 2010
@@ -212,6 +212,7 @@ traffic_logcat_LDADD = \
InkIOCoreAPI.o \
InkXml.o \
http2/libhttp.a \
+ http2/remap/libhttp_remap.a \
logging/liblogging.a \
stats/libstats.a \
hdrs/libhdrs.a \
@@ -274,6 +275,7 @@ traffic_logstats_LDADD = \
InkIOCoreAPI.o \
InkXml.o \
http2/libhttp.a \
+ http2/remap/libhttp_remap.a \
logging/liblogging.a \
stats/libstats.a \
hdrs/libhdrs.a \
@@ -337,6 +339,7 @@ traffic_sac_LDADD = \
InkIOCoreAPI.o \
InkXml.o \
http2/libhttp.a \
+ http2/remap/libhttp_remap.a \
congest/libCongestionControl.a \
logging/liblogging.a \
stats/libstats.a \
Modified: trafficserver/traffic/trunk/proxy/api/ts/ts.h
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/api/ts/ts.h?rev=999511&r1=999510&r2=999511&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/api/ts/ts.h (original)
+++ trafficserver/traffic/trunk/proxy/api/ts/ts.h Tue Sep 21 17:20:12 2010
@@ -322,7 +322,7 @@ extern "C"
/* EVENTS 60200 - 60202 for internal use */
INK_EVENT_INTERNAL_60200 = 60200,
INK_EVENT_INTERNAL_60201 = 60201,
- INK_EVENT_INTERNAL_60202 = 60202,
+ INK_EVENT_INTERNAL_60202 = 60202
} INKEvent;
typedef enum
Modified: trafficserver/traffic/trunk/proxy/http2/Makefile.am
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/http2/Makefile.am?rev=999511&r1=999510&r2=999511&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/http2/Makefile.am (original)
+++ trafficserver/traffic/trunk/proxy/http2/Makefile.am Tue Sep 21 17:20:12 2010
@@ -71,22 +71,4 @@ libhttp_a_SOURCES = \
HttpTunnel.h \
HttpUpdateSM.cc \
HttpUpdateSM.h \
- HttpUpdateTester.cc \
- remap/AclFiltering.cc \
- remap/AclFiltering.h \
- remap/RemapPluginInfo.cc \
- remap/RemapPluginInfo.h \
- remap/RemapPlugins.cc \
- remap/RemapPlugins.h \
- remap/RemapProcessor.cc \
- remap/RemapProcessor.h \
- remap/StringHash.cc \
- remap/StringHash.h \
- remap/UrlMapping.cc \
- remap/UrlMapping.h \
- remap/UrlRewrite.cc \
- remap/UrlRewrite.h \
- remap/Trie.h \
- remap/UrlMappingPathIndex.h \
- remap/UrlMappingPathIndex.cc
-
+ HttpUpdateTester.cc
Modified: trafficserver/traffic/trunk/proxy/http2/remap/RemapPlugins.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/http2/remap/RemapPlugins.cc?rev=999511&r1=999510&r2=999511&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/http2/remap/RemapPlugins.cc (original)
+++ trafficserver/traffic/trunk/proxy/http2/remap/RemapPlugins.cc Tue Sep 21 17:20:12 2010
@@ -227,7 +227,6 @@ RemapPlugins::run_single_remap()
int requestPathLen;
url_mapping *map = _map_container->getMapping();
URL *map_from = &(map->fromURL);
- const char *fromPath;
int fromPathLen;
URL *map_to = _map_container->getToURL();
@@ -236,7 +235,6 @@ RemapPlugins::run_single_remap()
int toPathLen;
int toHostLen;
int redirect_host_len;
- const char *redirect_host;
// Debugging vars
bool debug_on = false;
@@ -257,9 +255,9 @@ RemapPlugins::run_single_remap()
// after the first plugin has run, we need to use these in order to "chain" them and previous changes are all in _request_url,
// in case we need to copy values from previous plugin or from the remap rule.
if (_cur == 0) {
- fromPath = map_from->path_get(&fromPathLen);
+ map_from->path_get(&fromPathLen);
} else {
- fromPath = _request_url->path_get(&fromPathLen);
+ _request_url->path_get(&fromPathLen);
}
debug_on = is_debug_tag_set("url_rewrite");
@@ -426,7 +424,7 @@ RemapPlugins::run_single_remap()
}
// If request came in without a host, send back
// the redirect with the name the proxy is known by
- if ((redirect_host = redirect_url.host_get(&redirect_host_len)) == NULL)
+ if (redirect_url.host_get(&redirect_host_len) == NULL)
redirect_url.host_set(rewrite_table->ts_name, strlen(rewrite_table->ts_name));
if ((_s->remap_redirect = redirect_url.string_get(NULL)) != NULL)
Modified: trafficserver/traffic/trunk/proxy/http2/remap/UrlRewrite.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/http2/remap/UrlRewrite.cc?rev=999511&r1=999510&r2=999511&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/http2/remap/UrlRewrite.cc (original)
+++ trafficserver/traffic/trunk/proxy/http2/remap/UrlRewrite.cc Tue Sep 21 17:20:12 2010
@@ -780,11 +780,9 @@ UrlRewrite::DoRemap(HttpTransact::State
const char *requestPath;
int requestPathLen;
- int requestPort;
url_mapping *mapPtr = mapping_container.getMapping();
URL *map_from = &mapPtr->fromURL;
- const char *fromPath;
int fromPathLen;
URL *map_to = mapping_container.getToURL();
@@ -794,7 +792,6 @@ UrlRewrite::DoRemap(HttpTransact::State
int toHostLen;
int redirect_host_len;
- const char *redirect_host;
// Debugging vars
bool debug_on = false;
@@ -808,9 +805,7 @@ UrlRewrite::DoRemap(HttpTransact::State
}
requestPath = request_url->path_get(&requestPathLen);
- requestPort = request_url->port_get();
-
- fromPath = map_from->path_get(&fromPathLen);
+ map_from->path_get(&fromPathLen);
toHost = map_to->host_get(&toHostLen);
toPath = map_to->path_get(&toPathLen);
@@ -926,7 +921,7 @@ UrlRewrite::DoRemap(HttpTransact::State
}
// If request came in without a host, send back
// the redirect with the name the proxy is known by
- if ((redirect_host = redirect_url.host_get(&redirect_host_len)) == NULL)
+ if (redirect_url.host_get(&redirect_host_len) == NULL)
redirect_url.host_set(ts_name, strlen(ts_name));
if ((*redirect = redirect_url.string_get(NULL)) != NULL)
Modified: trafficserver/traffic/trunk/proxy/mgmt2/cli2/ConfigCmd.h
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/mgmt2/cli2/ConfigCmd.h?rev=999511&r1=999510&r2=999511&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/mgmt2/cli2/ConfigCmd.h (original)
+++ trafficserver/traffic/trunk/proxy/mgmt2/cli2/ConfigCmd.h Tue Sep 21 17:20:12 2010
@@ -262,7 +262,7 @@ typedef enum
CMD_CONFIG_ALARM_RESOLVE_NAME,
CMD_CONFIG_ALARM_RESOLVE_NUMBER,
CMD_CONFIG_ALARM_RESOLVE_ALL,
- CMD_CONFIG_ALARM_NOTIFY,
+ CMD_CONFIG_ALARM_NOTIFY
} cliConfigCommand;
typedef struct DateTime
Modified: trafficserver/traffic/trunk/proxy/mgmt2/web2/WebConfigRender.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/mgmt2/web2/WebConfigRender.cc?rev=999511&r1=999510&r2=999511&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/mgmt2/web2/WebConfigRender.cc (original)
+++ trafficserver/traffic/trunk/proxy/mgmt2/web2/WebConfigRender.cc Tue Sep 21 17:20:12 2010
@@ -4876,6 +4876,7 @@ convert_remap_ele_to_html_format(INKRema
char *from_scheme, char *from_port, char *from_path,
char *to_scheme, char *to_port, char *to_path, char *mixt)
{
+ NOWARN_UNUSED(mixt);
// rule type
switch (ele->cfg_ele.type) {
case INK_REMAP_MAP:
@@ -5189,6 +5190,7 @@ convert_pdss_to_html_format(INKPdSsForma
char *src_ip,
char *prefix, char *suffix, char *port, char *method, char *scheme, char *mixt)
{
+ NOWARN_UNUSED(mixt);
char minA[3];
char minB[3];