Author: zwoop
Date: Mon Oct 11 19:12:21 2010
New Revision: 1021469
URL: http://svn.apache.org/viewvc?rev=1021469&view=rev
Log:
Fix some ICC compiler warnings, tested with ICC, clang and gcc
Modified:
trafficserver/traffic/trunk/iocore/cluster/ClusterHandlerBase.cc
trafficserver/traffic/trunk/iocore/hostdb/HostDB.cc
trafficserver/traffic/trunk/iocore/net/UnixNetPages.cc
trafficserver/traffic/trunk/iocore/utils/Machine.cc
trafficserver/traffic/trunk/proxy/CoreUtils.cc
trafficserver/traffic/trunk/proxy/ParentSelection.cc
trafficserver/traffic/trunk/proxy/hdrs/HdrToken.cc
trafficserver/traffic/trunk/proxy/http2/remap/UrlRewrite.cc
trafficserver/traffic/trunk/proxy/mgmt2/LocalManager.cc
Modified: trafficserver/traffic/trunk/iocore/cluster/ClusterHandlerBase.cc
URL:
http://svn.apache.org/viewvc/trafficserver/traffic/trunk/iocore/cluster/ClusterHandlerBase.cc?rev=1021469&r1=1021468&r2=1021469&view=diff
==============================================================================
--- trafficserver/traffic/trunk/iocore/cluster/ClusterHandlerBase.cc (original)
+++ trafficserver/traffic/trunk/iocore/cluster/ClusterHandlerBase.cc Mon Oct 11
19:12:21 2010
@@ -769,7 +769,7 @@ ClusterHandler::machine_down()
#ifdef NON_MODULAR
machine_offline_APIcallout(ip);
#endif
- snprintf(textbuf, sizeof(textbuf), "%u.%u.%u.%u:%d", DOT_SEPARATED(ip),
port);
+ snprintf(textbuf, sizeof(textbuf), "%hhu.%hhu.%hhu.%hhu:%d",
DOT_SEPARATED(ip), port);
REC_SignalManager(REC_SIGNAL_MACHINE_DOWN, textbuf);
if (net_vc) {
net_vc->do_io(VIO::CLOSE);
@@ -789,7 +789,7 @@ ClusterHandler::machine_down()
MUTEX_UNTAKE_LOCK(the_cluster_config_mutex, this_ethread());
MachineList *cc = the_cluster_config();
if (cc && cc->find(ip, port) && connector) {
- Debug(CL_NOTE, "cluster connect retry for %u.%u.%u.%u", DOT_SEPARATED(ip));
+ Debug(CL_NOTE, "cluster connect retry for %hhu.%hhu.%hhu.%hhu",
DOT_SEPARATED(ip));
clusterProcessor.connect(ip, port);
}
return zombify(); // defer deletion of *this
@@ -1069,13 +1069,13 @@ ClusterHandler::startClusterEvent(int ev
machine_online_APIcallout(ip);
#endif
// Signal the manager
- snprintf(textbuf, sizeof(textbuf), "%u.%u.%u.%u:%d",
DOT_SEPARATED(ip), port);
+ snprintf(textbuf, sizeof(textbuf), "%hhu.%hhu.%hhu.%hhu:%d",
DOT_SEPARATED(ip), port);
REC_SignalManager(REC_SIGNAL_MACHINE_UP, textbuf);
#ifdef LOCAL_CLUSTER_TEST_MODE
- Note("machine up %u.%u.%u.%u:%d, protocol version=%d.%d",
+ Note("machine up %hhu.%hhu.%hhu.%hhu:%d, protocol version=%d.%d",
DOT_SEPARATED(ip), port, clusteringVersion._major,
clusteringVersion._minor);
#else
- Note("machine up %u.%u.%u.%u, protocol version=%d.%d",
+ Note("machine up %hhu.%hhu.%hhu.%hhu, protocol version=%d.%d",
DOT_SEPARATED(ip), clusteringVersion._major,
clusteringVersion._minor);
#endif
thread = e->ethread;
@@ -1337,7 +1337,7 @@ ClusterHandler::dump_internal_data()
char *b = message_blk->data->data();
unsigned int b_size = message_blk->data->block_size();
- r = snprintf(&b[n], b_size - n, "Host: %u.%u.%u.%u\n", DOT_SEPARATED(ip));
+ r = snprintf(&b[n], b_size - n, "Host: %hhu.%hhu.%hhu.%hhu\n",
DOT_SEPARATED(ip));
n += r;
r = snprintf(&b[n], b_size - n,
@@ -1391,7 +1391,7 @@ ClusterHandler::dump_write_msg(int res)
*(uint32 *) & x = (uint32) net_vc->get_remote_addr().sin_addr.s_addr;
fprintf(stderr,
- "[W] %u.%u.%u.%u SeqNo=%u, Cnt=%d, CntlCnt=%d Todo=%d, Res=%d\n",
+ "[W] %hhu.%hhu.%hhu.%hhu SeqNo=%u, Cnt=%d, CntlCnt=%d Todo=%d,
Res=%d\n",
x[0], x[1], x[2], x[3], write.sequence_number, write.msg.count,
write.msg.control_bytes, write.to_do, res);
for (int i = 0; i < write.msg.count; ++i) {
fprintf(stderr, " d[%i] Type=%d, Chan=%d, SeqNo=%d, Len=%u\n",
@@ -1409,7 +1409,7 @@ ClusterHandler::dump_read_msg()
memset(x, 0, sizeof(x));
*(uint32 *) & x = (uint32) net_vc->get_remote_addr().sin_addr.s_addr;
- fprintf(stderr, "[R] %u.%u.%u.%u SeqNo=%u, Cnt=%d, CntlCnt=%d\n",
+ fprintf(stderr, "[R] %hhu.%hhu.%hhu.%hhu SeqNo=%u, Cnt=%d, CntlCnt=%d\n",
x[0], x[1], x[2], x[3], read.sequence_number, read.msg.count,
read.msg.control_bytes);
for (int i = 0; i < read.msg.count; ++i) {
fprintf(stderr, " d[%i] Type=%d, Chan=%d, SeqNo=%d, Len=%u\n",
Modified: trafficserver/traffic/trunk/iocore/hostdb/HostDB.cc
URL:
http://svn.apache.org/viewvc/trafficserver/traffic/trunk/iocore/hostdb/HostDB.cc?rev=1021469&r1=1021468&r2=1021469&view=diff
==============================================================================
--- trafficserver/traffic/trunk/iocore/hostdb/HostDB.cc (original)
+++ trafficserver/traffic/trunk/iocore/hostdb/HostDB.cc Mon Oct 11 19:12:21 2010
@@ -1059,9 +1059,9 @@ remove_round_robin(HostDBInfo * r, char
unsigned int rr_ip = rr->info[n].ip();
unsigned char *pip = (unsigned char *) &rr_ip;
#ifdef __alpha
- int nbytes = sprintf(p, "%hu.%hu.%hu.%hu ", pip[0], pip[1],
pip[2], pip[3]);
+ int nbytes = sprintf(p, "%hhu.%hhu.%hhu.%hhu ", pip[0], pip[1],
pip[2], pip[3]);
#else
- int nbytes = snprintf(p, bufsize, "%u.%u.%u.%u ", pip[0],
pip[1], pip[2], pip[3]);
+ int nbytes = snprintf(p, bufsize, "%hhu.%hhu.%hhu.%hhu ",
pip[0], pip[1], pip[2], pip[3]);
#endif
p += nbytes;
bufsize -= nbytes;
Modified: trafficserver/traffic/trunk/iocore/net/UnixNetPages.cc
URL:
http://svn.apache.org/viewvc/trafficserver/traffic/trunk/iocore/net/UnixNetPages.cc?rev=1021469&r1=1021468&r2=1021469&view=diff
==============================================================================
--- trafficserver/traffic/trunk/iocore/net/UnixNetPages.cc (original)
+++ trafficserver/traffic/trunk/iocore/net/UnixNetPages.cc Mon Oct 11 19:12:21
2010
@@ -68,9 +68,9 @@ struct ShowNet: public ShowCont
if (port && port != vc->port && port != vc->accept_port)
continue;
char ipbuf[80];
- snprintf(ipbuf, sizeof(ipbuf), "%u.%u.%u.%u", PRINT_IP(vc->ip));
+ snprintf(ipbuf, sizeof(ipbuf), "%hhu.%hhu.%hhu.%hhu", PRINT_IP(vc->ip));
char interbuf[80];
- snprintf(interbuf, sizeof(interbuf), "[%s] %u.%u.%u.%u",
vc->options.toString(vc->options.addr_binding),
PRINT_IP(vc->options.local_addr));
+ snprintf(interbuf, sizeof(interbuf), "[%s] %hhu.%hhu.%hhu.%hhu",
vc->options.toString(vc->options.addr_binding),
PRINT_IP(vc->options.local_addr));
CHECK_SHOW(show("<tr>"
// "<td><a href=\"/connection/%d\">%d</a></td>"
"<td>%d</td>" "<td>%s</td>" // ipbuf
Modified: trafficserver/traffic/trunk/iocore/utils/Machine.cc
URL:
http://svn.apache.org/viewvc/trafficserver/traffic/trunk/iocore/utils/Machine.cc?rev=1021469&r1=1021468&r2=1021469&view=diff
==============================================================================
--- trafficserver/traffic/trunk/iocore/utils/Machine.cc (original)
+++ trafficserver/traffic/trunk/iocore/utils/Machine.cc Mon Oct 11 19:12:21 2010
@@ -96,7 +96,7 @@ ip(aip)
*(uint32 *) & x = (uint32) ip;
const size_t ip_string_size = sizeof(char) * 16;
ip_string = (char *) xmalloc(ip_string_size);
- snprintf(ip_string, ip_string_size, "%u.%u.%u.%u", x[0], x[1], x[2], x[3]);
+ snprintf(ip_string, ip_string_size, "%hhu.%hhu.%hhu.%hhu", x[0], x[1],
x[2], x[3]);
}
}
Modified: trafficserver/traffic/trunk/proxy/CoreUtils.cc
URL:
http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/CoreUtils.cc?rev=1021469&r1=1021468&r2=1021469&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/CoreUtils.cc (original)
+++ trafficserver/traffic/trunk/proxy/CoreUtils.cc Mon Oct 11 19:12:21 2010
@@ -1011,7 +1011,7 @@ CoreUtils::process_NetVC(UnixNetVConnect
// Probably not 64-bit safe. /leif
printf("----------- UnixNetVConnection @ 0x%p ----------\n", nvc_test);
- printf(" ip: %u.%u.%u.%u port: %d\n",
+ printf(" ip: %hhu.%hhu.%hhu.%hhu port: %d\n",
((unsigned char *) &loaded_nvc->ip)[0],
((unsigned char *) &loaded_nvc->ip)[1],
((unsigned char *) &loaded_nvc->ip)[2], ((unsigned char *)
&loaded_nvc->ip)[3], loaded_nvc->port);
Modified: trafficserver/traffic/trunk/proxy/ParentSelection.cc
URL:
http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/ParentSelection.cc?rev=1021469&r1=1021468&r2=1021469&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/ParentSelection.cc (original)
+++ trafficserver/traffic/trunk/proxy/ParentSelection.cc Mon Oct 11 19:12:21
2010
@@ -1011,7 +1011,7 @@ setup_socks_servers(ParentRecord * rec_a
Warning("Could not resolve socks server name \"%s\". " "Please correct
it", pr[i].hostname);
ip = (uint8 *) & bad_ip;
}
- snprintf(pr[i].hostname, DOMAIN_NAME_MAX + 1, "%u.%u.%u.%u", ip[0],
ip[1], ip[2], ip[3]);
+ snprintf(pr[i].hostname, DOMAIN_NAME_MAX + 1, "%hhu.%hhu.%hhu.%hhu",
ip[0], ip[1], ip[2], ip[3]);
}
}
Modified: trafficserver/traffic/trunk/proxy/hdrs/HdrToken.cc
URL:
http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/hdrs/HdrToken.cc?rev=1021469&r1=1021468&r2=1021469&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/hdrs/HdrToken.cc (original)
+++ trafficserver/traffic/trunk/proxy/hdrs/HdrToken.cc Mon Oct 11 19:12:21 2010
@@ -431,7 +431,7 @@ hdrtoken_hash_init()
unsigned int slot = hdrtoken_hash(wks, hdrtoken_str_lengths[wks_idx]);
if (hdrtoken_hash_table[slot].wks) {
printf("ERROR: hdrtoken_hash_table[%u] collision: '%s' replacing '%s'\n",
- slot, wks, hdrtoken_hash_table[slot].wks);
+ slot, (const char*)wks, hdrtoken_hash_table[slot].wks);
++num_collisions;
}
hdrtoken_hash_table[slot].wks = (const char *) wks;
Modified: trafficserver/traffic/trunk/proxy/http2/remap/UrlRewrite.cc
URL:
http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/http2/remap/UrlRewrite.cc?rev=1021469&r1=1021468&r2=1021469&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/http2/remap/UrlRewrite.cc (original)
+++ trafficserver/traffic/trunk/proxy/http2/remap/UrlRewrite.cc Mon Oct 11
19:12:21 2010
@@ -1943,7 +1943,7 @@ UrlRewrite::BuildTable()
url_mapping *u_mapping;
for (int i = 0; h->h_addr_list[i] != NULL; i++) {
ipv4_name[0] = '\0';
- int ip_len = snprintf(ipv4_name, sizeof(ipv4_name), "%u.%u.%u.%u",
+ int ip_len = snprintf(ipv4_name, sizeof(ipv4_name),
"%hhu.%hhu.%hhu.%hhu",
(unsigned char) h->h_addr_list[i][0],
(unsigned char) h->h_addr_list[i][1],
(unsigned char) h->h_addr_list[i][2],
@@ -1985,7 +1985,7 @@ UrlRewrite::BuildTable()
for (int i = 0; h->h_addr_list[i] != NULL; i++) {
ipv4_name[0] = '\0';
int ip_len;
- ip_len = snprintf(ipv4_name, sizeof(ipv4_name), "%u.%u.%u.%u",
+ ip_len = snprintf(ipv4_name, sizeof(ipv4_name),
"%hhu.%hhu.%hhu.%hhu",
(unsigned char) h->h_addr_list[i][0],
(unsigned char) h->h_addr_list[i][1],
(unsigned char) h->h_addr_list[i][2], (unsigned
char) h->h_addr_list[i][3]);
@@ -2021,7 +2021,7 @@ UrlRewrite::BuildTable()
for (int i = 0; h->h_addr_list[i] != NULL; i++) {
ipv4_name[0] = '\0';
int ip_len;
- ip_len = snprintf(ipv4_name, sizeof(ipv4_name), "%u.%u.%u.%u",
+ ip_len = snprintf(ipv4_name, sizeof(ipv4_name),
"%hhu.%hhu.%hhu.%hhu",
(unsigned char) h->h_addr_list[i][0],
(unsigned char) h->h_addr_list[i][1],
(unsigned char) h->h_addr_list[i][2], (unsigned
char) h->h_addr_list[i][3]);
Modified: trafficserver/traffic/trunk/proxy/mgmt2/LocalManager.cc
URL:
http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/mgmt2/LocalManager.cc?rev=1021469&r1=1021468&r2=1021469&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/mgmt2/LocalManager.cc (original)
+++ trafficserver/traffic/trunk/proxy/mgmt2/LocalManager.cc Mon Oct 11 19:12:21
2010
@@ -1184,11 +1184,11 @@ LocalManager::startProxy()
// Fill in the rest of the fd's
if (proxy_server_fd[0] != -1) {
snprintf(&real_proxy_options[n], sizeof(real_proxy_options) - n,
- "%d:%s", proxy_server_fd[0], proxy_server_port_attributes[0]);
+ "%d:%s", proxy_server_fd[0],
(char*)proxy_server_port_attributes[0]);
n = strlen(real_proxy_options);
for (i = 1; i<MAX_PROXY_SERVER_PORTS && proxy_server_fd[i]> 0; i++) {
snprintf(&real_proxy_options[n], sizeof(real_proxy_options) - n,
- ",%d:%s", proxy_server_fd[i],
proxy_server_port_attributes[i]);
+ ",%d:%s", proxy_server_fd[i],
(char*)proxy_server_port_attributes[i]);
n = strlen(real_proxy_options);
}
}
