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/08/04 01:22:56 UTC
svn commit: r982080 - in /trafficserver/traffic/trunk/proxy: ./ logging/
mgmt2/ mgmt2/api2/ mgmt2/web2/
Author: zwoop
Date: Tue Aug 3 23:22:55 2010
New Revision: 982080
URL: http://svn.apache.org/viewvc?rev=982080&view=rev
Log:
TS-400 Checkpoint 13 in cleanup.
Modified:
trafficserver/traffic/trunk/proxy/CoreUtils.cc
trafficserver/traffic/trunk/proxy/FetchSM.h
trafficserver/traffic/trunk/proxy/ICP.cc
trafficserver/traffic/trunk/proxy/ICPConfig.cc
trafficserver/traffic/trunk/proxy/IPAllow.cc
trafficserver/traffic/trunk/proxy/InkAPI.cc
trafficserver/traffic/trunk/proxy/InkIOCoreAPI.cc
trafficserver/traffic/trunk/proxy/Main.cc
trafficserver/traffic/trunk/proxy/ParentSelection.cc
trafficserver/traffic/trunk/proxy/Plugin.cc
trafficserver/traffic/trunk/proxy/PluginVC.cc
trafficserver/traffic/trunk/proxy/Prefetch.cc
trafficserver/traffic/trunk/proxy/Prefetch.h
trafficserver/traffic/trunk/proxy/RegressionSM.cc
trafficserver/traffic/trunk/proxy/ReverseProxy.cc
trafficserver/traffic/trunk/proxy/SocksProxy.cc
trafficserver/traffic/trunk/proxy/StatSystem.cc
trafficserver/traffic/trunk/proxy/StatSystemV2.cc
trafficserver/traffic/trunk/proxy/Transform.cc
trafficserver/traffic/trunk/proxy/Update.cc
trafficserver/traffic/trunk/proxy/logging/LogAccessHttp.cc
trafficserver/traffic/trunk/proxy/logging/LogStandalone.cc
trafficserver/traffic/trunk/proxy/mgmt2/StatAggregation.cc
trafficserver/traffic/trunk/proxy/mgmt2/api2/CoreAPI.cc
trafficserver/traffic/trunk/proxy/mgmt2/web2/WebHttp.cc
trafficserver/traffic/trunk/proxy/signals.cc
Modified: trafficserver/traffic/trunk/proxy/CoreUtils.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/CoreUtils.cc?rev=982080&r1=982079&r2=982080&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/CoreUtils.cc (original)
+++ trafficserver/traffic/trunk/proxy/CoreUtils.cc Tue Aug 3 23:22:55 2010
@@ -1110,7 +1110,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: %hu.%hu.%hu.%hu 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);
@@ -1467,7 +1467,7 @@ process_core(char *fname)
{
Elf32_Ehdr ehdr;
Elf32_Phdr phdr;
- int phoff, phnum, phentsize, phsize;
+ int phoff, phnum, phentsize;
int framep = 0, pc = 0;
/* Open the input file */
@@ -1487,10 +1487,9 @@ process_core(char *fname)
phnum = ehdr.e_phnum;
// size of each program header
phentsize = ehdr.e_phentsize;
- phsize = phnum * phentsize;
- for (int i = 0; i < phnum; i++) {
- if (fseek(fp, ehdr.e_phoff + i * ehdr.e_phentsize, SEEK_SET) == -1) {
+ for (int i = 0; i < phnum; i++) {
+ if (fseek(fp, phoff + i * phentsize, SEEK_SET) == -1) {
fprintf(stderr, "Unable to seek to Phdr %d\n", i);
_exit(1);
}
@@ -1517,15 +1516,15 @@ process_core(char *fname)
if (is_debug_tag_set("phdr")) {
printf("\n******* PHDR %d *******\n", i);
- printf("p_type = %d ", phdr.p_type);
- printf("p_offset = %d ", phdr.p_offset);
+ printf("p_type = %u ", phdr.p_type);
+ printf("p_offset = %u ", phdr.p_offset);
printf("p_vaddr = %#x ", pvaddr);
printf("p_paddr = %#x\n", phdr.p_paddr);
- printf("p_filesz = %d ", phdr.p_filesz);
- printf("p_memsz = %d ", phdr.p_memsz);
- printf("p_flags = %d ", phdr.p_flags);
- printf("p_align = %d\n", phdr.p_align);
+ printf("p_filesz = %u ", phdr.p_filesz);
+ printf("p_memsz = %u ", phdr.p_memsz);
+ printf("p_flags = %u ", phdr.p_flags);
+ printf("p_align = %u\n", phdr.p_align);
}
if (phdr.p_type == PT_NOTE) {
@@ -1547,8 +1546,6 @@ process_core(char *fname)
if (len<0 || len> size) {
_exit(1);
}
- char *name;
- name = (char *) (thdr + 1);
printf("size=%d, len=%d\n", size, len);
prstatus_t pstat;
Modified: trafficserver/traffic/trunk/proxy/FetchSM.h
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/FetchSM.h?rev=982080&r1=982079&r2=982080&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/FetchSM.h (original)
+++ trafficserver/traffic/trunk/proxy/FetchSM.h Tue Aug 3 23:22:55 2010
@@ -36,7 +36,8 @@
#include "P_Net.h"
#include "ts.h"
#include "HttpSM.h"
-class FetchSM:Continuation
+
+class FetchSM: public Continuation
{
public:
FetchSM()
Modified: trafficserver/traffic/trunk/proxy/ICP.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/ICP.cc?rev=982080&r1=982079&r2=982080&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/ICP.cc (original)
+++ trafficserver/traffic/trunk/proxy/ICP.cc Tue Aug 3 23:22:55 2010
@@ -185,6 +185,8 @@ ICPHandlerCont::ICPHandlerCont(ICPProces
int
ICPHandlerCont::TossEvent(int event, Event * e)
{
+ NOWARN_UNUSED(event);
+ NOWARN_UNUSED(e);
return EVENT_DONE;
}
@@ -192,6 +194,7 @@ int
ICPHandlerCont::PeriodicEvent(int event, Event * e)
{
NOWARN_UNUSED(event);
+ NOWARN_UNUSED(e);
int n_peer, valid_peers;
Peer *P;
@@ -726,9 +729,9 @@ ICPPeerReadCont::PeerReadStateMachine(Pe
icp_reply_port));
ParentSiblingPeer *P = NEW(new ParentSiblingPeer(PEER_SIBLING, Pcfg, _ICPpr, true));
status = _ICPpr->AddPeer(P);
- ink_assert(status);
+ ink_release_assert(status);
status = _ICPpr->AddPeerToSendList(P);
- ink_assert(status);
+ ink_release_assert(status);
P->GetChan()->setRemote(P->GetIP()->s_addr, P->GetPort());
@@ -1199,6 +1202,8 @@ ICPRequestCont::ICPRequestEvent(int even
int
ICPRequestCont::NopICPRequestEvent(int event, Event * e)
{
+ NOWARN_UNUSED(event);
+ NOWARN_UNUSED(e);
delete this;
return EVENT_DONE;
}
@@ -2047,9 +2052,9 @@ ICPProcessor::BuildPeerList()
//***************************************************
P = NEW(new ParentSiblingPeer(PEER_LOCAL, Pcfg, this));
status = AddPeer(P);
- ink_assert(status);
+ ink_release_assert(status);
status = AddPeerToRecvList(P);
- ink_assert(status);
+ ink_release_assert(status);
_LocalPeer = P;
for (index = 1; index < MAX_DEFINED_PEERS; ++index) {
@@ -2386,8 +2391,6 @@ _exit_while: // fix DE
void
ICPProcessor::CancelPendingReads()
{
- int status;
-
// Cancel pending ICP read by sending a bogus message to
// the local ICP port.
@@ -2396,7 +2399,8 @@ ICPProcessor::CancelPendingReads()
SET_CONTINUATION_HANDLER(r, (ICPRequestContHandler) & ICPRequestCont::NopICPRequestEvent);
r->mutex = new_ProxyMutex();
- status = ICPRequestCont::BuildICPMsg(ICP_OP_HIT, 0, 0 /* optflags */ , 0 /* optdata */ , 0 /* shostid */ ,
+ // TODO: Check return value?
+ ICPRequestCont::BuildICPMsg(ICP_OP_HIT, 0, 0 /* optflags */ , 0 /* optdata */ , 0 /* shostid */ ,
(void *) 0, 0, &r->_sendMsgHdr, r->_sendMsgIOV, &r->_ICPmsg);
r->_sendMsgHdr.msg_iovlen = 1;
r->_ICPmsg.h.version = ~r->_ICPmsg.h.version; // bogus message
Modified: trafficserver/traffic/trunk/proxy/ICPConfig.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/ICPConfig.cc?rev=982080&r1=982079&r2=982080&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/ICPConfig.cc (original)
+++ trafficserver/traffic/trunk/proxy/ICPConfig.cc Tue Aug 3 23:22:55 2010
@@ -491,6 +491,8 @@ ICPConfiguration::UpdatePeerConfig()
int
ICPConfiguration::mgr_icp_config_change_callback(const char *name, RecDataT data_type, RecData data, void *cookie)
{
+ NOWARN_UNUSED(name);
+ NOWARN_UNUSED(data_type);
//*****************************************************************
// Callout invoked by Configuration management when changes occur
// to icp.config
@@ -572,7 +574,6 @@ ICPConfiguration::icp_config_change_call
int error = 0;
int ln = 0;
- int rlen;
int n_colons;
char line[256];
char *cur;
@@ -586,7 +587,7 @@ ICPConfiguration::icp_config_change_call
//
// Note: ink_file_fd_readline() null terminates returned buffer
//////////////////////////////////////////////////////////////////////
- while ((rlen = ink_file_fd_readline(fd, sizeof(line) - 1, line)) > 0) {
+ while (ink_file_fd_readline(fd, sizeof(line) - 1, line) > 0) {
ln++;
if (*line == '#')
continue;
@@ -779,7 +780,7 @@ ICPConfiguration::icp_config_change_call
if (!error) {
for (int i = 0; i <= MAX_DEFINED_PEERS; i++) {
-#if defined (alpha) || (__alpha)
+#if defined (alpha) || defined(__alpha)
PeerConfigData *p_cur;
p_cur = ICPconfig->_peer_cdata_current[i];
*p_cur = P[i];
@@ -1046,6 +1047,7 @@ Action *
MultiCastPeer::RecvFrom_re(Continuation * cont, void *token,
IOBufferBlock * bufblock, int len, struct sockaddr * from, socklen_t *fromlen)
{
+ NOWARN_UNUSED(bufblock);
Action *a = udpNet.recvfrom_re(cont, token,
_recv_chan.fd, from, fromlen,
buf, len, true, 0);
Modified: trafficserver/traffic/trunk/proxy/IPAllow.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/IPAllow.cc?rev=982080&r1=982079&r2=982080&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/IPAllow.cc (original)
+++ trafficserver/traffic/trunk/proxy/IPAllow.cc Tue Aug 3 23:22:55 2010
@@ -49,7 +49,7 @@ Ptr<ProxyMutex> ip_reconfig_mutex;
//
struct IPAllow_FreerContinuation;
typedef int (IPAllow_FreerContinuation::*IPAllow_FrContHandler) (int, void *);
-struct IPAllow_FreerContinuation:Continuation
+struct IPAllow_FreerContinuation: public Continuation
{
IpAllow *p;
int freeEvent(int event, Event * e)
@@ -72,7 +72,7 @@ struct IPAllow_FreerContinuation:Continu
// Used to read the ip_allow.conf file after the manager signals
// a change
//
-struct IPAllow_UpdateContinuation:Continuation
+struct IPAllow_UpdateContinuation: public Continuation
{
int file_update_handler(int etype, void *data)
{
Modified: trafficserver/traffic/trunk/proxy/InkAPI.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/InkAPI.cc?rev=982080&r1=982079&r2=982080&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/InkAPI.cc (original)
+++ trafficserver/traffic/trunk/proxy/InkAPI.cc Tue Aug 3 23:22:55 2010
@@ -415,7 +415,12 @@ _INKAssert(const char *text, const char
{
#ifdef DEBUG
_ink_assert(text, file, line);
+#else
+ NOWARN_UNUSED(text);
+ NOWARN_UNUSED(file);
+ NOWARN_UNUSED(line);
#endif
+
return (0);
}
@@ -512,6 +517,8 @@ sdk_sanity_check_field_handle(INKMLoc fi
}
return INK_SUCCESS;
#else
+ NOWARN_UNUSED(field);
+ NOWARN_UNUSED(parent_hdr);
return INK_SUCCESS;
#endif
}
@@ -528,6 +535,7 @@ sdk_sanity_check_mbuffer(INKMBuffer bufp
}
return INK_SUCCESS;
#else
+ NOWARN_UNUSED(bufp);
return INK_SUCCESS;
#endif
}
@@ -545,6 +553,7 @@ sdk_sanity_check_mime_hdr_handle(INKMLoc
}
return INK_SUCCESS;
#else
+ NOWARN_UNUSED(field);
return INK_SUCCESS;
#endif
}
@@ -562,6 +571,7 @@ sdk_sanity_check_url_handle(INKMLoc fiel
}
return INK_SUCCESS;
#else
+ NOWARN_UNUSED(field);
return INK_SUCCESS;
#endif
}
@@ -579,6 +589,7 @@ sdk_sanity_check_http_hdr_handle(INKMLoc
}
return INK_SUCCESS;
#else
+ NOWARN_UNUSED(field);
return INK_SUCCESS;
#endif
}
@@ -594,6 +605,7 @@ sdk_sanity_check_continuation(INKCont co
return INK_ERROR;
}
#else
+ NOWARN_UNUSED(cont);
return INK_SUCCESS;
#endif
}
@@ -608,6 +620,7 @@ sdk_sanity_check_http_ssn(INKHttpSsn ssn
return INK_ERROR;
}
#else
+ NOWARN_UNUSED(ssnp);
return INK_SUCCESS;
#endif
}
@@ -623,6 +636,7 @@ sdk_sanity_check_txn(INKHttpTxn txnp)
return INK_ERROR;
}
#else
+ NOWARN_UNUSED(txnp);
return INK_SUCCESS;
#endif
}
@@ -637,6 +651,7 @@ sdk_sanity_check_mime_parser(INKMimePars
return INK_ERROR;
}
#endif
+ NOWARN_UNUSED(parser);
return INK_SUCCESS;
}
@@ -650,6 +665,7 @@ sdk_sanity_check_http_parser(INKHttpPars
return INK_ERROR;
}
#endif
+ NOWARN_UNUSED(parser);
return INK_SUCCESS;
}
@@ -663,6 +679,7 @@ sdk_sanity_check_alt_info(INKHttpAltInfo
return INK_ERROR;
}
#endif
+ NOWARN_UNUSED(info);
return INK_SUCCESS;
}
@@ -674,6 +691,7 @@ sdk_sanity_check_hook_id(INKHttpHookID i
return INK_ERROR;
return INK_SUCCESS;
#else
+ NOWARN_UNUSED(id);
return INK_SUCCESS;
#endif
}
@@ -687,6 +705,7 @@ sdk_sanity_check_null_ptr(void *ptr)
return INK_ERROR;
return INK_SUCCESS;
#else
+ NOWARN_UNUSED(ptr);
return INK_SUCCESS;
#endif
}
@@ -1245,6 +1264,7 @@ INKVConnInternal::do_io_shutdown(Shutdow
void
INKVConnInternal::reenable(VIO * vio)
{
+ NOWARN_UNUSED(vio);
if (ink_atomic_increment((int *) &m_event_count, 1) < 0) {
ink_assert(!"not reached");
}
@@ -2061,6 +2081,7 @@ INKHandleMLocRelease(INKMBuffer bufp, IN
INKReturnCode
INKHandleStringRelease(INKMBuffer bufp, INKMLoc parent, const char *str)
{
+ NOWARN_UNUSED(parent);
if (str == NULL)
return (INK_SUCCESS);
if (bufp == NULL)
@@ -2119,6 +2140,7 @@ INKMBufferDestroy(INKMBuffer bufp)
int
INKMBufferDataSet(INKMBuffer bufp, void *data)
{
+ NOWARN_UNUSED(data);
sdk_sanity_check_mbuffer(bufp);
return 0;
}
@@ -2840,8 +2862,8 @@ INKMimeFieldCreate(INKMBuffer bufp)
sdk_sanity_check_mbuffer(bufp);
MIMEField *sa_field;
- HdrHeap *heap = ((HdrHeapSDKHandle *) bufp)->m_heap;
- NOWARN_UNUSED(heap);
+ // TODO: Why is the heap here, it's never used.
+ // HdrHeap *heap = ((HdrHeapSDKHandle *) bufp)->m_heap;
// (1) create a standalone field object in the heap
sa_field = sdk_alloc_standalone_field(bufp);
@@ -2876,7 +2898,7 @@ INKMimeFieldDestroy(INKMBuffer bufp, INK
void
INKMimeFieldCopy(INKMBuffer dest_bufp, INKMLoc dest_obj, INKMBuffer src_bufp, INKMLoc src_obj)
{
- int src_attached, dest_attached;
+ bool dest_attached;
sdk_sanity_check_mbuffer(src_bufp);
sdk_sanity_check_mbuffer(dest_bufp);
@@ -2890,7 +2912,8 @@ INKMimeFieldCopy(INKMBuffer dest_bufp, I
// FIX: This tortuous detach/change/attach algorithm is due to the
// fact that we can't change the name of an attached header (assertion)
- src_attached = (s_handle->mh && s_handle->field_ptr->is_live());
+ // TODO: This is never used ...
+ // src_attached = (s_handle->mh && s_handle->field_ptr->is_live());
dest_attached = (d_handle->mh && d_handle->field_ptr->is_live());
if (dest_attached)
@@ -3095,6 +3118,7 @@ INKMimeFieldValueGetUint(INKMBuffer bufp
time_t
INKMimeFieldValueGetDate(INKMBuffer bufp, INKMLoc field_obj, int idx)
{
+ NOWARN_UNUSED(idx);
time_t value;
sdk_sanity_check_mbuffer(bufp);
sdk_sanity_check_field_handle(field_obj);
@@ -3157,6 +3181,7 @@ INKMimeFieldValueSetUint(INKMBuffer bufp
void
INKMimeFieldValueSetDate(INKMBuffer bufp, INKMLoc field_obj, int idx, time_t value)
{
+ NOWARN_UNUSED(idx);
sdk_sanity_check_mbuffer(bufp);
sdk_sanity_check_field_handle(field_obj);
@@ -3223,6 +3248,7 @@ INKMimeFieldValueInsertUint(INKMBuffer b
INKMLoc
INKMimeFieldValueInsertDate(INKMBuffer bufp, INKMLoc field_obj, time_t value, int idx)
{
+ NOWARN_UNUSED(idx);
sdk_sanity_check_mbuffer(bufp);
sdk_sanity_check_field_handle(field_obj);
@@ -3347,6 +3373,7 @@ INKMimeHdrFieldAppend(INKMBuffer bufp, I
INKReturnCode
INKMimeHdrFieldInsert(INKMBuffer bufp, INKMLoc mh_mloc, INKMLoc field_mloc, int idx)
{
+ NOWARN_UNUSED(idx);
// Allow to modify the buffer only
// if bufp is modifiable. If bufp is not modifiable return
// INK_ERROR. If allowed, return INK_SUCCESS. Changed the
@@ -3767,6 +3794,7 @@ INKMimeHdrFieldValueUintGet(INKMBuffer b
const char *
INKMimeHdrFieldValueGet(INKMBuffer bufp, INKMLoc hdr, INKMLoc field, int idx, int *value_len_ptr)
{
+ NOWARN_UNUSED(hdr);
return (INKMimeFieldValueGet(bufp, field, idx, value_len_ptr));
}
@@ -3781,6 +3809,7 @@ INKMimeHdrFieldValueGetRaw(INKMBuffer bu
int
INKMimeHdrFieldValueGetInt(INKMBuffer bufp, INKMLoc hdr, INKMLoc field, int idx)
{
+ NOWARN_UNUSED(hdr);
return (INKMimeFieldValueGetInt(bufp, field, idx));
}
@@ -3788,6 +3817,7 @@ INKMimeHdrFieldValueGetInt(INKMBuffer bu
unsigned int
INKMimeHdrFieldValueGetUint(INKMBuffer bufp, INKMLoc hdr, INKMLoc field, int idx)
{
+ NOWARN_UNUSED(hdr);
return (INKMimeFieldValueGetUint(bufp, field, idx));
}
@@ -3795,6 +3825,7 @@ INKMimeHdrFieldValueGetUint(INKMBuffer b
time_t
INKMimeHdrFieldValueGetDate(INKMBuffer bufp, INKMLoc hdr, INKMLoc field, int idx)
{
+ NOWARN_UNUSED(hdr);
return (INKMimeFieldValueGetDate(bufp, field, idx));
}
@@ -4144,7 +4175,6 @@ INKHttpHdrClone(INKMBuffer dest_bufp, IN
(sdk_sanity_check_mbuffer(src_bufp) == INK_SUCCESS) &&
(sdk_sanity_check_http_hdr_handle(src_hdr) == INK_SUCCESS) && isWriteable(dest_bufp)
) {
- bool inherit_strs;
HdrHeap *s_heap, *d_heap;
HTTPHdrImpl *s_hh, *d_hh;
@@ -4154,7 +4184,8 @@ INKHttpHdrClone(INKMBuffer dest_bufp, IN
ink_assert(s_hh->m_type == HDR_HEAP_OBJ_HTTP_HEADER);
- inherit_strs = (s_heap != d_heap ? true : false);
+ // TODO: This is never used
+ // inherit_strs = (s_heap != d_heap ? true : false);
d_hh = http_hdr_clone(s_hh, s_heap, d_heap);
return ((INKMLoc) d_hh);
@@ -4593,6 +4624,7 @@ sdk_sanity_check_cachekey(INKCacheKey ke
return INK_SUCCESS;
#else
+ NOWARN_UNUSED(key);
return INK_SUCCESS;
#endif
}
@@ -8340,6 +8372,7 @@ HashTableModify(INKU32 ip, char *name, s
static int
remove_cache_handler(INKCont cache_contp, INKEvent event, void *edata)
{
+ NOWARN_UNUSED(edata);
INKCacheKey key;
key = (INKCacheKey) INKContDataGet(cache_contp);
@@ -8455,6 +8488,8 @@ typedef struct
static int
handle_write_fail(INKCont cont, INKEvent event, void *edata)
{
+ NOWARN_UNUSED(event);
+ NOWARN_UNUSED(edata);
passdata_s *pd;
pd = (passdata_s *) INKContDataGet(cont);
Modified: trafficserver/traffic/trunk/proxy/InkIOCoreAPI.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/InkIOCoreAPI.cc?rev=982080&r1=982079&r2=982080&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/InkIOCoreAPI.cc (original)
+++ trafficserver/traffic/trunk/proxy/InkIOCoreAPI.cc Tue Aug 3 23:22:55 2010
@@ -51,8 +51,10 @@ sdk_sanity_check_mutex(INKMutex mutex)
if (mutexp->nthread_holding < 0)
return INK_ERROR;
return INK_SUCCESS;
-#endif
+#else
+ NOWARN_UNUSED(mutex);
return INK_SUCCESS;
+#endif
}
@@ -64,6 +66,7 @@ sdk_sanity_check_hostlookup_structure(IN
return INK_ERROR;
return INK_SUCCESS;
#else
+ NOWARN_UNUSED(data);
return INK_SUCCESS;
#endif
}
@@ -76,6 +79,7 @@ sdk_sanity_check_iocore_structure(void *
return INK_ERROR;
return INK_SUCCESS;
#else
+ NOWARN_UNUSED(data);
return INK_SUCCESS;
#endif
}
Modified: trafficserver/traffic/trunk/proxy/Main.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/Main.cc?rev=982080&r1=982079&r2=982080&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/Main.cc (original)
+++ trafficserver/traffic/trunk/proxy/Main.cc Tue Aug 3 23:22:55 2010
@@ -78,7 +78,7 @@ extern "C" int plock(int);
#include "CacheInspectorAllow.h"
#include "ParentSelection.h"
//#include "rni/Rni.h"
-#if RNI_STATIC_LINK
+#ifdef RNI_STATIC_LINK
#include "RniProcessor.h"
#endif
//#include "simple/Simple.h"
@@ -318,6 +318,7 @@ int n_argument_descriptions = SIZE(argum
static rlim_t
max_out_limit(const char *name, int which, bool max_it = true, bool unlim_it = true)
{
+ NOWARN_UNUSED(name);
struct rlimit rl;
#if defined(linux)
@@ -638,7 +639,7 @@ clear_rn_cache()
return CMD_OK;
}
-struct CmdCacheCont:Continuation
+struct CmdCacheCont: public Continuation
{
int cache_fix;
@@ -701,6 +702,7 @@ CmdCacheCont(bool check, bool fix = fals
static int
cmd_check_internal(char *cmd, bool fix = false)
{
+ NOWARN_UNUSED(cmd);
const char *n = fix ? "REPAIR" : "CHECK";
printf("%s\n\n", n);
@@ -1100,7 +1102,8 @@ parse_accept_fd_list()
static int
set_core_size(const char *name, RecDataT data_type, RecData data, void *opaque_token)
{
-
+ NOWARN_UNUSED(name);
+ NOWARN_UNUSED(data_type);
RecInt size = data.rec_int;
struct rlimit lim;
bool failed = false;
@@ -1226,7 +1229,7 @@ adjust_sys_settings(void)
#endif
}
-struct ShowStats:Continuation
+struct ShowStats: public Continuation
{
#ifdef ENABLE_TIME_TRACE
FILE *fp;
@@ -1361,7 +1364,7 @@ ShowStats():Continuation(NULL),
};
-
+// TODO: How come this is never used ??
static int syslog_facility = LOG_DAEMON;
// static void syslog_log_configure()
@@ -1463,7 +1466,7 @@ init_http_aeua_filter(void)
Debug("http_aeua", "[init_http_aeua_filter] - Total loaded %d REGEXP for Accept-Enconding/User-Agent filtering", i);
}
-struct AutoStopCont:Continuation
+struct AutoStopCont: public Continuation
{
int mainEvent(int event, Event * e)
{
@@ -1486,7 +1489,7 @@ run_AutoStop()
}
#ifndef INK_NO_TESTS
-struct RegressionCont:Continuation
+struct RegressionCont: public Continuation
{
int initialized;
int waits;
@@ -1709,13 +1712,13 @@ void init_stat_collector()
static int max_stats_allowed = 0;
static int num_stats_estimate = 0;
- static int temp = 0;
// Read config variables
TS_ReadConfigInteger(stat_collection_interval, "proxy.config.stat_collector.interval");
TS_ReadConfigInteger(stat_collector_port, "proxy.config.stat_collector.port");
TS_ReadConfigInteger(max_stats_allowed, "proxy.config.stat_systemV2.max_stats_allowed");
TS_ReadConfigInteger(num_stats_estimate, "proxy.config.stat_systemV2.num_stats_estimate");
- TS_ReadConfigInteger(temp, "proxy.config.cache.threads_per_disk");
+ // TODO: This seems unused
+ // TS_ReadConfigInteger(temp, "proxy.config.cache.threads_per_disk");
// Set to default if not defined in config file
if(!stat_collector_port) {
@@ -2056,7 +2059,7 @@ main(int argc, char **argv)
// Initialize the system for RNI support
// All this is handled by plugin support code
//Rni::init ();
-#if RNI_STATIC_LINK
+#ifdef RNI_STATIC_LINK
rniProcessor.start();
#endif
@@ -2291,6 +2294,7 @@ REGRESSION_TEST(Hdrs) (RegressionTest *
void *
mgmt_restart_shutdown_callback(void *, char *, int data_len)
{
+ NOWARN_UNUSED(data_len);
sync_cache_dir_on_shutdown();
return NULL;
}
Modified: trafficserver/traffic/trunk/proxy/ParentSelection.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/ParentSelection.cc?rev=982080&r1=982079&r2=982080&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/ParentSelection.cc (original)
+++ trafficserver/traffic/trunk/proxy/ParentSelection.cc Tue Aug 3 23:22:55 2010
@@ -880,7 +880,7 @@ ParentRecord::Print()
// Used to handle parent.conf or default parent updates after the
// manager signals a change
//
-struct PA_UpdateContinuation:Continuation
+struct PA_UpdateContinuation: public Continuation
{
int handle_event(int event, void *data)
@@ -934,6 +934,9 @@ createDefaultParent(char *val)
int
parentSelection_CB(const char *name, RecDataT data_type, RecData data, void *cookie)
{
+ NOWARN_UNUSED(name);
+ NOWARN_UNUSED(data_type);
+ NOWARN_UNUSED(data);
ParentCB_t type = (ParentCB_t) (long) cookie;
switch (type) {
@@ -1008,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, "%hu.%hu.%hu.%hu", ip[0], ip[1], ip[2], ip[3]);
}
}
@@ -1231,8 +1234,10 @@ static int passes;
static int fails;
// Parenting Tests
-EXCLUSIVE_REGRESSION_TEST(PARENTSELECTION) (RegressionTest * t, int intensity_level, int *pstatus) {
-
+EXCLUSIVE_REGRESSION_TEST(PARENTSELECTION) (RegressionTest * t, int intensity_level, int *pstatus)
+{
+ NOWARN_UNUSED(t);
+ NOWARN_UNUSED(intensity_level);
// first, set everything up
*pstatus = REGRESSION_TEST_INPROGRESS;
ParentConfig config;
Modified: trafficserver/traffic/trunk/proxy/Plugin.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/Plugin.cc?rev=982080&r1=982079&r2=982080&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/Plugin.cc (original)
+++ trafficserver/traffic/trunk/proxy/Plugin.cc Tue Aug 3 23:22:55 2010
@@ -99,6 +99,7 @@ dll_findsym(void *dlp, const char *name)
static char *
dll_error(void *dlp)
{
+ NOWARN_UNUSED(dlp);
return (char *) dlerror();
}
Modified: trafficserver/traffic/trunk/proxy/PluginVC.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/PluginVC.cc?rev=982080&r1=982079&r2=982080&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/PluginVC.cc (original)
+++ trafficserver/traffic/trunk/proxy/PluginVC.cc Tue Aug 3 23:22:55 2010
@@ -350,7 +350,7 @@ PluginVC::reenable_re(VIO * vio)
void
PluginVC::do_io_close(int flag)
{
-
+ NOWARN_UNUSED(flag);
ink_assert(closed == false);
ink_assert(magic == PLUGIN_VC_MAGIC_ALIVE);
@@ -576,15 +576,17 @@ PluginVC::process_read_side(bool other_s
ink_assert(!deletable);
ink_assert(magic == PLUGIN_VC_MAGIC_ALIVE);
- MIOBuffer *core_buffer;
+ // TODO: Never used??
+ //MIOBuffer *core_buffer;
+
IOBufferReader *core_reader;
if (vc_type == PLUGIN_VC_ACTIVE) {
- core_buffer = core_obj->p_to_a_buffer;
+ //core_buffer = core_obj->p_to_a_buffer;
core_reader = core_obj->p_to_a_reader;
} else {
ink_assert(vc_type == PLUGIN_VC_PASSIVE);
- core_buffer = core_obj->a_to_p_buffer;
+ //core_buffer = core_obj->a_to_p_buffer;
core_reader = core_obj->a_to_p_reader;
}
@@ -1057,7 +1059,8 @@ PluginVCCore::connect_re(Continuation *
int
PluginVCCore::state_send_accept_failed(int event, void *data)
{
-
+ NOWARN_UNUSED(event);
+ NOWARN_UNUSED(data);
MUTEX_TRY_LOCK(lock, connect_to->mutex, this_ethread());
if (lock) {
@@ -1075,7 +1078,8 @@ PluginVCCore::state_send_accept_failed(i
int
PluginVCCore::state_send_accept(int event, void *data)
{
-
+ NOWARN_UNUSED(event);
+ NOWARN_UNUSED(data);
MUTEX_TRY_LOCK(lock, connect_to->mutex, this_ethread());
if (lock) {
@@ -1227,7 +1231,8 @@ PVCTestDriver::run_next_test()
int
PVCTestDriver::main_handler(int event, void *data)
{
-
+ NOWARN_UNUSED(event);
+ NOWARN_UNUSED(data);
completions_received++;
if (completions_received == 2) {
@@ -1237,7 +1242,9 @@ PVCTestDriver::main_handler(int event, v
return 0;
}
-EXCLUSIVE_REGRESSION_TEST(PVC) (RegressionTest * t, int atype, int *pstatus) {
+EXCLUSIVE_REGRESSION_TEST(PVC) (RegressionTest * t, int atype, int *pstatus)
+{
+ NOWARN_UNUSED(atype);
PVCTestDriver *driver = NEW(new PVCTestDriver);
driver->start_tests(t, pstatus);
}
Modified: trafficserver/traffic/trunk/proxy/Prefetch.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/Prefetch.cc?rev=982080&r1=982079&r2=982080&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/Prefetch.cc (original)
+++ trafficserver/traffic/trunk/proxy/Prefetch.cc Tue Aug 3 23:22:55 2010
@@ -677,6 +677,7 @@ check_n_attach_prefetch_transform(HttpSM
static int
PrefetchPlugin(INKCont contp, INKEvent event, void *edata)
{
+ NOWARN_UNUSED(contp);
HttpSM *sm = (HttpSM *) edata;
HTTPHdr *resp = 0;
bool from_cache = false;
@@ -1331,8 +1332,6 @@ PrefetchBlaster::handleCookieHeaders(HTT
if (add_cookies && existing_req_cookies) {
MIMEField *o_cookie = req_hdr->field_find(MIME_FIELD_COOKIE,
MIME_LEN_COOKIE);
- const char *a_raw;
- int a_raw_len;
const char *iter_cookie;
int iter_cookie_len;
@@ -1560,6 +1559,7 @@ PrefetchBlaster::httpClient(int event, v
int
PrefetchBlaster::bufferObject(int event, void *data)
{
+ NOWARN_UNUSED(data);
switch (event) {
case EVENT_INTERVAL:
@@ -1802,7 +1802,7 @@ config_read_proto(unsigned int &proto, c
if (strncasecmp("multicast:", str, 10) == 0) {
unsigned int ip[4];
// coverity[secure_coding]
- if (sscanf(str + 10, "%d.%d.%d.%d", &ip[0], &ip[1], &ip[2], &ip[3]) < 4) {
+ if (sscanf(str + 10, "%u.%u.%u.%u", &ip[0], &ip[1], &ip[2], &ip[3]) < 4) {
Error("PrefetchProcessor: Address specified for multicast does not seem to "
"be of the form multicast:ip_addr (eg: multicast:224.0.0.1)");
return 1;
@@ -2008,7 +2008,7 @@ KeepAliveConnTable::free()
delete arr;
delete this;
-};
+}
ClassAllocator<KeepAliveLockHandler> prefetchLockHandlerAllocator("prefetchLockHandlerAllocator");
@@ -2164,6 +2164,7 @@ KeepAliveConn::handleEvent(int event, vo
int
KeepAliveLockHandler::handleEvent(int event, void *data)
{
+ NOWARN_UNUSED(data);
if (event == EVENT_INTERVAL)
g_conn_table->append(ip, buf, reader);
Modified: trafficserver/traffic/trunk/proxy/Prefetch.h
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/Prefetch.h?rev=982080&r1=982079&r2=982080&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/Prefetch.h (original)
+++ trafficserver/traffic/trunk/proxy/Prefetch.h Tue Aug 3 23:22:55 2010
@@ -82,7 +82,8 @@ struct PrefetchConfiguration
void readHtmlTags(int fd, html_tag ** ptags, html_tag ** pattrs);
};
-class PrefetchUrlEntry:RefCountObj
+// TODO: This used to be private, which seems wrong.
+class PrefetchUrlEntry: public RefCountObj
{
public:
PrefetchUrlEntry()
@@ -144,7 +145,7 @@ PrefetchUrlEntry::free()
}
}
-class PrefetchTransform:public INKVConnInternal, RefCountObj
+class PrefetchTransform:public INKVConnInternal, public RefCountObj
{
enum
{ HASH_TABLE_LENGTH = 61 /*127, 511 */ };
@@ -353,7 +354,7 @@ extern ClassAllocator<PrefetchBlaster> p
#define PRELOAD_UDP_LAST_PKT_FLAG (0x80000000)
#define PRELOAD_UDP_PKT_NUM_MASK (0x7fffffff)
-class KeepAliveConn:Continuation
+class KeepAliveConn: public Continuation
{
public:
@@ -406,7 +407,7 @@ public:
};
extern KeepAliveConnTable *g_conn_table;
-class KeepAliveLockHandler:Continuation
+class KeepAliveLockHandler: public Continuation
{
/* Used when we miss the lock for the connection */
Modified: trafficserver/traffic/trunk/proxy/RegressionSM.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/RegressionSM.cc?rev=982080&r1=982079&r2=982080&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/RegressionSM.cc (original)
+++ trafficserver/traffic/trunk/proxy/RegressionSM.cc Tue Aug 3 23:22:55 2010
@@ -26,7 +26,8 @@
#define REGRESSION_SM_RETRY (100*HRTIME_MSECOND)
-void RegressionSM::set_status(int astatus) {
+void RegressionSM::set_status(int astatus)
+{
ink_assert(astatus != REGRESSION_TEST_INPROGRESS);
// INPROGRESS < NOT_RUN < PASSED < FAILED
if (status != REGRESSION_TEST_FAILED) {
@@ -40,7 +41,8 @@ void RegressionSM::set_status(int astatu
} // else FAILED is FAILED
}
-void RegressionSM::done(int astatus) {
+void RegressionSM::done(int astatus)
+{
if (pending_action) {
pending_action->cancel();
pending_action = 0;
@@ -50,31 +52,37 @@ void RegressionSM::done(int astatus) {
if (parent) parent->child_done(status);
}
-void RegressionSM::run(int *apstatus) {
+void RegressionSM::run(int *apstatus)
+{
pstatus = apstatus;
run();
}
-void RegressionSM::xrun(RegressionSM *aparent) {
+void RegressionSM::xrun(RegressionSM *aparent)
+{
parent = aparent;
parent->nwaiting++;
run();
}
-void RegressionSM::run_in(int *apstatus, ink_hrtime t) {
+void RegressionSM::run_in(int *apstatus, ink_hrtime t)
+{
pstatus = apstatus;
SET_HANDLER(&RegressionSM::regression_sm_start);
eventProcessor.schedule_in(this, t);
}
-void RegressionSM::child_done(int astatus) {
+void RegressionSM::child_done(int astatus)
+{
MUTEX_LOCK(l, mutex, this_ethread());
ink_assert(nwaiting > 0);
--nwaiting;
set_status(astatus);
}
-int RegressionSM::regression_sm_waiting(int event, void *data) {
+int RegressionSM::regression_sm_waiting(int event, void *data)
+{
+ NOWARN_UNUSED(event);
if (!nwaiting) {
done(REGRESSION_TEST_NOT_RUN);
delete this;
@@ -88,12 +96,16 @@ int RegressionSM::regression_sm_waiting(
return EVENT_DONE;
}
-int RegressionSM::regression_sm_start(int event, void *data) {
+int RegressionSM::regression_sm_start(int event, void *data)
+{
+ NOWARN_UNUSED(event);
+ NOWARN_UNUSED(data);
run();
return EVENT_CONT;
}
-RegressionSM *r_sequential(RegressionTest *t, RegressionSM* sm, ...) {
+RegressionSM *r_sequential(RegressionTest *t, RegressionSM* sm, ...)
+{
RegressionSM *new_sm = new RegressionSM(t);
va_list ap;
va_start(ap, sm);
@@ -111,7 +123,8 @@ RegressionSM *r_sequential(RegressionTes
return new_sm;
}
-RegressionSM *r_sequential(RegressionTest *t, int an, RegressionSM *sm) {
+RegressionSM *r_sequential(RegressionTest *t, int an, RegressionSM *sm)
+{
RegressionSM *new_sm = new RegressionSM(t);
new_sm->par = false;
new_sm->rep = true;
@@ -123,7 +136,8 @@ RegressionSM *r_sequential(RegressionTes
return new_sm;
}
-RegressionSM *r_parallel(RegressionTest *t, RegressionSM *sm, ...) {
+RegressionSM *r_parallel(RegressionTest *t, RegressionSM *sm, ...)
+{
RegressionSM *new_sm = new RegressionSM(t);
va_list ap;
va_start(ap, sm);
@@ -141,7 +155,8 @@ RegressionSM *r_parallel(RegressionTest
return new_sm;
}
-RegressionSM *r_parallel(RegressionTest *t, int an, RegressionSM *sm) {
+RegressionSM *r_parallel(RegressionTest *t, int an, RegressionSM *sm)
+{
RegressionSM *new_sm = new RegressionSM(t);
new_sm->par = true;
new_sm->rep = true;
@@ -153,7 +168,9 @@ RegressionSM *r_parallel(RegressionTest
return new_sm;
}
-void RegressionSM::run() {
+void RegressionSM::run()
+{
+ // TODO: Why introduce another scope here?
{
MUTEX_TRY_LOCK(l, mutex, this_ethread());
if (!l || nwaiting > 1)
@@ -186,7 +203,8 @@ Lretry:
pending_action = eventProcessor.schedule_in(this, REGRESSION_SM_RETRY);
}
-RegressionSM::RegressionSM(const RegressionSM &ao) {
+RegressionSM::RegressionSM(const RegressionSM &ao)
+{
RegressionSM &o = *(RegressionSM*)&ao;
t = o.t;
status = o.status;
@@ -207,7 +225,8 @@ RegressionSM::RegressionSM(const Regress
mutex = new_ProxyMutex();
}
-struct ReRegressionSM : RegressionSM {
+struct ReRegressionSM: public RegressionSM
+{
virtual void run() {
if (time(NULL) < 1) { // example test
rprintf(t,"impossible");
@@ -222,7 +241,9 @@ struct ReRegressionSM : RegressionSM {
}
};
-REGRESSION_TEST(RegressionSM)(RegressionTest *t, int atype, int *pstatus) {
+REGRESSION_TEST(RegressionSM)(RegressionTest *t, int atype, int *pstatus)
+{
+ NOWARN_UNUSED(atype);
r_sequential(
t,
r_parallel(t, new ReRegressionSM(t), new ReRegressionSM(t), NULL_PTR),
Modified: trafficserver/traffic/trunk/proxy/ReverseProxy.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/ReverseProxy.cc?rev=982080&r1=982079&r2=982080&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/ReverseProxy.cc (original)
+++ trafficserver/traffic/trunk/proxy/ReverseProxy.cc Tue Aug 3 23:22:55 2010
@@ -124,7 +124,7 @@ response_url_remap(HTTPHdr * response_he
/** Used to read the remap.config file after the manager signals a change. */
struct UR_UpdateContinuation;
typedef int (UR_UpdateContinuation::*UR_UpdContHandler) (int, void *);
-struct UR_UpdateContinuation:Continuation
+struct UR_UpdateContinuation: public Continuation
{
int file_update_handler(int etype, void *data)
{
@@ -144,7 +144,7 @@ struct UR_FreerContinuation;
typedef int (UR_FreerContinuation::*UR_FreerContHandler) (int, void *);
/** Used to free url rewrite class. */
-struct UR_FreerContinuation:Continuation
+struct UR_FreerContinuation: public Continuation
{
UrlRewrite *p;
int freeEvent(int event, Event * e)
@@ -182,6 +182,8 @@ reloadUrlRewrite()
int
url_rewrite_CB(const char *name, RecDataT data_type, RecData data, void *cookie)
{
+ NOWARN_UNUSED(name);
+ NOWARN_UNUSED(data_type);
int my_token = (int) (long) cookie;
switch (my_token) {
Modified: trafficserver/traffic/trunk/proxy/SocksProxy.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/SocksProxy.cc?rev=982080&r1=982079&r2=982080&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/SocksProxy.cc (original)
+++ trafficserver/traffic/trunk/proxy/SocksProxy.cc Tue Aug 3 23:22:55 2010
@@ -45,7 +45,7 @@ static RecRawStatBlock *socksproxy_stat_
#define SOCKSPROXY_INC_STAT(x) \
RecIncrRawStat(socksproxy_stat_block, mutex->thread_holding, x)
-struct SocksProxy:Continuation
+struct SocksProxy: public Continuation
{
typedef int (SocksProxy::*EventHandler) (int event, void *data);
@@ -494,7 +494,7 @@ new_SocksProxy(NetVConnection * netVC)
proxy->init(netVC);
}
-struct SocksAccepter:Continuation
+struct SocksAccepter: public Continuation
{
typedef int (SocksAccepter::*SocksAccepterHandler) (int, void *);
Modified: trafficserver/traffic/trunk/proxy/StatSystem.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/StatSystem.cc?rev=982080&r1=982079&r2=982080&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/StatSystem.cc (original)
+++ trafficserver/traffic/trunk/proxy/StatSystem.cc Tue Aug 3 23:22:55 2010
@@ -383,10 +383,11 @@ Lerror:
socketManager.close(fd);
}
-struct SnapStatsContinuation:Continuation
+struct SnapStatsContinuation: public Continuation
{
int mainEvent(int event, Event * e)
{
+ NOWARN_UNUSED(event);
write_stats_snap();
e->schedule_every(HRTIME_SECONDS(snap_stats_every));
return EVENT_CONT;
@@ -417,10 +418,12 @@ take_rusage_snap()
struct SnapCont;
typedef int (SnapCont::*SnapContHandler) (int, void *);
-struct SnapCont:Continuation
+
+struct SnapCont: public Continuation
{
int mainEvent(int event, Event * e)
{
+ NOWARN_UNUSED(event);
take_rusage_snap();
e->schedule_every(SNAP_USAGE_PERIOD);
return EVENT_CONT;
Modified: trafficserver/traffic/trunk/proxy/StatSystemV2.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/StatSystemV2.cc?rev=982080&r1=982079&r2=982080&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/StatSystemV2.cc (original)
+++ trafficserver/traffic/trunk/proxy/StatSystemV2.cc Tue Aug 3 23:22:55 2010
@@ -219,11 +219,11 @@ void StatSystemV2::collect()
// Lock thread stats to prevent resizing on increment
INKMutexLock(t->thread_stats_mutex);
- int i = 0;
+ int j = 0;
for(std::vector<INK64>::iterator it = t->thread_stats.begin();
- it != t->thread_stats.end(); it++, i++) {
+ it != t->thread_stats.end(); it++, j++) {
if(*it != 0) {
- incrementGlobal(i, *it);
+ incrementGlobal(j, *it);
}
}
@@ -256,6 +256,8 @@ static INKThread statsCommandThread;
static int MAX_STAT_NAME_LENGTH = 512;
int StatCollectorContinuation::mainEvent(int event, Event * e)
{
+ NOWARN_UNUSED(event);
+ NOWARN_UNUSED(e);
StatSystemV2::collect();
return EVENT_CONT;
}
@@ -396,13 +398,13 @@ void* StatCollectorContinuation::command
" help - Prints this message.\r\n"
" quit - Close this connection.\r\n"
;
- int client_sock, readbytes;
+ int client_sock;
char readbuf[1024];
if (!data) return 0;
client_sock = *(static_cast<int*>(data));
while(1){
- if((readbytes = getCommand(client_sock, readbuf, sizeof(readbuf))) <= 0) {
+ if(getCommand(client_sock, readbuf, sizeof(readbuf)) <= 0) {
break;
}
Modified: trafficserver/traffic/trunk/proxy/Transform.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/Transform.cc?rev=982080&r1=982079&r2=982080&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/Transform.cc (original)
+++ trafficserver/traffic/trunk/proxy/Transform.cc Tue Aug 3 23:22:55 2010
@@ -191,6 +191,7 @@ dump_buffer(IOBufferReader *reader)
int
TransformTerminus::handle_event(int event, void *edata)
{
+ NOWARN_UNUSED(edata);
int val;
m_deletable = ((m_closed != 0) && (m_tvc->m_closed != 0));
@@ -488,6 +489,8 @@ TransformVConnection::~TransformVConnect
int
TransformVConnection::handle_event(int event, void *edata)
{
+ NOWARN_UNUSED(event);
+ NOWARN_UNUSED(edata);
ink_assert(!"not reached");
return 0;
}
@@ -509,6 +512,7 @@ TransformVConnection::do_io_read(Continu
VIO *
TransformVConnection::do_io_write(Continuation *c, int64 nbytes, IOBufferReader *buf, bool owner)
{
+ NOWARN_UNUSED(owner);
Debug("transform", "TransformVConnection do_io_write: 0x%lx [0x%lx]", (long) c, (long) this);
return m_transform->do_io_write(c, nbytes, buf);
@@ -550,6 +554,7 @@ TransformVConnection::do_io_shutdown(Shu
void
TransformVConnection::reenable(VIO *vio)
{
+ NOWARN_UNUSED(vio);
ink_assert(!"not reached");
}
@@ -580,6 +585,7 @@ TransformControl::TransformControl()
int
TransformControl::handle_event(int event, void *edata)
{
+ NOWARN_UNUSED(edata);
switch (event) {
case EVENT_IMMEDIATE:{
char *s, *e;
@@ -1016,13 +1022,11 @@ void
RangeTransform::transform_to_range()
{
IOBufferReader *reader = m_write_vio.get_reader();
- int done, toskip, tosend, avail;
+ int toskip, tosend, avail;
const int64 *end, *start;
int64 prev_end = 0;
int64 *done_byte;
- done = m_done;
-
end = &m_ranges[m_current_range]._end;
done_byte = &m_ranges[m_current_range]._done_byte;
start = &m_ranges[m_current_range]._start;
Modified: trafficserver/traffic/trunk/proxy/Update.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/Update.cc?rev=982080&r1=982079&r2=982080&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/Update.cc (original)
+++ trafficserver/traffic/trunk/proxy/Update.cc Tue Aug 3 23:22:55 2010
@@ -294,6 +294,7 @@ UpdateEntry::ValidURL(char *s, char *e)
int
UpdateEntry::ValidHeaders(char *s, char *e)
{
+ NOWARN_UNUSED(e);
// Note: string 's' is null terminated.
enum
@@ -471,6 +472,7 @@ UpdateEntry::ValidSeparatorChar(char c)
int
UpdateEntry::ValidHour(char *s, char *e)
{
+ NOWARN_UNUSED(e);
// Note: string 's' is null terminated.
_offset_hour = atoi(s);
@@ -484,6 +486,7 @@ UpdateEntry::ValidHour(char *s, char *e)
int
UpdateEntry::ValidInterval(char *s, char *e)
{
+ NOWARN_UNUSED(e);
// Note: string 's' is null terminated.
_interval = atoi(s);
@@ -498,6 +501,7 @@ UpdateEntry::ValidInterval(char *s, char
int
UpdateEntry::ValidDepth(char *s, char *e)
{
+ NOWARN_UNUSED(e);
// Note: string 's' is null terminated.
_max_depth = atoi(s);
@@ -822,6 +826,8 @@ UpdateConfigManager::GetConfigList(Ptr<U
int
UpdateConfigManager::URL_list_update_callout(const char *name, RecDataT data_type, RecData data, void *cookie)
{
+ NOWARN_UNUSED(name);
+ NOWARN_UNUSED(data_type);
UpdateConfigManager *cm = (UpdateConfigManager *) cookie;
cm->SetFileName((char *) data.rec_string);
@@ -843,11 +849,9 @@ UpdateConfigManager::ProcessUpdate(int e
////////////////////////////////////////////////////////////////////
UpdateConfigList *l = NULL;
- UpdateConfigList *l_tmp = NULL;
l = BuildUpdateList();
if (l) {
- Debug("update", "Config list updated, new 0x%x old 0x%x", l, l_tmp = _CL);
_CL = l;
}
return EVENT_DONE;
@@ -859,13 +863,10 @@ UpdateConfigManager::ProcessUpdate(int e
////////////////////////////////////////////////////////////////////
UpdateConfigParams *p = NEW(new UpdateConfigParams(*_CP_actual));
- UpdateConfigParams *p_tmp;
if (!(*_CP == *p)) {
_CP = p;
- Debug("update", "Global config updated, new 0x%x old 0x%x", p, p_tmp = _CP);
- Debug("update",
- "enable %d force %d rcnt %d rint %d updates %d mem %d",
+ Debug("update", "enable %d force %d rcnt %d rint %d updates %d mem %d",
p->_enabled, p->_immediate_update, p->_retry_count,
p->_retry_interval, p->_concurrent_updates, p->_max_update_state_machines, p->_memory_use_in_mb);
} else {
@@ -977,12 +978,12 @@ UpdateConfigManager::ParseConfigFile(int
char *p;
int ln = 0;
- int i, rlen;
+ int i;
UpdateEntry *e = NULL;
UpdateConfigList *ul = NEW(new UpdateConfigList);
- while ((rlen = GetDataLine(f, sizeof(line) - 1, line, F_ITEMS, '\\')) > 0) {
+ while (GetDataLine(f, sizeof(line) - 1, line, F_ITEMS, '\\') > 0) {
++ln;
if (*line == '#') {
continue;
@@ -1328,6 +1329,7 @@ UpdateScheduler::ScheduleEvent(int event
int
UpdateScheduler::ChildExitEventHandler(int event, Event * e)
{
+ NOWARN_UNUSED(e);
switch (event) {
case EVENT_IMMEDIATE:
case EVENT_INTERVAL:
@@ -1425,6 +1427,7 @@ UpdateSM::Start()
int
UpdateSM::HandleSMEvent(int event, Event * e)
{
+ NOWARN_UNUSED(e);
while (1) {
switch (_state) {
case USM_INIT:
@@ -1556,11 +1559,11 @@ UpdateSM::http_scheme(UpdateSM * sm)
////////////////////////////////////
Debug("update", "Start HTTP GET id: %d [%s]", sm->_EN->_id, sm->_EN->_url);
HttpUpdateSM *current_reader;
- Action *a;
current_reader = HttpUpdateSM::allocate();
current_reader->init();
- a = current_reader->start_scheduled_update(sm, sm->_EN->_http_hdr);
+ // TODO: Do anything with the returned Action* ?
+ current_reader->start_scheduled_update(sm, sm->_EN->_http_hdr);
}
return 0;
}
@@ -1609,6 +1612,8 @@ UpdateSM::rtsp_scheme(UpdateSM * sm)
Debug("update", "Start RTSP GET id: %d", sm->_EN->_id);
}
return ret;
+#else
+ NOWARN_UNUSED(sm);
#endif
return 0;
}
@@ -1818,6 +1823,7 @@ RecursiveHttpGet::RecursiveHttpGetEvent(
int
RecursiveHttpGet::ExitEventHandler(int event, Event * e)
{
+ NOWARN_UNUSED(e);
switch (event) {
case EVENT_IMMEDIATE:
case EVENT_INTERVAL:
@@ -2262,7 +2268,6 @@ HtmlParser::ExtractURL(char **url, char
if (_html_doc_base) {
_html_doc_base.clear();
}
- intptr_t n;
for (n = 0; n < _attr_value.length(); ++n) {
_html_doc_base(_html_doc_base.length()) = _attr_value[n];
}
@@ -2275,23 +2280,20 @@ HtmlParser::ExtractURL(char **url, char
// <META HTTP-EQUIV=Refresh CONTENT="0; URL=index.html">
/////////////////////////////////////////////////////////////////
if (_attr_value.length()) {
-
// Locate start of URL
for (n = 0; n < _attr_value.length(); ++n) {
if (!ParseRules::is_digit((unsigned char) _attr_value[n])) {
break;
}
}
- if ((n < _attr_value.length())
- && (((unsigned char) _attr_value[n]) == ';')) {
+ if ((n < _attr_value.length()) && (((unsigned char) _attr_value[n]) == ';')) {
for (; n < _attr_value.length(); ++n) {
if (!isspace((unsigned char) _attr_value[n])) {
break;
}
}
- if ((n < _attr_value.length())
- && (!strncasecmp(&_attr_value[n], "URL=", 4))) {
+ if ((n < _attr_value.length()) && (!strncasecmp(&_attr_value[n], "URL=", 4))) {
n += 4;
if ((n < _attr_value.length())
&& ((_attr_value.length() - n) > 1)) {
Modified: trafficserver/traffic/trunk/proxy/logging/LogAccessHttp.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/logging/LogAccessHttp.cc?rev=982080&r1=982079&r2=982080&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/logging/LogAccessHttp.cc (original)
+++ trafficserver/traffic/trunk/proxy/logging/LogAccessHttp.cc Tue Aug 3 23:22:55 2010
@@ -111,7 +111,7 @@ LogAccessHttp::init()
LogUtils::remove_content_type_attributes(m_proxy_resp_content_type_str, &m_proxy_resp_content_type_len);
} else {
// If Content-Type field is missing, check for @Content-Type
- MIMEField *field = m_proxy_response->field_find(HIDDEN_CONTENT_TYPE, HIDDEN_CONTENT_TYPE_LEN);
+ field = m_proxy_response->field_find(HIDDEN_CONTENT_TYPE, HIDDEN_CONTENT_TYPE_LEN);
if (field) {
m_proxy_resp_content_type_str = (char *) field->value_get(&m_proxy_resp_content_type_len);
LogUtils::remove_content_type_attributes(m_proxy_resp_content_type_str, &m_proxy_resp_content_type_len);
Modified: trafficserver/traffic/trunk/proxy/logging/LogStandalone.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/logging/LogStandalone.cc?rev=982080&r1=982079&r2=982080&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/logging/LogStandalone.cc (original)
+++ trafficserver/traffic/trunk/proxy/logging/LogStandalone.cc Tue Aug 3 23:22:55 2010
@@ -204,6 +204,8 @@ shutdown_system()
static void
check_lockfile(const char *config_dir, const char *pgm_name)
{
+ NOWARN_UNUSED(config_dir);
+ NOWARN_UNUSED(pgm_name);
int err;
pid_t holding_pid;
char *lockfile = NULL;
Modified: trafficserver/traffic/trunk/proxy/mgmt2/StatAggregation.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/mgmt2/StatAggregation.cc?rev=982080&r1=982079&r2=982080&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/mgmt2/StatAggregation.cc (original)
+++ trafficserver/traffic/trunk/proxy/mgmt2/StatAggregation.cc Tue Aug 3 23:22:55 2010
@@ -259,10 +259,10 @@ Ag_cacheHits()
// calculate new values //
//////////////////////////
for (i = 0; hit_count_table[i].lm_record_name; i++) {
- int status;
hit_count_table[i].current_value = -10000;
hit_count_table[i].current_time = ink_get_hrtime();
- status = varIntFromName(hit_count_table[i].lm_record_name, &(hit_count_table[i].current_value));
+ // TODO: Check return value?
+ varIntFromName(hit_count_table[i].lm_record_name, &(hit_count_table[i].current_value));
}
for (i = 0; miss_count_table[i].lm_record_name; i++) {
Modified: trafficserver/traffic/trunk/proxy/mgmt2/api2/CoreAPI.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/mgmt2/api2/CoreAPI.cc?rev=982080&r1=982079&r2=982080&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/mgmt2/api2/CoreAPI.cc (original)
+++ trafficserver/traffic/trunk/proxy/mgmt2/api2/CoreAPI.cc Tue Aug 3 23:22:55 2010
@@ -816,8 +816,7 @@ SnapshotTake(char *snapshot_name)
int rec_err = RecGetRecordString_Xmalloc("proxy.config.snapshot_dir", &snapDirFromRecordsConf);
found = (rec_err == REC_ERR_OKAY);
-
- ink_assert(found);
+ ink_release_assert(found);
// XXX: Why was that offset to config dir?
// Any path should be prefix relative thought
//
@@ -844,7 +843,7 @@ SnapshotRestore(char *snapshot_name)
int rec_err = RecGetRecordString_Xmalloc("proxy.config.snapshot_dir", &snapDirFromRecordsConf);
found = (rec_err == REC_ERR_OKAY);
- ink_assert(found);
+ ink_release_assert(found);
// XXX: Why was that offset to config dir?
// Any path should be prefix relative thought
//
@@ -872,7 +871,7 @@ SnapshotRemove(char *snapshot_name)
int rec_err = RecGetRecordString_Xmalloc("proxy.config.snapshot_dir", &snapDirFromRecordsConf);
found = (rec_err == REC_ERR_OKAY);
- ink_assert(found);
+ ink_release_assert(found);
// XXX: Why was that offset to config dir?
// Any path should be prefix relative thought
//
Modified: trafficserver/traffic/trunk/proxy/mgmt2/web2/WebHttp.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/mgmt2/web2/WebHttp.cc?rev=982080&r1=982079&r2=982080&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/mgmt2/web2/WebHttp.cc (original)
+++ trafficserver/traffic/trunk/proxy/mgmt2/web2/WebHttp.cc Tue Aug 3 23:22:55 2010
@@ -1735,7 +1735,7 @@ handle_submit_snapshot(WebHttpContext *
INKMgmtFtp("put", ftp_server_name, ftp_login, ftp_password, newStr, ftp_remote_dir_name, NULL);
} else {
RecGetRecordString_Xmalloc("proxy.config.snapshot_dir", &snapDirFromRecordsConf);
- ink_assert(found);
+ ink_release_assert(found);
if (snapDirFromRecordsConf[0] != '/') {
char *snap_dir_cpy = strdup(snapDirFromRecordsConf);
@@ -1802,7 +1802,7 @@ handle_submit_snapshot(WebHttpContext *
if (ink_hash_table_lookup(whc->post_data_ht, "snap_name", (void **) &snap_name)) {
if (strcmp(snap_name, "- select a snapshot -")) {
RecGetRecordString_Xmalloc("proxy.config.snapshot_dir", &snapDirFromRecordsConf);
- ink_assert(found);
+ ink_release_assert(found);
if (snapDirFromRecordsConf[0] != '/') {
char *snap_dir_cpy = strdup(snapDirFromRecordsConf);
ink_assert(snap_dir_cpy);
@@ -1823,7 +1823,7 @@ handle_submit_snapshot(WebHttpContext *
if (ink_hash_table_lookup(whc->post_data_ht, "snap_name", (void **) &snap_name)) {
if (strcmp(snap_name, "- select a snapshot -")) {
RecGetRecordString_Xmalloc("proxy.config.snapshot_dir", &snapDirFromRecordsConf);
- ink_assert(found);
+ ink_release_assert(found);
if (snapDirFromRecordsConf[0] != '/') {
char *snap_dir_cpy = strdup(snapDirFromRecordsConf);
ink_assert(snap_dir_cpy);
@@ -1940,7 +1940,7 @@ handle_submit_snapshot_to_filesystem(Web
}
RecGetRecordString_Xmalloc("proxy.config.snapshot_dir", &snapDirFromRecordsConf);
- ink_assert(found);
+ ink_release_assert(found);
if (snapDirFromRecordsConf == NULL) {
snapDirFromRecordsConf = new char[strlen("snapshots")];
snprintf(snapDirFromRecordsConf, strlen("snapshots"), "%s", "snapshots");
@@ -2108,7 +2108,7 @@ handle_submit_snapshot_to_filesystem(Web
}
RecGetRecordString_Xmalloc("proxy.config.snapshot_dir", &snap_directory);
- ink_assert(found);
+ ink_release_assert(found);
if (snap_directory[0] != '/') {
char *snap_dir_cpy = strdup(snap_directory);
@@ -2139,7 +2139,7 @@ handle_submit_snapshot_to_filesystem(Web
if (ink_hash_table_lookup(whc->post_data_ht, "restore_delete_name", (void **) &snap_name)) {
if (strcmp(snap_name, "- select a snapshot -")) {
RecGetRecordString_Xmalloc("proxy.config.snapshot_dir", &snapDirFromRecordsConf);
- ink_assert(found);
+ ink_release_assert(found);
if (snapDirFromRecordsConf[0] != '/') {
char *snap_dir_cpy = strdup(snapDirFromRecordsConf);
ink_assert(snap_dir_cpy);
@@ -2164,7 +2164,7 @@ Ldelete:
if (ink_hash_table_lookup(whc->post_data_ht, "restore_delete_name", (void **) &snap_name)) {
if (strcmp(snap_name, "- select a snapshot -")) {
RecGetRecordString_Xmalloc("proxy.config.snapshot_dir", &snapDirFromRecordsConf);
- ink_assert(found);
+ ink_release_assert(found);
if (snapDirFromRecordsConf[0] != '/') {
char *snap_dir_cpy = strdup(snapDirFromRecordsConf);
ink_assert(snap_dir_cpy);
@@ -2341,7 +2341,7 @@ handle_submit_snapshot_to_ftpserver(WebH
found = (RecGetRecordString_Xmalloc("proxy.config.temp_dir", &tempDirFromRecordsConf)
== REC_ERR_OKAY);
- ink_assert(found);
+ ink_release_assert(found);
int newLen;
char *newStr;
Modified: trafficserver/traffic/trunk/proxy/signals.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/signals.cc?rev=982080&r1=982079&r2=982080&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/signals.cc (original)
+++ trafficserver/traffic/trunk/proxy/signals.cc Tue Aug 3 23:22:55 2010
@@ -80,6 +80,8 @@ public:
int periodic(int event, Event * e)
{
+ NOWARN_UNUSED(event);
+ NOWARN_UNUSED(e);
if (sigusr1_received) {
sigusr1_received = 0;
@@ -94,7 +96,7 @@ public:
// This is not error condition at the first place
// so why stderr?
//
- fprintf(stderr, "sbrk 0x%llx from first %lld from last %lld\n",
+ fprintf(stderr, "sbrk 0x%llux from first %llu from last %llu\n",
(uint64) ((ptrdiff_t) now), (uint64) ((ptrdiff_t) (now - end)),
(uint64) ((ptrdiff_t) (now - snap)));
#ifdef DEBUG
@@ -132,6 +134,8 @@ public:
int periodic(int event, Event * e)
{
+ NOWARN_UNUSED(event);
+ NOWARN_UNUSED(e);
if (use_baseline) {
xdump_to_file_baseline_rel(stderr);
ink_freelists_dump_baselinerel(stderr);
@@ -530,6 +534,8 @@ init_signals(bool do_stackdump)
int
init_tracker(const char *config_var, RecDataT type, RecData data, void *cookie)
{
+ NOWARN_UNUSED(type);
+ NOWARN_UNUSED(cookie);
static Event *tracker_event = NULL;
int dump_mem_info_frequency = 0;
if (config_var)