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:42 UTC
svn commit: r982078 - in /trafficserver/traffic/trunk/proxy/mgmt2: api2/
api2/remote/ cli2/ stats/ web2/
Author: zwoop
Date: Tue Aug 3 23:22:41 2010
New Revision: 982078
URL: http://svn.apache.org/viewvc?rev=982078&view=rev
Log:
TS-400 Checkpoint 11 in cleanup.
Modified:
trafficserver/traffic/trunk/proxy/mgmt2/api2/CfgContextImpl.cc
trafficserver/traffic/trunk/proxy/mgmt2/api2/CoreAPI.cc
trafficserver/traffic/trunk/proxy/mgmt2/api2/CoreAPIShared.cc
trafficserver/traffic/trunk/proxy/mgmt2/api2/GenericParser.cc
trafficserver/traffic/trunk/proxy/mgmt2/api2/INKMgmtAPI.cc
trafficserver/traffic/trunk/proxy/mgmt2/api2/TSControlMain.cc
trafficserver/traffic/trunk/proxy/mgmt2/api2/remote/APITestCliRemote.cc
trafficserver/traffic/trunk/proxy/mgmt2/api2/remote/CoreAPIRemote.cc
trafficserver/traffic/trunk/proxy/mgmt2/api2/remote/NetworkUtilsRemote.cc
trafficserver/traffic/trunk/proxy/mgmt2/cli2/CliCreateCommands.cc
trafficserver/traffic/trunk/proxy/mgmt2/cli2/ConfigCmd.cc
trafficserver/traffic/trunk/proxy/mgmt2/cli2/ConfigUpgradeReadCmd.cc
trafficserver/traffic/trunk/proxy/mgmt2/cli2/ConfigUpgradeWriteCmd.cc
trafficserver/traffic/trunk/proxy/mgmt2/cli2/ShowCmd.cc
trafficserver/traffic/trunk/proxy/mgmt2/cli2/cliParseArg.cc
trafficserver/traffic/trunk/proxy/mgmt2/cli2/hashtable.cc
trafficserver/traffic/trunk/proxy/mgmt2/cli2/processArgument.cc
trafficserver/traffic/trunk/proxy/mgmt2/stats/StatProcessor.cc
trafficserver/traffic/trunk/proxy/mgmt2/stats/StatType.cc
trafficserver/traffic/trunk/proxy/mgmt2/web2/WebHttpMessage.cc
trafficserver/traffic/trunk/proxy/mgmt2/web2/WebReconfig.cc
Modified: trafficserver/traffic/trunk/proxy/mgmt2/api2/CfgContextImpl.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/mgmt2/api2/CfgContextImpl.cc?rev=982078&r1=982077&r2=982078&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/mgmt2/api2/CfgContextImpl.cc (original)
+++ trafficserver/traffic/trunk/proxy/mgmt2/api2/CfgContextImpl.cc Tue Aug 3 23:22:41 2010
@@ -2156,8 +2156,6 @@ RemapObj::RemapObj(INKRemapEle * ele)
RemapObj::RemapObj(TokenList * tokens)
{
Token *token;
- int numFromTok;
- int numToTok;
short current; // current token index
Tokenizer fromTok(":/");
Tokenizer toTok(":/");
@@ -2184,7 +2182,8 @@ RemapObj::RemapObj(TokenList * tokens)
if (!ccu_checkUrl(token->name)) {
goto FORMAT_ERR;
}
- numFromTok = fromTok.Initialize(token->name, ALLOW_EMPTY_TOKS); // allow empty token for parse sanity check
+
+ fromTok.Initialize(token->name, ALLOW_EMPTY_TOKS); // allow empty token for parse sanity check
if (strcmp(fromTok[0], "http") == 0) {
m_ele->from_scheme = INK_SCHEME_HTTP;
} else if (strcmp(fromTok[0], "https") == 0) {
@@ -2241,8 +2240,8 @@ RemapObj::RemapObj(TokenList * tokens)
if (!ccu_checkUrl(token->value)) {
goto FORMAT_ERR;
}
- numToTok = toTok.Initialize(token->value, ALLOW_EMPTY_TOKS); // allow empty token for parse sanity check
+ toTok.Initialize(token->value, ALLOW_EMPTY_TOKS); // allow empty token for parse sanity check
if (strcmp(toTok[0], "http") == 0) {
m_ele->to_scheme = INK_SCHEME_HTTP;
} else if (strcmp(toTok[0], "https") == 0) {
Modified: trafficserver/traffic/trunk/proxy/mgmt2/api2/CoreAPI.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/mgmt2/api2/CoreAPI.cc?rev=982078&r1=982077&r2=982078&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/mgmt2/api2/CoreAPI.cc (original)
+++ trafficserver/traffic/trunk/proxy/mgmt2/api2/CoreAPI.cc Tue Aug 3 23:22:41 2010
@@ -69,6 +69,7 @@ INKActionNeedT determine_action_need(con
INKError
Init(const char *socket_path)
{
+ NOWARN_UNUSED(socket_path);
// socket_path should be null; only applies to remote clients
local_event_callbacks = create_callback_table("local_callbacks");
if (!local_event_callbacks)
@@ -670,6 +671,8 @@ WriteFile(INKFileNameT file, char *text,
INKError
EventSignal(char *event_name, va_list ap)
{
+ NOWARN_UNUSED(event_name);
+ NOWARN_UNUSED(ap);
//char *text;
//int id;
@@ -948,6 +951,8 @@ StatsReset()
INKError
EncryptToFile(const char *passwd, const char *filepath)
{
+ NOWARN_UNUSED(passwd);
+ NOWARN_UNUSED(filepath);
//AuthString fileAuthStr(filepath);
//AuthString passwdAuthStr(passwd);
/*if (!AccCrypto::encryptToFile(fileAuthStr, passwdAuthStr)) {
Modified: trafficserver/traffic/trunk/proxy/mgmt2/api2/CoreAPIShared.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/mgmt2/api2/CoreAPIShared.cc?rev=982078&r1=982077&r2=982078&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/mgmt2/api2/CoreAPIShared.cc (original)
+++ trafficserver/traffic/trunk/proxy/mgmt2/api2/CoreAPIShared.cc Tue Aug 3 23:22:41 2010
@@ -220,6 +220,7 @@ error: /* "Houst
int
connectDirect(const char *host, int port, uint64 timeout)
{
+ NOWARN_UNUSED(timeout);
#ifdef _WIN32
TimedIOStatus ret;
#endif
Modified: trafficserver/traffic/trunk/proxy/mgmt2/api2/GenericParser.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/mgmt2/api2/GenericParser.cc?rev=982078&r1=982077&r2=982078&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/mgmt2/api2/GenericParser.cc (original)
+++ trafficserver/traffic/trunk/proxy/mgmt2/api2/GenericParser.cc Tue Aug 3 23:22:41 2010
@@ -78,6 +78,7 @@ Token::appendValue(const char *str)
{
char *str_copy = (char *) strtrim(str);
static bool firstTime = true;
+
if (value == NULL) {
setValue(str_copy);
} else {
@@ -116,6 +117,7 @@ TokenList::TokenList():length(0)
TokenList::~TokenList()
{
Token *token = NULL;
+
while ((token = dequeue())) {
delete(token);
}
@@ -140,9 +142,9 @@ TokenList::Print()
* driectly, the get/set member functions are used for data encapsulation.
***************************************************************************/
-Rule::Rule():
-tokenList(NULL),
-m_filetype(INK_FNAME_UNDEFINED), m_filename(NULL), m_ruleStr(NULL), m_comment(NULL), m_errorHint(NULL), m_lineNum(0)
+Rule::Rule()
+ : tokenList(NULL),
+ m_filetype(INK_FNAME_UNDEFINED), m_filename(NULL), m_ruleStr(NULL), m_comment(NULL), m_errorHint(NULL), m_lineNum(0)
{
}
@@ -306,6 +308,7 @@ Rule::arm_securityParse(char *rule)
Token *
Rule::bypassSubParse(char *rule, unsigned short minNumToken, unsigned short maxNumToken)
{
+ NOWARN_UNUSED(maxNumToken);
Tokenizer ruleTok(" \t");
int numRuleTok = ruleTok.Initialize(rule);
tok_iter_state ruleTok_state;
@@ -339,6 +342,7 @@ Rule::bypassSubParse(char *rule, unsigne
TokenList *
Rule::bypassParse(char *rule, unsigned short minNumToken, unsigned short maxNumToken)
{
+ NOWARN_UNUSED(maxNumToken);
Tokenizer ruleTok(" \t");
int numRuleTok = ruleTok.Initialize(rule);
tok_iter_state ruleTok_state;
@@ -595,6 +599,7 @@ Rule::ipnatParse(char *rule)
TokenList *
Rule::logsParse(char *rule)
{
+ NOWARN_UNUSED(rule);
return NULL;
}
@@ -624,6 +629,7 @@ Rule::log_hostsParse(char *rule)
TokenList *
Rule::logs_xmlParse(char *rule)
{
+ NOWARN_UNUSED(rule);
return NULL;
}
@@ -1044,7 +1050,8 @@ bool Rule::inQuote(const char *str)
* continue parsing each rule.
* NOTE: a rule that spans more than one line would be a problem in here.
***************************************************************************/
-RuleList::RuleList():length(0), m_filename(NULL)
+RuleList::RuleList()
+ : length(0), m_filename(NULL)
{
m_filetype = INK_FNAME_UNDEFINED;
}
@@ -1067,7 +1074,7 @@ RuleList::Print()
for (Rule * rule = first(); rule; rule = next(rule)) {
rule->Print();
}
- printf("length: %d\n", length);
+ printf("length: %u\n", length);
}
/*
@@ -1188,7 +1195,7 @@ RuleList::parse(char *fileBuf, INKFileNa
line = lineTok.iterNext(&lineTok_state);
}
//this->Print();
-};
+}
/***************************************************************************
Modified: trafficserver/traffic/trunk/proxy/mgmt2/api2/INKMgmtAPI.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/mgmt2/api2/INKMgmtAPI.cc?rev=982078&r1=982077&r2=982078&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/mgmt2/api2/INKMgmtAPI.cc (original)
+++ trafficserver/traffic/trunk/proxy/mgmt2/api2/INKMgmtAPI.cc Tue Aug 3 23:22:41 2010
@@ -2004,22 +2004,30 @@ INKTerminate()
inkexp extern void
INKPluginInit(int argc, const char *argv[])
{
+ NOWARN_UNUSED(argc);
+ NOWARN_UNUSED(argv);
}
/*--- network operations --------------------------------------------------*/
inkapi INKError
INKConnect(INKIpAddr ip_addr, int port)
{
+ NOWARN_UNUSED(ip_addr);
+ NOWARN_UNUSED(port);
return INK_ERR_OKAY;
}
inkapi INKError
INKDisconnectCbRegister(INKDisconnectFunc * func, void *data)
{
+ NOWARN_UNUSED(func);
+ NOWARN_UNUSED(data);
return INK_ERR_OKAY;
}
inkapi INKError
INKDisconnectRetrySet(int retries, int retry_sleep_msec)
{
+ NOWARN_UNUSED(retries);
+ NOWARN_UNUSED(retry_sleep_msec);
return INK_ERR_OKAY;
}
inkapi INKError
@@ -2624,6 +2632,7 @@ INKCfgContextDestroy(INKCfgContext ctx)
inkapi INKError
INKCfgContextCommit(INKCfgContext ctx, INKActionNeedT * action_need, INKIntList errRules)
{
+ NOWARN_UNUSED(action_need);
return (CfgContextCommit((CfgContext *) ctx, (LLQ *) errRules));
}
@@ -3372,6 +3381,7 @@ INKSetHostname(INKString hostname)
inkapi INKError
INKSetGateway(INKString gateway_ip)
{
+ NOWARN_UNUSED(gateway_ip);
//Nothing to be done for now
return INK_ERR_OKAY;
@@ -3380,6 +3390,7 @@ INKSetGateway(INKString gateway_ip)
inkapi INKError
INKSetDNSServers(INKString dns_ips)
{
+ NOWARN_UNUSED(dns_ips);
//Nothing to be done for now
return INK_ERR_OKAY;
@@ -3389,6 +3400,13 @@ inkapi INKError
INKSetNICUp(INKString nic_name, bool static_ip, INKString ip, INKString old_ip, INKString netmask, bool onboot,
INKString gateway_ip)
{
+ NOWARN_UNUSED(nic_name);
+ NOWARN_UNUSED(static_ip);
+ NOWARN_UNUSED(ip);
+ NOWARN_UNUSED(old_ip);
+ NOWARN_UNUSED(netmask);
+ NOWARN_UNUSED(onboot);
+ NOWARN_UNUSED(gateway_ip);
/* there is no ipnat conf file anymore,
commenting out the rest of this function */
return INK_ERR_READ_FILE;
@@ -3482,6 +3500,7 @@ INKSetNICUp(INKString nic_name, bool sta
inkapi INKError
INKSetProxyPort(INKString proxy_port)
{
+ NOWARN_UNUSED(proxy_port);
/* there is no ipnat.conf file anymore,
commenting out the rest of this function */
return INK_ERR_READ_FILE;
@@ -3537,6 +3556,8 @@ INKSetProxyPort(INKString proxy_port)
inkapi INKError
INKSetNICDown(INKString nic_name, INKString ip_addrr)
{
+ NOWARN_UNUSED(nic_name);
+ NOWARN_UNUSED(ip_addrr);
/* there is no ipnat.conf file anymore,
commenting out the rest of this function */
return INK_ERR_READ_FILE;
@@ -3603,6 +3624,7 @@ INKSetNICDown(INKString nic_name, INKStr
inkapi INKError
INKSetSearchDomain(const char *search_name)
{
+ NOWARN_UNUSED(search_name);
//Nothing to be done for now
return INK_ERR_OKAY;
}
@@ -3712,6 +3734,7 @@ Lerror:
inkapi INKError
INKSetPNA_RDT_Port(const int port)
{
+ NOWARN_UNUSED(port);
/* there is no ipnat conf file anymore,
commenting out the rest of this function */
return INK_ERR_READ_FILE;
Modified: trafficserver/traffic/trunk/proxy/mgmt2/api2/TSControlMain.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/mgmt2/api2/TSControlMain.cc?rev=982078&r1=982077&r2=982078&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/mgmt2/api2/TSControlMain.cc (original)
+++ trafficserver/traffic/trunk/proxy/mgmt2/api2/TSControlMain.cc Tue Aug 3 23:22:41 2010
@@ -956,6 +956,8 @@ handle_snapshot_get_mlt(struct SocketInf
void
handle_diags(struct SocketInfo sock_info, char *req)
{
+ NOWARN_UNUSED(sock_info);
+ NOWARN_UNUSED(req);
INKError ret;
INKDiagsT mode;
char *diag_msg = NULL;
Modified: trafficserver/traffic/trunk/proxy/mgmt2/api2/remote/APITestCliRemote.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/mgmt2/api2/remote/APITestCliRemote.cc?rev=982078&r1=982077&r2=982078&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/mgmt2/api2/remote/APITestCliRemote.cc (original)
+++ trafficserver/traffic/trunk/proxy/mgmt2/api2/remote/APITestCliRemote.cc Tue Aug 3 23:22:41 2010
@@ -114,6 +114,8 @@
#define TEST_REC_GET 0
#define TEST_REC_GET_2 0
+#define SET_INT 0
+
// set to 1 if running as part of installation package
// set to 0 if being tested in developer environment
#define INSTALL_TEST 0
@@ -2251,6 +2253,8 @@ try_resolve(char *event_name)
void
eventCallbackFn(char *name, char *msg, int pri, void *data)
{
+ NOWARN_UNUSED(pri);
+ NOWARN_UNUSED(data);
printf("[eventCallbackFn] EVENT: %s, %s\n", name, msg);
return;
}
Modified: trafficserver/traffic/trunk/proxy/mgmt2/api2/remote/CoreAPIRemote.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/mgmt2/api2/remote/CoreAPIRemote.cc?rev=982078&r1=982077&r2=982078&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/mgmt2/api2/remote/CoreAPIRemote.cc (original)
+++ trafficserver/traffic/trunk/proxy/mgmt2/api2/remote/CoreAPIRemote.cc Tue Aug 3 23:22:41 2010
@@ -236,6 +236,7 @@ start_binary(const char *abs_bin_path)
void
terminate_signal(int sig)
{
+ NOWARN_UNUSED(sig);
//fprintf(stderr, "[terminate_signal] received SIGUSR1 signal\n");
return;
}
@@ -628,6 +629,8 @@ WriteFile(INKFileNameT file, char *text,
INKError
EventSignal(char *event_name, va_list ap)
{
+ NOWARN_UNUSED(event_name);
+ NOWARN_UNUSED(ap);
return INK_ERR_FAIL;
}
Modified: trafficserver/traffic/trunk/proxy/mgmt2/api2/remote/NetworkUtilsRemote.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/mgmt2/api2/remote/NetworkUtilsRemote.cc?rev=982078&r1=982077&r2=982078&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/mgmt2/api2/remote/NetworkUtilsRemote.cc (original)
+++ trafficserver/traffic/trunk/proxy/mgmt2/api2/remote/NetworkUtilsRemote.cc Tue Aug 3 23:22:41 2010
@@ -448,6 +448,7 @@ socket_write_conn(int fd, const char *ms
void *
socket_test_thread(void *arg)
{
+ NOWARN_UNUSED(arg);
// loop until client process dies
while (1) {
if (socket_test(main_socket_fd) <= 0) {
Modified: trafficserver/traffic/trunk/proxy/mgmt2/cli2/CliCreateCommands.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/mgmt2/cli2/CliCreateCommands.cc?rev=982078&r1=982077&r2=982078&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/mgmt2/cli2/CliCreateCommands.cc (original)
+++ trafficserver/traffic/trunk/proxy/mgmt2/cli2/CliCreateCommands.cc Tue Aug 3 23:22:41 2010
@@ -85,12 +85,6 @@ CliCreateCommands()
createCommand("show:snmp", Cmd_ShowSnmp, NULL, CLI_COMMAND_EXTERNAL, "show:snmp", "SNMP configuration");
- createCommand("show:ldap", Cmd_ShowLdap, CmdArgs_ShowLdap, CLI_COMMAND_EXTERNAL, "show:ldap", "LDAP configuration");
-
- createCommand("show:ldap-stats", Cmd_ShowLdapStats, NULL, CLI_COMMAND_EXTERNAL,
- "show:ldap-stats", "LDAP statistics configuration");
-
-
createCommand("show:socks", Cmd_ShowSocks, CmdArgs_ShowSocks, CLI_COMMAND_EXTERNAL,
"show:socks", "SOCKS configuration");
Modified: trafficserver/traffic/trunk/proxy/mgmt2/cli2/ConfigCmd.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/mgmt2/cli2/ConfigCmd.cc?rev=982078&r1=982077&r2=982078&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/mgmt2/cli2/ConfigCmd.cc (original)
+++ trafficserver/traffic/trunk/proxy/mgmt2/cli2/ConfigCmd.cc Tue Aug 3 23:22:41 2010
@@ -218,6 +218,7 @@ CmdArgs_Enable()
int
Cmd_Disable(ClientData clientData, Tcl_Interp * interp, int argc, const char *argv[])
{
+ NOWARN_UNUSED(clientData);
/* call to processArgForCommand must appear at the beginning
* of each command's callback function
*/
@@ -253,6 +254,7 @@ Cmd_Disable(ClientData clientData, Tcl_I
int
Cmd_Config(ClientData clientData, Tcl_Interp * interp, int argc, const char *argv[])
{
+ NOWARN_UNUSED(clientData);
/* call to processArgForCommand must appear at the beginning
* of each command's callback function
*/
@@ -340,11 +342,8 @@ Cmd_ConfigGet(ClientData clientData, Tcl
return CMD_ERROR;
}
cli_cmdCallbackInfo *cmdCallbackInfo;
- cli_parsedArgInfo *argtable, *infoPtr;
cmdCallbackInfo = (cli_cmdCallbackInfo *) clientData;
- argtable = cmdCallbackInfo->parsedArgTable;
- infoPtr = argtable;
Cli_Debug("Cmd_ConfigGet argc %d\n", argc);
@@ -383,11 +382,8 @@ Cmd_ConfigSet(ClientData clientData, Tcl
return CMD_ERROR;
}
cli_cmdCallbackInfo *cmdCallbackInfo;
- cli_parsedArgInfo *argtable, *infoPtr;
cmdCallbackInfo = (cli_cmdCallbackInfo *) clientData;
- argtable = cmdCallbackInfo->parsedArgTable;
- infoPtr = argtable;
Cli_Debug("Cmd_ConfigSet argc %d\n", argc);
@@ -426,11 +422,8 @@ Cmd_ConfigName(ClientData clientData, Tc
return CMD_ERROR;
}
cli_cmdCallbackInfo *cmdCallbackInfo;
- cli_parsedArgInfo *argtable, *infoPtr;
cmdCallbackInfo = (cli_cmdCallbackInfo *) clientData;
- argtable = cmdCallbackInfo->parsedArgTable;
- infoPtr = argtable;
Cli_Debug("Cmd_ConfigName argc %d\n", argc);
@@ -470,11 +463,8 @@ Cmd_ConfigStart(ClientData clientData, T
}
cli_cmdCallbackInfo *cmdCallbackInfo;
- cli_parsedArgInfo *argtable, *infoPtr;
cmdCallbackInfo = (cli_cmdCallbackInfo *) clientData;
- argtable = cmdCallbackInfo->parsedArgTable;
- infoPtr = argtable;
Cli_Debug("Cmd_ConfigStart argc %d\n", argc);
@@ -513,11 +503,8 @@ Cmd_ConfigStop(ClientData clientData, Tc
}
cli_cmdCallbackInfo *cmdCallbackInfo;
- cli_parsedArgInfo *argtable, *infoPtr;
cmdCallbackInfo = (cli_cmdCallbackInfo *) clientData;
- argtable = cmdCallbackInfo->parsedArgTable;
- infoPtr = argtable;
Cli_Debug("Cmd_ConfigStop argc %d\n", argc);
if (argc == 1) {
@@ -555,11 +542,8 @@ Cmd_ConfigHardRestart(ClientData clientD
}
cli_cmdCallbackInfo *cmdCallbackInfo;
- cli_parsedArgInfo *argtable, *infoPtr;
cmdCallbackInfo = (cli_cmdCallbackInfo *) clientData;
- argtable = cmdCallbackInfo->parsedArgTable;
- infoPtr = argtable;
Cli_Debug("Cmd_ConfigHardRestart argc %d\n", argc);
if (argc == 1) {
@@ -597,11 +581,10 @@ Cmd_ConfigRestart(ClientData clientData,
}
cli_cmdCallbackInfo *cmdCallbackInfo;
- cli_parsedArgInfo *argtable, *infoPtr;
+ cli_parsedArgInfo *argtable;
cmdCallbackInfo = (cli_cmdCallbackInfo *) clientData;
argtable = cmdCallbackInfo->parsedArgTable;
- infoPtr = argtable;
Cli_Debug("Cmd_ConfigRestart argc %d\n", argc);
if (argc == 1) {
@@ -657,11 +640,8 @@ Cmd_ConfigFilter(ClientData clientData,
return CMD_ERROR;
}
cli_cmdCallbackInfo *cmdCallbackInfo;
- cli_parsedArgInfo *argtable, *infoPtr;
cmdCallbackInfo = (cli_cmdCallbackInfo *) clientData;
- argtable = cmdCallbackInfo->parsedArgTable;
- infoPtr = argtable;
Cli_Debug("Cmd_ConfigFilter argc %d\n", argc);
@@ -777,12 +757,8 @@ Cmd_ConfigRemap(ClientData clientData, T
return CMD_ERROR;
}
cli_cmdCallbackInfo *cmdCallbackInfo;
- cli_parsedArgInfo *argtable, *infoPtr;
cmdCallbackInfo = (cli_cmdCallbackInfo *) clientData;
- argtable = cmdCallbackInfo->parsedArgTable;
- infoPtr = argtable;
-
Cli_Debug("Cmd_ConfigRemap argc %d\n", argc);
if (argc == 2) {
@@ -824,12 +800,10 @@ Cmd_ConfigPorts(ClientData clientData, T
Cli_Debug("Cmd_ConfigPorts argc %d\n", argc);
cli_cmdCallbackInfo *cmdCallbackInfo;
- cli_parsedArgInfo *argtable, *infoPtr;
+ cli_parsedArgInfo *argtable;
cmdCallbackInfo = (cli_cmdCallbackInfo *) clientData;
argtable = cmdCallbackInfo->parsedArgTable;
- infoPtr = argtable;
-
Cli_Debug("Cmd_ConfigPorts argc %d\n", argc);
@@ -920,11 +894,10 @@ Cmd_ConfigSnmp(ClientData clientData, Tc
Cli_Debug("Cmd_ConfigSnmp argc %d\n", argc);
cli_cmdCallbackInfo *cmdCallbackInfo;
- cli_parsedArgInfo *argtable, *infoPtr;
+ cli_parsedArgInfo *argtable;
cmdCallbackInfo = (cli_cmdCallbackInfo *) clientData;
argtable = cmdCallbackInfo->parsedArgTable;
- infoPtr = argtable;
if (argtable->parsed_args != CLI_PARSED_ARGV_END) {
if (argtable->parsed_args == CMD_CONFIG_SNMP_STATUS) {
@@ -978,11 +951,10 @@ Cmd_ConfigLdap(ClientData clientData, Tc
Cli_Debug("Cmd_ConfigLdap argc %d\n", argc);
cli_cmdCallbackInfo *cmdCallbackInfo;
- cli_parsedArgInfo *argtable, *infoPtr;
+ cli_parsedArgInfo *argtable;
cmdCallbackInfo = (cli_cmdCallbackInfo *) clientData;
argtable = cmdCallbackInfo->parsedArgTable;
- infoPtr = argtable;
int action = (argc == 3) ? RECORD_SET : RECORD_GET;
@@ -1081,11 +1053,10 @@ Cmd_ConfigClock(ClientData clientData, T
Cli_Debug("Cmd_ConfigClock argc %d\n", argc);
cli_cmdCallbackInfo *cmdCallbackInfo;
- cli_parsedArgInfo *argtable, *infoPtr;
+ cli_parsedArgInfo *argtable;
cmdCallbackInfo = (cli_cmdCallbackInfo *) clientData;
argtable = cmdCallbackInfo->parsedArgTable;
- infoPtr = argtable;
Cli_PrintArg(0, argtable);
Cli_PrintArg(1, argtable);
@@ -1166,11 +1137,10 @@ Cmd_ConfigSecurity(ClientData clientData
cli_cmdCallbackInfo *cmdCallbackInfo;
- cli_parsedArgInfo *argtable, *infoPtr;
+ cli_parsedArgInfo *argtable;
cmdCallbackInfo = (cli_cmdCallbackInfo *) clientData;
argtable = cmdCallbackInfo->parsedArgTable;
- infoPtr = argtable;
if (argtable[0].parsed_args != CLI_PARSED_ARGV_END) {
switch (argtable[0].parsed_args) {
@@ -1243,11 +1213,10 @@ Cmd_ConfigHttp(ClientData clientData, Tc
Cli_Debug("Cmd_ConfigHttp argc %d\n", argc);
cli_cmdCallbackInfo *cmdCallbackInfo;
- cli_parsedArgInfo *argtable, *infoPtr;
+ cli_parsedArgInfo *argtable;
cmdCallbackInfo = (cli_cmdCallbackInfo *) clientData;
argtable = cmdCallbackInfo->parsedArgTable;
- infoPtr = argtable;
if (argc == 3) {
setvar = 1;
@@ -1408,11 +1377,10 @@ Cmd_ConfigIcp(ClientData clientData, Tcl
Cli_Debug("Cmd_ConfigIcp argc %d\n", argc);
cli_cmdCallbackInfo *cmdCallbackInfo;
- cli_parsedArgInfo *argtable, *infoPtr;
+ cli_parsedArgInfo *argtable;
cmdCallbackInfo = (cli_cmdCallbackInfo *) clientData;
argtable = cmdCallbackInfo->parsedArgTable;
- infoPtr = argtable;
int action = (argc == 3) ? RECORD_SET : RECORD_GET;
@@ -1657,11 +1625,10 @@ Cmd_ConfigSocks(ClientData clientData, T
}
Cli_Debug("Cmd_ConfigSocks argc %d\n", argc);
cli_cmdCallbackInfo *cmdCallbackInfo;
- cli_parsedArgInfo *argtable, *infoPtr;
+ cli_parsedArgInfo *argtable;
cmdCallbackInfo = (cli_cmdCallbackInfo *) clientData;
argtable = cmdCallbackInfo->parsedArgTable;
- infoPtr = argtable;
int action = (argc == 3) ? RECORD_SET : RECORD_GET;
@@ -1744,12 +1711,10 @@ Cmd_ConfigCache(ClientData clientData, T
Cli_Debug("Cmd_ConfigCache argc %d\n", argc);
cli_cmdCallbackInfo *cmdCallbackInfo;
- cli_parsedArgInfo *argtable, *infoPtr;
+ cli_parsedArgInfo *argtable;
cmdCallbackInfo = (cli_cmdCallbackInfo *) clientData;
argtable = cmdCallbackInfo->parsedArgTable;
- infoPtr = argtable;
-
int action = 0;
@@ -1964,11 +1929,10 @@ Cmd_ConfigHostdb(ClientData clientData,
Cli_Debug("Cmd_ConfigHostdb argc %d\n", argc);
cli_cmdCallbackInfo *cmdCallbackInfo;
- cli_parsedArgInfo *argtable, *infoPtr;
+ cli_parsedArgInfo *argtable;
cmdCallbackInfo = (cli_cmdCallbackInfo *) clientData;
argtable = cmdCallbackInfo->parsedArgTable;
- infoPtr = argtable;
int action = (argc == 3) ? RECORD_SET : RECORD_GET;
@@ -2050,11 +2014,10 @@ Cmd_ConfigDns(ClientData clientData, Tcl
Cli_Debug("Cmd_ConfigDns argc %d\n", argc);
cli_cmdCallbackInfo *cmdCallbackInfo;
- cli_parsedArgInfo *argtable, *infoPtr;
+ cli_parsedArgInfo *argtable;
cmdCallbackInfo = (cli_cmdCallbackInfo *) clientData;
argtable = cmdCallbackInfo->parsedArgTable;
- infoPtr = argtable;
int action = (argc == 3) ? RECORD_SET : RECORD_GET;
@@ -2127,11 +2090,10 @@ Cmd_ConfigVirtualip(ClientData clientDat
Cli_Debug("Cmd_ConfigCache argc %d\n", argc);
cli_cmdCallbackInfo *cmdCallbackInfo;
- cli_parsedArgInfo *argtable, *infoPtr;
+ cli_parsedArgInfo *argtable;
cmdCallbackInfo = (cli_cmdCallbackInfo *) clientData;
argtable = cmdCallbackInfo->parsedArgTable;
- infoPtr = argtable;
int setvar = 0;
@@ -2231,11 +2193,10 @@ Cmd_ConfigLogging(ClientData clientData,
Cli_Debug("Cmd_ConfigCache argc %d\n", argc);
cli_cmdCallbackInfo *cmdCallbackInfo;
- cli_parsedArgInfo *argtable, *infoPtr;
+ cli_parsedArgInfo *argtable;
cmdCallbackInfo = (cli_cmdCallbackInfo *) clientData;
argtable = cmdCallbackInfo->parsedArgTable;
- infoPtr = argtable;
int setvar = 0;
@@ -2479,11 +2440,10 @@ Cmd_ConfigSsl(ClientData clientData, Tcl
Cli_Debug("Cmd_ConfigSsl argc %d\n", argc);
cli_cmdCallbackInfo *cmdCallbackInfo;
- cli_parsedArgInfo *argtable, *infoPtr;
+ cli_parsedArgInfo *argtable;
cmdCallbackInfo = (cli_cmdCallbackInfo *) clientData;
argtable = cmdCallbackInfo->parsedArgTable;
- infoPtr = argtable;
int action = (argc == 3) ? RECORD_SET : RECORD_GET;
@@ -2549,11 +2509,10 @@ Cmd_ConfigAlarm(ClientData clientData, T
Cli_Debug("Cmd_ConfigAlarm argc %d\n", argc);
cli_cmdCallbackInfo *cmdCallbackInfo;
- cli_parsedArgInfo *argtable, *infoPtr;
+ cli_parsedArgInfo *argtable;
cmdCallbackInfo = (cli_cmdCallbackInfo *) clientData;
argtable = cmdCallbackInfo->parsedArgTable;
- infoPtr = argtable;
if (argtable->parsed_args != CLI_PARSED_ARGV_END) {
switch (argtable->parsed_args) {
@@ -4561,6 +4520,7 @@ setnameserver(char *nameserver)
int
setrouter(char *router, int len)
{
+ NOWARN_UNUSED(len);
FILE *fstr;
if ((fstr = fopen(DEFAULTROUTER_PATH, "wb")) == NULL) {
return -1;
Modified: trafficserver/traffic/trunk/proxy/mgmt2/cli2/ConfigUpgradeReadCmd.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/mgmt2/cli2/ConfigUpgradeReadCmd.cc?rev=982078&r1=982077&r2=982078&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/mgmt2/cli2/ConfigUpgradeReadCmd.cc (original)
+++ trafficserver/traffic/trunk/proxy/mgmt2/cli2/ConfigUpgradeReadCmd.cc Tue Aug 3 23:22:41 2010
@@ -352,11 +352,10 @@ Cmd_ConfigRead(ClientData clientData, Tc
}
*/
cli_cmdCallbackInfo *cmdCallbackInfo;
- cli_parsedArgInfo *argtable, *infoPtr;
+ cli_parsedArgInfo *argtable;
cmdCallbackInfo = (cli_cmdCallbackInfo *) clientData;
argtable = cmdCallbackInfo->parsedArgTable;
- infoPtr = argtable;
Cli_Debug("Cmd_ConfigRead argc %d\n", argc);
if (CIFCWriteEntry::ConfigWriteCheckIFCEnv() == INK_ERR_READ_FILE) {
Modified: trafficserver/traffic/trunk/proxy/mgmt2/cli2/ConfigUpgradeWriteCmd.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/mgmt2/cli2/ConfigUpgradeWriteCmd.cc?rev=982078&r1=982077&r2=982078&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/mgmt2/cli2/ConfigUpgradeWriteCmd.cc (original)
+++ trafficserver/traffic/trunk/proxy/mgmt2/cli2/ConfigUpgradeWriteCmd.cc Tue Aug 3 23:22:41 2010
@@ -420,11 +420,10 @@ Cmd_ConfigWrite(ClientData clientData, T
} */
cli_cmdCallbackInfo *cmdCallbackInfo;
- cli_parsedArgInfo *argtable, *infoPtr;
+ cli_parsedArgInfo *argtable;
cmdCallbackInfo = (cli_cmdCallbackInfo *) clientData;
argtable = cmdCallbackInfo->parsedArgTable;
- infoPtr = argtable;
Cli_Debug("Cmd_ConfigWrite argc %d\n", argc);
if (CIFCWriteEntry::ConfigWriteCheckIFCEnv() == INK_ERR_READ_FILE) {
Modified: trafficserver/traffic/trunk/proxy/mgmt2/cli2/ShowCmd.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/mgmt2/cli2/ShowCmd.cc?rev=982078&r1=982077&r2=982078&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/mgmt2/cli2/ShowCmd.cc (original)
+++ trafficserver/traffic/trunk/proxy/mgmt2/cli2/ShowCmd.cc Tue Aug 3 23:22:41 2010
@@ -54,6 +54,7 @@
int
Cmd_Show(ClientData clientData, Tcl_Interp * interp, int argc, const char *argv[])
{
+ NOWARN_UNUSED(clientData);
/* call to processArgForCommand must appear at the beginning
* of each command's callback function
*/
@@ -111,6 +112,7 @@ Cmd_Show(ClientData clientData, Tcl_Inte
int
Cmd_ShowStatus(ClientData clientData, Tcl_Interp * interp, int argc, const char *argv[])
{
+ NOWARN_UNUSED(clientData);
/* call to processArgForCommand must appear at the beginning
* of each command's callback function
*/
@@ -140,6 +142,7 @@ Cmd_ShowStatus(ClientData clientData, Tc
int
Cmd_ShowVersion(ClientData clientData, Tcl_Interp * interp, int argc, const char *argv[])
{
+ NOWARN_UNUSED(clientData);
/* call to processArgForCommand must appear at the beginning
* of each command's callback function
*/
@@ -169,6 +172,7 @@ Cmd_ShowVersion(ClientData clientData, T
int
Cmd_ShowPorts(ClientData clientData, Tcl_Interp * interp, int argc, const char *argv[])
{
+ NOWARN_UNUSED(clientData);
/* call to processArgForCommand must appear at the beginning
* of each command's callback function
*/
@@ -199,6 +203,7 @@ Cmd_ShowPorts(ClientData clientData, Tcl
int
Cmd_ShowCluster(ClientData clientData, Tcl_Interp * interp, int argc, const char *argv[])
{
+ NOWARN_UNUSED(clientData);
/* call to processArgForCommand must appear at the beginning
* of each command's callback function
*/
@@ -228,6 +233,7 @@ Cmd_ShowCluster(ClientData clientData, T
int
Cmd_ShowSecurity(ClientData clientData, Tcl_Interp * interp, int argc, const char *argv[])
{
+ NOWARN_UNUSED(clientData);
/* call to processArgForCommand must appear at the beginning
* of each command's callback function
*/
@@ -257,6 +263,7 @@ Cmd_ShowSecurity(ClientData clientData,
int
Cmd_ShowHttp(ClientData clientData, Tcl_Interp * interp, int argc, const char *argv[])
{
+ NOWARN_UNUSED(clientData);
/* call to processArgForCommand must appear at the beginning
* of each command's callback function
*/
@@ -342,6 +349,7 @@ CmdArgs_ShowIcp()
int
Cmd_ShowProxy(ClientData clientData, Tcl_Interp * interp, int argc, const char *argv[])
{
+ NOWARN_UNUSED(clientData);
/* call to processArgForCommand must appear at the beginning
* of each command's callback function
*/
@@ -432,6 +440,7 @@ CmdArgs_ShowCache()
int
Cmd_ShowVirtualIp(ClientData clientData, Tcl_Interp * interp, int argc, const char *argv[])
{
+ NOWARN_UNUSED(clientData);
/* call to processArgForCommand must appear at the beginning
* of each command's callback function
*/
@@ -461,6 +470,7 @@ Cmd_ShowVirtualIp(ClientData clientData,
int
Cmd_ShowHostDb(ClientData clientData, Tcl_Interp * interp, int argc, const char *argv[])
{
+ NOWARN_UNUSED(clientData);
/* call to processArgForCommand must appear at the beginning
* of each command's callback function
*/
@@ -490,6 +500,7 @@ Cmd_ShowHostDb(ClientData clientData, Tc
int
Cmd_ShowDnsResolver(ClientData clientData, Tcl_Interp * interp, int argc, const char *argv[])
{
+ NOWARN_UNUSED(clientData);
/* call to processArgForCommand must appear at the beginning
* of each command's callback function
*/
@@ -519,6 +530,7 @@ Cmd_ShowDnsResolver(ClientData clientDat
int
Cmd_ShowLogging(ClientData clientData, Tcl_Interp * interp, int argc, const char *argv[])
{
+ NOWARN_UNUSED(clientData);
/* call to processArgForCommand must appear at the beginning
* of each command's callback function
*/
@@ -548,6 +560,7 @@ Cmd_ShowLogging(ClientData clientData, T
int
Cmd_ShowSsl(ClientData clientData, Tcl_Interp * interp, int argc, const char *argv[])
{
+ NOWARN_UNUSED(clientData);
/* call to processArgForCommand must appear at the beginning
* of each command's callback function
*/
@@ -577,6 +590,7 @@ Cmd_ShowSsl(ClientData clientData, Tcl_I
int
Cmd_ShowFilter(ClientData clientData, Tcl_Interp * interp, int argc, const char *argv[])
{
+ NOWARN_UNUSED(clientData);
/* call to processArgForCommand must appear at the beginning
* of each command's callback function
*/
@@ -663,6 +677,7 @@ CmdArgs_ShowParents()
int
Cmd_ShowRemap(ClientData clientData, Tcl_Interp * interp, int argc, const char *argv[])
{
+ NOWARN_UNUSED(clientData);
/* call to processArgForCommand must appear at the beginning
* of each command's callback function
*/
@@ -693,6 +708,7 @@ Cmd_ShowRemap(ClientData clientData, Tcl
int
Cmd_ShowSnmp(ClientData clientData, Tcl_Interp * interp, int argc, const char *argv[])
{
+ NOWARN_UNUSED(clientData);
/* call to processArgForCommand must appear at the beginning
* of each command's callback function
*/
@@ -709,102 +725,6 @@ Cmd_ShowSnmp(ClientData clientData, Tcl_
}
////////////////////////////////////////////////////////////////
-// Cmd_ShowLdap
-//
-// This is the callback function for the "show:ldap" command.
-//
-// Parameters:
-// clientData -- information about parsed arguments
-// interp -- the Tcl interpreter
-// argc -- number of command arguments
-// argv -- the command arguments
-//
-int
-Cmd_ShowLdap(ClientData clientData, Tcl_Interp * interp, int argc, const char *argv[])
-{
- /* call to processArgForCommand must appear at the beginning
- * of each command's callback function
- */
- if (processArgForCommand(interp, argc, argv) != CLI_OK) {
- return CMD_ERROR;
- }
-
- if (processHelpCommand(argc, argv) == CLI_OK)
- return CMD_OK;
-
- Cli_Debug("Cmd_ShowLdap\n");
-
- cli_cmdCallbackInfo *cmdCallbackInfo;
- cli_parsedArgInfo *argtable;
-
- cmdCallbackInfo = (cli_cmdCallbackInfo *) clientData;
- argtable = cmdCallbackInfo->parsedArgTable;
-
- if (argtable[0].parsed_args != CLI_PARSED_ARGV_END) {
- if (argtable[0].parsed_args == CMD_SHOW_LDAP_RULES) {
- return (ShowLdapRules());
- }
-
- Cli_Error(ERR_INVALID_COMMAND);
- return CMD_ERROR;
- }
-
- return (ShowLdap());
-}
-
-////////////////////////////////////////////////////////////////
-// CmdArgs_ShowLdap
-//
-// Register "show:ldap" arguments with the Tcl interpreter.
-//
-int
-CmdArgs_ShowLdap()
-{
- createArgument("rules", 1, CLI_ARGV_CONSTANT,
- (char *) NULL, CMD_SHOW_LDAP_RULES, "Display filter.config rules file (used for LDAP configuration)",
- (char *) NULL);
- return 0;
-}
-
-
-////////////////////////////////////////////////////////////////
-// Cmd_ShowLdapstats
-//
-// This is the callback function for the "show:ldap-stats" command.
-//
-// Parameters:
-// clientData -- information about parsed arguments
-// interp -- the Tcl interpreter
-// argc -- number of command arguments
-// argv -- the command arguments
-//
-int
-Cmd_ShowLdapStats(ClientData clientData, Tcl_Interp * interp, int argc, const char *argv[])
-{
- /* call to processArgForCommand must appear at the beginning
- * of each command's callback function
- */
- if (processArgForCommand(interp, argc, argv) != CLI_OK) {
- return CMD_ERROR;
- }
-
- if (processHelpCommand(argc, argv) == CLI_OK)
- return CMD_OK;
-
- Cli_Debug("Cmd_ShowLdapStats\n");
-
- cli_cmdCallbackInfo *cmdCallbackInfo;
- cli_parsedArgInfo *argtable;
-
- cmdCallbackInfo = (cli_cmdCallbackInfo *) clientData;
- argtable = cmdCallbackInfo->parsedArgTable;
-
- return (ShowLdapStats());
-
-}
-
-
-////////////////////////////////////////////////////////////////
// Cmd_ShowSocks
//
// This is the callback function for the "show:socks" command.
@@ -875,6 +795,7 @@ CmdArgs_ShowSocks()
int
Cmd_ShowPortTunnels(ClientData clientData, Tcl_Interp * interp, int argc, const char *argv[])
{
+ NOWARN_UNUSED(clientData);
/* call to processArgForCommand must appear at the beginning
* of each command's callback function
*/
@@ -961,6 +882,7 @@ CmdArgs_ShowScheduledUpdate()
int
Cmd_ShowProxyStats(ClientData clientData, Tcl_Interp * interp, int argc, const char *argv[])
{
+ NOWARN_UNUSED(clientData);
/* call to processArgForCommand must appear at the beginning
* of each command's callback function
*/
@@ -990,6 +912,7 @@ Cmd_ShowProxyStats(ClientData clientData
int
Cmd_ShowHttpTransStats(ClientData clientData, Tcl_Interp * interp, int argc, const char *argv[])
{
+ NOWARN_UNUSED(clientData);
/* call to processArgForCommand must appear at the beginning
* of each command's callback function
*/
@@ -1019,6 +942,7 @@ Cmd_ShowHttpTransStats(ClientData client
int
Cmd_ShowHttpStats(ClientData clientData, Tcl_Interp * interp, int argc, const char *argv[])
{
+ NOWARN_UNUSED(clientData);
/* call to processArgForCommand must appear at the beginning
* of each command's callback function
*/
@@ -1048,6 +972,7 @@ Cmd_ShowHttpStats(ClientData clientData,
int
Cmd_ShowIcpStats(ClientData clientData, Tcl_Interp * interp, int argc, const char *argv[])
{
+ NOWARN_UNUSED(clientData);
/* call to processArgForCommand must appear at the beginning
* of each command's callback function
*/
@@ -1077,6 +1002,7 @@ Cmd_ShowIcpStats(ClientData clientData,
int
Cmd_ShowCacheStats(ClientData clientData, Tcl_Interp * interp, int argc, const char *argv[])
{
+ NOWARN_UNUSED(clientData);
/* call to processArgForCommand must appear at the beginning
* of each command's callback function
*/
@@ -1106,6 +1032,7 @@ Cmd_ShowCacheStats(ClientData clientData
int
Cmd_ShowHostDbStats(ClientData clientData, Tcl_Interp * interp, int argc, const char *argv[])
{
+ NOWARN_UNUSED(clientData);
/* call to processArgForCommand must appear at the beginning
* of each command's callback function
*/
@@ -1135,6 +1062,7 @@ Cmd_ShowHostDbStats(ClientData clientDat
int
Cmd_ShowDnsStats(ClientData clientData, Tcl_Interp * interp, int argc, const char *argv[])
{
+ NOWARN_UNUSED(clientData);
/* call to processArgForCommand must appear at the beginning
* of each command's callback function
*/
@@ -1164,6 +1092,7 @@ Cmd_ShowDnsStats(ClientData clientData,
int
Cmd_ShowLoggingStats(ClientData clientData, Tcl_Interp * interp, int argc, const char *argv[])
{
+ NOWARN_UNUSED(clientData);
/* call to processArgForCommand must appear at the beginning
* of each command's callback function
*/
@@ -1193,6 +1122,7 @@ Cmd_ShowLoggingStats(ClientData clientDa
int
Cmd_ShowAlarms(ClientData clientData, Tcl_Interp * interp, int argc, const char *argv[])
{
+ NOWARN_UNUSED(clientData);
/* call to processArgForCommand must appear at the beginning
* of each command's callback function
*/
@@ -1214,6 +1144,7 @@ Cmd_ShowAlarms(ClientData clientData, Tc
int
Cmd_ShowRadius(ClientData clientData, Tcl_Interp * interp, int argc, const char *argv[])
{
+ NOWARN_UNUSED(clientData);
/* call to processArgForCommand must appear at the beginning
* of each command's callback function
*/
@@ -1252,6 +1183,7 @@ Cmd_ShowRadius(ClientData clientData, Tc
int
Cmd_ShowNtlm(ClientData clientData, Tcl_Interp * interp, int argc, const char *argv[])
{
+ NOWARN_UNUSED(clientData);
/* call to processArgForCommand must appear at the beginning
* of each command's callback function
*/
@@ -1296,6 +1228,7 @@ Cmd_ShowNtlm(ClientData clientData, Tcl_
int
Cmd_ShowNtlmStats(ClientData clientData, Tcl_Interp * interp, int argc, const char *argv[])
{
+ NOWARN_UNUSED(clientData);
/* call to processArgForCommand must appear at the beginning
* of each command's callback function
*/
@@ -1343,6 +1276,7 @@ Cmd_ShowNtlmStats(ClientData clientData,
int
Cmd_ShowNetwork(ClientData clientData, Tcl_Interp * interp, int argc, const char *argv[])
{
+ NOWARN_UNUSED(clientData);
/* call to processArgForCommand must appear at the beginning
* of each command's callback function
*/
Modified: trafficserver/traffic/trunk/proxy/mgmt2/cli2/cliParseArg.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/mgmt2/cli2/cliParseArg.cc?rev=982078&r1=982077&r2=982078&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/mgmt2/cli2/cliParseArg.cc (original)
+++ trafficserver/traffic/trunk/proxy/mgmt2/cli2/cliParseArg.cc Tue Aug 3 23:22:41 2010
@@ -65,7 +65,6 @@ cliParseArgument(int argc, const char **
int length, i;
char curArg[256], buf[256];
char *endPtr;
- int command_done = 0;
int got_required;
cli_ArgvInfo *argTable = commandInfo->argtable;
char **reqd_args = commandInfo->reqd_args;
@@ -80,7 +79,7 @@ cliParseArgument(int argc, const char **
/* I assume that the first thing will always start with - */
if (argc == 1) {
- int length = strlen(argv[1]);
+ length = strlen(argv[1]);
if ((length >= 2) && ((strncmp(argv[1], "-help", length) == 0) || (strncmp(argv[1], "-h", length) == 0))) {
PrintUsage(interp, commandInfo);
return TCL_OK;
@@ -197,7 +196,6 @@ cliParseArgument(int argc, const char **
Tcl_AppendResult(interp, buf, (char *) NULL);
return TCL_ERROR;
}
- command_done = 1;
break;
case CLI_ARGV_INT:
if (argc <= 0) {
@@ -404,6 +402,7 @@ cliParseArgument(int argc, const char **
static void
PrintUsage(Tcl_Interp * interp, cli_CommandInfo * commandInfo)
{
+ NOWARN_UNUSED(interp);
register cli_ArgvInfo *infoPtr;
cli_ArgvInfo *argTable = commandInfo->argtable;
int width, numSpaces;
Modified: trafficserver/traffic/trunk/proxy/mgmt2/cli2/hashtable.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/mgmt2/cli2/hashtable.cc?rev=982078&r1=982077&r2=982078&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/mgmt2/cli2/hashtable.cc (original)
+++ trafficserver/traffic/trunk/proxy/mgmt2/cli2/hashtable.cc Tue Aug 3 23:22:41 2010
@@ -173,6 +173,7 @@ DestroyOptionHashTable(ClientData client
/* The hash table we are destroying */
/* The interpreter we are destroying */
{
+ NOWARN_UNUSED(interp);
Tcl_HashTable *hashTablePtr = (Tcl_HashTable *) clientData;
Tcl_HashSearch search;
Tcl_HashEntry *hashEntryPtr;
Modified: trafficserver/traffic/trunk/proxy/mgmt2/cli2/processArgument.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/mgmt2/cli2/processArgument.cc?rev=982078&r1=982077&r2=982078&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/mgmt2/cli2/processArgument.cc (original)
+++ trafficserver/traffic/trunk/proxy/mgmt2/cli2/processArgument.cc Tue Aug 3 23:22:41 2010
@@ -24,12 +24,14 @@
#include <tcl.h>
#include "hashtable.h"
#include "definitions.h"
+#include "ink_defs.h"
#include <string.h>
// processArgForCommand
int
processArgForCommand(Tcl_Interp * interp, int argc, const char *argv[])
{
+ NOWARN_UNUSED(interp);
cli_CommandInfo *commandinfo = cliGetCommandArgsfromHashtable((char *) argv[0]);
if (commandinfo == NULL)
Modified: trafficserver/traffic/trunk/proxy/mgmt2/stats/StatProcessor.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/mgmt2/stats/StatProcessor.cc?rev=982078&r1=982077&r2=982078&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/mgmt2/stats/StatProcessor.cc (original)
+++ trafficserver/traffic/trunk/proxy/mgmt2/stats/StatProcessor.cc Tue Aug 3 23:22:41 2010
@@ -48,6 +48,8 @@ bool sumClusterVar;
void
startElement(void *userData, const char *name, const char **atts)
{
+ NOWARN_UNUSED(userData);
+ NOWARN_UNUSED(name);
int i = 0;
if (!strcmp(name, "ink:statistics"))
@@ -62,32 +64,21 @@ startElement(void *userData, const char
currentTag = INVALID_TAG;
switch (currentTag) {
-
case STAT_TAG:
-
statObject = NEW(new StatObject(++statCount));
Debug(MODULE_INIT, "\nStat #: ----------------------- %d -----------------------\n", statCount);
for (i = 0; atts[i]; i += 2) {
-
ink_debug_assert(atts[i + 1]); // Attribute comes in pairs, hopefully.
if (!strcmp(atts[i], "minimum")) {
-
statObject->m_stats_min = (MgmtFloat) atof(atts[i + 1]);
-
} else if (!strcmp(atts[i], "maximum")) {
-
statObject->m_stats_max = (MgmtFloat) atof(atts[i + 1]);
-
} else if (!strcmp(atts[i], "interval")) {
-
statObject->m_update_interval = (ink_hrtime) atoi(atts[i + 1]);
-
} else if (!strcmp(atts[i], "debug")) {
-
statObject->m_debug = (atts[i + 1] && atts[i + 1][0] == '1');
-
}
Debug(MODULE_INIT, "\tDESTINTATION w/ attribute: %s -> %s\n", atts[i], atts[i + 1]);
@@ -95,28 +86,20 @@ startElement(void *userData, const char
break;
case EXPR_TAG:
-
exprContent = NEW(new char[BUFSIZ * 10]); // Will free up at endElement
memset(exprContent, 0, BUFSIZ * 10);
break;
case DST_TAG:
-
nodeVar = true;
sumClusterVar = true; // Should only be used with cluster variable
for (i = 0; atts[i]; i += 2) {
-
ink_debug_assert(atts[i + 1]); // Attribute comes in pairs, hopefully.
-
if (!strcmp(atts[i], "scope")) {
-
nodeVar = (!strcmp(atts[i + 1], "node") ? true : false);
-
} else if (!strcmp(atts[i], "operation")) {
-
sumClusterVar = (!strcmp(atts[i + 1], "sum") ? true : false);
-
}
Debug(MODULE_INIT, "\tDESTINTATION w/ attribute: %s -> %s\n", atts[i], atts[i + 1]);
@@ -131,23 +114,21 @@ startElement(void *userData, const char
default:
break;
}
-
}
void
endElement(void *userData, const char *name)
{
-
+ NOWARN_UNUSED(userData);
+ NOWARN_UNUSED(name);
switch (currentTag) {
case STAT_TAG:
-
statObjectList.enqueue(statObject);
currentTag = ROOT_TAG;
break;
case EXPR_TAG:
-
statObject->assignExpr(exprContent);
delete(exprContent);
// fall through
@@ -156,14 +137,14 @@ endElement(void *userData, const char *n
currentTag = STAT_TAG;
break;
}
-
}
-
void
charDataHandler(void *userData, const XML_Char * name, int len)
{
+ NOWARN_UNUSED(userData);
+ NOWARN_UNUSED(len);
if (currentTag != EXPR_TAG && currentTag != DST_TAG) {
return;
}
@@ -188,16 +169,13 @@ charDataHandler(void *userData, const XM
StatProcessor::StatProcessor():m_lmgmt(NULL), m_overviewGenerator(NULL)
{
-
rereadConfig();
-
}
void
StatProcessor::rereadConfig()
{
-
textBuffer *fileContent = NULL;
Rollback *fileRB = NULL;
char *fileBuffer = NULL;
@@ -249,7 +227,6 @@ StatProcessor::rereadConfig()
delete fileContent;
Debug(MODULE_INIT, "\n\n---------- END OF PARSING & INITIALIZING ---------\n\n");
-
}
@@ -264,8 +241,8 @@ StatProcessor::~StatProcessor()
void
setTest()
{
-
char var_name[64];
+
for (int i = 1; i <= 5; i++) {
memset(var_name, 0, 64);
snprintf(var_name, sizeof(var_name), "proxy.node.stats.test%d", i);
@@ -277,14 +254,12 @@ setTest()
varSetFloat(var_name, i, true);
}
}
-
}
void
verifyTest()
{
-
MgmtFloat tmp1, tmp2;
// 1. simple copy
@@ -311,7 +286,6 @@ verifyTest()
} else {
Debug(MODULE_INIT, "FAIL -- delta %f", tmp2);
}
-
}
@@ -330,7 +304,6 @@ StatProcessor::processStat()
// verifyTest();
return (result);
-
}
@@ -342,7 +315,6 @@ StatProcessor::processStat()
MgmtFloat
ExpressionEval(char *exprString)
{
-
StatObject statObject;
char content[BUFSIZ * 10];
@@ -350,5 +322,4 @@ ExpressionEval(char *exprString)
statObject.assignExpr(content);
return statObject.NodeStatEval(false);
-
}
Modified: trafficserver/traffic/trunk/proxy/mgmt2/stats/StatType.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/mgmt2/stats/StatType.cc?rev=982078&r1=982077&r2=982078&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/mgmt2/stats/StatType.cc (original)
+++ trafficserver/traffic/trunk/proxy/mgmt2/stats/StatType.cc Tue Aug 3 23:22:41 2010
@@ -40,13 +40,13 @@ bool StatDebug = false; // globa
* StatExprToken()
* ---------------
*/
-StatExprToken::StatExprToken():
-m_arith_symbol('\0'),
-m_token_name(NULL),
-m_token_type((StatDataT)RECD_NULL),
-m_token_value(0.0),
-m_token_value_max(FLT_MAX),
-m_token_value_min(-1 * FLT_MAX), m_token_value_delta(NULL), m_sum_var(false), m_node_var(true)
+StatExprToken::StatExprToken()
+ : m_arith_symbol('\0'),
+ m_token_name(NULL),
+ m_token_type((StatDataT)RECD_NULL),
+ m_token_value(0.0),
+ m_token_value_max(FLT_MAX),
+ m_token_value_min(-1 * FLT_MAX), m_token_value_delta(NULL), m_sum_var(false), m_node_var(true)
{
}
@@ -58,7 +58,6 @@ m_token_value_min(-1 * FLT_MAX), m_token
void
StatExprToken::copy(const StatExprToken & source)
{
-
m_arith_symbol = source.m_arith_symbol;
if (source.m_token_name != NULL) {
@@ -80,7 +79,6 @@ StatExprToken::copy(const StatExprToken
m_node_var = source.m_node_var;
m_sum_var = source.m_sum_var;
-
}
@@ -107,9 +105,7 @@ StatExprToken::assignTokenName(const cha
}
switch (m_token_type) {
-
case STAT_INT:
-
if (StatDebug) {
StatInt tempInt;
if (!varIntFromName(m_token_name, &tempInt)) {
@@ -120,7 +116,6 @@ StatExprToken::assignTokenName(const cha
break;
case STAT_FLOAT:
-
if (StatDebug) {
StatFloat tempFloat;
if (!varFloatFromName(m_token_name, &tempFloat)) {
@@ -131,36 +126,21 @@ StatExprToken::assignTokenName(const cha
break;
case STAT_CONST:
-
// assign pre-defined constant in here
if (!strcmp(m_token_name, "CONSTANT")) {
-
m_token_value = (StatFloat) atof(name);
-
} else if (!strcmp(m_token_name, "$BYTES_TO_MB_SCALE")) {
-
m_token_value = (StatFloat) BYTES_TO_MB_SCALE;
-
} else if (!strcmp(m_token_name, "$MBIT_TO_KBIT_SCALE")) {
-
m_token_value = (StatFloat) MBIT_TO_KBIT_SCALE;
-
} else if (!strcmp(m_token_name, "$SECOND_TO_MILLISECOND_SCALE")) {
-
m_token_value = (StatFloat) SECOND_TO_MILLISECOND_SCALE;
-
} else if (!strcmp(m_token_name, "$PCT_TO_INTPCT_SCALE")) {
-
m_token_value = (StatFloat) PCT_TO_INTPCT_SCALE;
-
} else if (!strcmp(m_token_name, "$HRTIME_SECOND")) {
-
m_token_value = (StatFloat) HRTIME_SECOND;
-
} else if (!strcmp(m_token_name, "$BYTES_TO_MBIT_SCALE")) {
-
m_token_value = (StatFloat) BYTES_TO_MBIT_SCALE;
-
} else {
mgmt_log(stderr, "[StatPro] ERROR: Undefined constant: %s\n", m_token_name);
StatError = true;
@@ -172,7 +152,6 @@ StatExprToken::assignTokenName(const cha
break;
case STAT_FX:
-
if (StatDebug) {
Debug(MODULE_INIT, "\tfunction: %s, type: %d\n", m_token_name, m_token_type);
}
@@ -186,7 +165,6 @@ StatExprToken::assignTokenName(const cha
*/
break;
}
-
}
@@ -199,7 +177,6 @@ StatExprToken::assignTokenName(const cha
*/
bool StatExprToken::assignTokenType()
{
-
ink_debug_assert(m_token_name != NULL);
m_token_type = (StatDataT)varType(m_token_name);
@@ -221,7 +198,6 @@ bool StatExprToken::assignTokenType()
void
StatExprToken::clean()
{
-
if (m_token_name != NULL) {
xfree(m_token_name);
}
@@ -229,7 +205,6 @@ StatExprToken::clean()
if (m_token_value_delta != NULL) {
delete(m_token_value_delta);
}
-
}
@@ -240,13 +215,11 @@ StatExprToken::clean()
void
StatExprToken::print(const char *prefix)
{
-
if (m_token_name != NULL) {
printf("%s\t%s\n", prefix, m_token_name);
} else {
printf("%s\t%c\n", prefix, m_arith_symbol);
}
-
}
@@ -259,7 +232,6 @@ StatExprToken::print(const char *prefix)
short
StatExprToken::precedence()
{
-
switch (m_arith_symbol) {
case '(':
return 4;
@@ -275,7 +247,6 @@ StatExprToken::precedence()
default:
return -1;
}
-
}
@@ -289,7 +260,6 @@ StatExprToken::precedence()
*/
bool StatExprToken::statVarSet(StatFloat value)
{
-
if (StatError) {
/* fix this after librecords is done
mgmt_log(stderr,
@@ -313,7 +283,6 @@ bool StatExprToken::statVarSet(StatFloat
}
return varSetFloat(m_token_name, value, true);
-
}
@@ -325,7 +294,8 @@ bool StatExprToken::statVarSet(StatFloat
* StatExprList::StatExprList()
* ----------------------------
*/
-StatExprList::StatExprList():m_size(0)
+StatExprList::StatExprList()
+ : m_size(0)
{
}
@@ -337,98 +307,83 @@ StatExprList::StatExprList():m_size(0)
void
StatExprList::clean()
{
-
StatExprToken *temp = NULL;
+
while ((temp = m_tokenList.dequeue())) {
delete(temp);
m_size -= 1;
}
ink_assert(m_size == 0);
-
}
void
StatExprList::enqueue(StatExprToken * entry)
{
-
ink_assert(entry);
m_tokenList.enqueue(entry);
m_size += 1;
-
}
void
StatExprList::push(StatExprToken * entry)
{
-
ink_assert(entry);
m_tokenList.push(entry);
m_size += 1;
-
}
StatExprToken *
StatExprList::dequeue()
{
-
if (m_size == 0) {
return NULL;
}
m_size -= 1;
return (StatExprToken *) m_tokenList.dequeue();
-
}
StatExprToken *
StatExprList::pop()
{
-
if (m_size == 0) {
return NULL;
}
m_size -= 1;
return m_tokenList.pop();
-
}
StatExprToken *
StatExprList::top()
{
-
if (m_size == 0) {
return NULL;
}
return m_tokenList.head;
-
}
StatExprToken *
StatExprList::first()
{
-
if (m_size == 0) {
return NULL;
}
return m_tokenList.head;
-
}
StatExprToken *
StatExprList::next(StatExprToken * current)
{
-
if (!current) {
return NULL;
}
return (current->link).next;
-
}
@@ -440,11 +395,9 @@ StatExprList::next(StatExprToken * curre
void
StatExprList::print(const char *prefix)
{
-
for (StatExprToken * token = first(); token; token = next(token)) {
token->print(prefix);
}
-
}
@@ -456,9 +409,7 @@ StatExprList::print(const char *prefix)
unsigned
StatExprList::count()
{
-
return m_size;
-
}
@@ -472,30 +423,30 @@ StatExprList::count()
* ------------------------
*/
-StatObject::StatObject():
-m_id(1),
-m_debug(false),
-m_expr_string(NULL),
-m_node_dest(NULL),
-m_cluster_dest(NULL),
-m_expression(NULL),
-m_postfix(NULL),
-m_last_update(-1),
-m_current_time(-1), m_update_interval(-1), m_stats_max(FLT_MAX), m_stats_min(-1 * FLT_MAX), m_has_delta(false)
+StatObject::StatObject()
+ : m_id(1),
+ m_debug(false),
+ m_expr_string(NULL),
+ m_node_dest(NULL),
+ m_cluster_dest(NULL),
+ m_expression(NULL),
+ m_postfix(NULL),
+ m_last_update(-1),
+ m_current_time(-1), m_update_interval(-1), m_stats_max(FLT_MAX), m_stats_min(-1 * FLT_MAX), m_has_delta(false)
{
}
-StatObject::StatObject(unsigned identifier):
-m_id(identifier),
-m_debug(false),
-m_expr_string(NULL),
-m_node_dest(NULL),
-m_cluster_dest(NULL),
-m_expression(NULL),
-m_postfix(NULL),
-m_last_update(-1),
-m_current_time(-1), m_update_interval(-1), m_stats_max(FLT_MAX), m_stats_min(-1 * FLT_MAX), m_has_delta(false)
+StatObject::StatObject(unsigned identifier)
+ : m_id(identifier),
+ m_debug(false),
+ m_expr_string(NULL),
+ m_node_dest(NULL),
+ m_cluster_dest(NULL),
+ m_expression(NULL),
+ m_postfix(NULL),
+ m_last_update(-1),
+ m_current_time(-1), m_update_interval(-1), m_stats_max(FLT_MAX), m_stats_min(-1 * FLT_MAX), m_has_delta(false)
{
}
@@ -507,7 +458,6 @@ m_current_time(-1), m_update_interval(-1
void
StatObject::clean()
{
-
if (m_expr_string) {
xfree(m_expr_string);
}
@@ -520,7 +470,6 @@ StatObject::clean()
if (m_postfix) {
delete m_postfix;
}
-
}
@@ -531,7 +480,6 @@ StatObject::clean()
void
StatObject::assignDst(const char *str, bool m_node_var, bool m_sum_var)
{
-
if (StatDebug) {
Debug(MODULE_INIT, "DESTINTATION: %s\n", str);
}
@@ -549,7 +497,6 @@ StatObject::assignDst(const char *str, b
ink_assert(m_cluster_dest == NULL);
m_cluster_dest = statToken;
}
-
}
@@ -634,31 +581,24 @@ StatObject::assignExpr(const char *str)
void
StatObject::infix2postfix()
{
-
StatExprList stack;
StatExprToken *tempToken = NULL;
StatExprToken *curToken = NULL;
m_postfix = NEW(new StatExprList());
while (m_expression->top()) {
-
curToken = m_expression->dequeue();
if (!isOperator(curToken->m_arith_symbol)) {
-
//printf("I2P~: enqueue %s\n", curToken->m_token_name);
m_postfix->enqueue(curToken);
} else {
-
ink_debug_assert(curToken->m_arith_symbol != '\0');
if (curToken->m_arith_symbol == '(') {
-
stack.push(curToken);
-
} else if (curToken->m_arith_symbol == ')') {
-
tempToken = (StatExprToken *) stack.pop();
while (tempToken->m_arith_symbol != '(') {
@@ -672,13 +612,9 @@ StatObject::infix2postfix()
delete(tempToken);
} else {
-
if (stack.count() == 0) {
-
stack.push(curToken);
-
} else {
-
tempToken = (StatExprToken *) stack.top();
while ((tempToken->m_arith_symbol != '(') && (tempToken->precedence() >= curToken->precedence())) {
@@ -688,24 +624,19 @@ StatObject::infix2postfix()
if (stack.count() == 0) {
break;
}
-
tempToken = (StatExprToken *) stack.top();
-
} // while
stack.push(curToken);
-
}
}
}
}
while (stack.count() > 0) {
-
tempToken = (StatExprToken *) stack.pop();
//printf("I2P?: enqueue %c\n", tempToken->m_arith_symbol);
m_postfix->enqueue(tempToken);
-
}
// dump infix expression
@@ -722,27 +653,15 @@ StatObject::infix2postfix()
*/
StatFloat StatObject::NodeStatEval(bool cluster)
{
-
- StatExprList
- stack;
- StatExprToken *
- left = NULL;
- StatExprToken *
- right = NULL;
- StatExprToken *
- result = NULL;
- StatExprToken *
- curToken = NULL;
- StatExprToken *
- dest = NULL;
- StatFloat
- tempValue = ERROR_VALUE;
-
- dest = (cluster ? m_cluster_dest : m_node_dest);
+ StatExprList stack;
+ StatExprToken *left = NULL;
+ StatExprToken *right = NULL;
+ StatExprToken *result = NULL;
+ StatExprToken *curToken = NULL;
+ StatFloat tempValue = ERROR_VALUE;
/* Express checkout lane -- Stat. object with on 1 source variable */
if (m_postfix->count() == 1) {
-
StatExprToken *
src = m_postfix->top();
@@ -753,21 +672,14 @@ StatFloat StatObject::NodeStatEval(bool
}
if (src->m_token_type == STAT_CONST) {
-
tempValue = src->m_token_value;
-
} else if (src->m_token_value_delta) {
-
tempValue = src->m_token_value_delta->diff_value();;
-
} else if (!cluster) {
-
if (!varFloatFromName(src->m_token_name, &tempValue)) {
tempValue = (RecFloat) ERROR_VALUE;
}
-
} else {
-
if (!overviewGenerator->varClusterFloatFromName(src->m_token_name, &tempValue)) {
tempValue = (RecFloat) ERROR_VALUE;
}
@@ -776,22 +688,17 @@ StatFloat StatObject::NodeStatEval(bool
if (StatDebug) {
Debug(MODULE, "\tExpress checkout : %s:%f\n", src->m_token_name, tempValue);
}
-
} else {
/* standard postfix evaluation */
for (StatExprToken * token = m_postfix->first(); token; token = m_postfix->next(token)) {
-
/* carbon-copy the token. */
curToken = NEW(new StatExprToken());
curToken->copy(*token);
if (!isOperator(curToken->m_arith_symbol)) {
-
stack.push(curToken);
-
} else {
-
ink_debug_assert(isOperator(curToken->m_arith_symbol));
right = stack.pop();
left = stack.pop();
@@ -809,9 +716,7 @@ StatFloat StatObject::NodeStatEval(bool
delete(curToken);
delete(left);
delete(right);
-
}
-
}
/* should only be 1 value left on stack -- the resulting value */
@@ -821,7 +726,6 @@ StatFloat StatObject::NodeStatEval(bool
}
tempValue = stack.top()->m_token_value;
-
}
return (tempValue);
@@ -837,20 +741,15 @@ StatFloat StatObject::NodeStatEval(bool
*/
StatFloat StatObject::ClusterStatEval()
{
-
- StatFloat
- tempValue = ERROR_VALUE;
+ StatFloat tempValue = ERROR_VALUE;
/* Sanity check */
ink_debug_assert(m_cluster_dest && !m_cluster_dest->m_node_var);
// what is this?
if ((m_node_dest == NULL) || (m_cluster_dest->m_sum_var == false)) {
-
return NodeStatEval(true);
-
} else {
-
if (!overviewGenerator->varClusterFloatFromName(m_node_dest->m_token_name, &tempValue)) {
tempValue = (RecFloat) ERROR_VALUE;
}
@@ -858,9 +757,7 @@ StatFloat StatObject::ClusterStatEval()
Debug(MODULE, "Exp. chkout write: %s:%f\n", m_node_dest->m_token_name, tempValue);
}
return (tempValue);
-
}
-
}
@@ -885,18 +782,14 @@ StatFloat StatObject::ClusterStatEval()
void
StatObject::setTokenValue(StatExprToken * token, bool cluster)
{
-
if (token->m_token_name) {
-
// it is NOT an intermediate value
switch (token->m_token_type) {
-
case STAT_CONST:
break;
case STAT_FX:
-
// only support time function
token->m_token_value = (StatFloat) (m_current_time - m_last_update);
if (StatDebug) {
@@ -907,17 +800,12 @@ StatObject::setTokenValue(StatExprToken
case STAT_INT: // fallthought
case STAT_FLOAT:
-
if (cluster) {
-
if (!overviewGenerator->varClusterFloatFromName(token->m_token_name, &(token->m_token_value))) {
token->m_token_value = (RecFloat) ERROR_VALUE;
}
-
} else {
-
if (token->m_token_value_delta) {
-
token->m_token_value = token->m_token_value_delta->diff_value();
if (StatDebug) {
@@ -925,28 +813,20 @@ StatObject::setTokenValue(StatExprToken
token->m_token_value_delta->previous_value,
token->m_token_value_delta->current_value, token->m_token_value);
}
-
} else {
-
if (!varFloatFromName(token->m_token_name, &(token->m_token_value))) {
token->m_token_value = (RecFloat) ERROR_VALUE;
}
-
} // delta?
-
} // cluster?
break;
default:
-
if (StatDebug) {
Debug(MODULE, "Unrecognized token \"%s\" of type %d.\n", token->m_token_name, token->m_token_type);
}
-
} // switch
-
} // m_token_name?
-
}
@@ -962,10 +842,8 @@ StatObject::setTokenValue(StatExprToken
* - (4) an immediate value
*/
-StatExprToken *
-StatObject::StatBinaryEval(StatExprToken * left, char op, StatExprToken * right, bool cluster)
+StatExprToken *StatObject::StatBinaryEval(StatExprToken * left, char op, StatExprToken * right, bool cluster)
{
-
StatExprToken *result = NEW(new StatExprToken());
result->m_token_type = STAT_FLOAT;
@@ -974,34 +852,27 @@ StatObject::StatBinaryEval(StatExprToken
switch (op) {
case '+':
-
result->m_token_value = (StatFloat) (left->m_token_value + right->m_token_value);
break;
case '-':
-
result->m_token_value = (StatFloat) (left->m_token_value - right->m_token_value);
break;
case '*':
-
result->m_token_value = (StatFloat) (left->m_token_value * right->m_token_value);
break;
case '/':
-
result->m_token_value = (StatFloat) ((right->m_token_value == 0) ?
0.0 : (left->m_token_value / right->m_token_value));
break;
default:
-
// should never reach here
StatError = true;
-
}
-
if (StatDebug) {
Debug(MODULE, "%s(%f) %c %s(%f) = %f\n",
left->m_token_name ? left->m_token_name : "in stack",
@@ -1010,7 +881,6 @@ StatObject::StatBinaryEval(StatExprToken
}
return (result);
-
}
@@ -1018,7 +888,8 @@ StatObject::StatBinaryEval(StatExprToken
StatObjectList
**********************************************************************/
-StatObjectList::StatObjectList():m_size(0)
+StatObjectList::StatObjectList()
+ : m_size(0)
{
}
@@ -1026,7 +897,6 @@ StatObjectList::StatObjectList():m_size(
void
StatObjectList::clean()
{
-
StatObject *temp = NULL;
while ((temp = m_statList.dequeue())) {
@@ -1035,21 +905,17 @@ StatObjectList::clean()
}
ink_assert(m_size == 0);
-
}
void
StatObjectList::enqueue(StatObject * object)
{
-
for (StatExprToken * token = object->m_postfix->first(); token; token = object->m_postfix->next(token)) {
-
if (token->m_token_value_delta) {
object->m_has_delta = true;
break;
}
-
}
if (object->m_node_dest) {
@@ -1064,25 +930,20 @@ StatObjectList::enqueue(StatObject * obj
m_statList.enqueue(object);
m_size += 1;
-
}
StatObject *
StatObjectList::first()
{
-
return m_statList.head;
-
}
StatObject *
StatObjectList::next(StatObject * current)
{
-
return (current->link).next;
-
}
@@ -1094,7 +955,6 @@ StatObjectList::next(StatObject * curren
short
StatObjectList::Eval()
{
-
StatFloat tempValue = ERROR_VALUE;
StatFloat result = ERROR_VALUE;
ink_hrtime threshold = 0;
@@ -1102,7 +962,6 @@ StatObjectList::Eval()
short count = 0;
for (StatObject * object = first(); object; object = next(object)) {
-
StatError = false;
StatDebug = object->m_debug;
@@ -1111,9 +970,7 @@ StatObjectList::Eval()
}
if (object->m_update_interval <= 0) {
-
// non-time statistics
-
object->m_current_time = ink_get_hrtime();
result = ERROR_VALUE;
@@ -1135,11 +992,8 @@ StatObjectList::Eval()
}
object->m_last_update = object->m_current_time;
-
} else {
-
// timed statisitics
-
object->m_current_time = ink_get_hrtime();
threshold = object->m_update_interval * HRTIME_SECOND;
@@ -1191,19 +1045,14 @@ StatObjectList::Eval()
}
object->m_last_update = object->m_current_time;
-
} else {
-
/* has delta */
-
if (StatDebug) {
Debug(MODULE, "\tEVAL: Complicated time-condition.\n");
}
// scroll old values
for (StatExprToken * token = object->m_postfix->first(); token; token = object->m_expression->next(token)) {
-
if (token->m_token_value_delta) {
-
if (!varFloatFromName(token->m_token_name, &tempValue)) {
tempValue = (RecFloat) ERROR_VALUE;
}
@@ -1216,7 +1065,6 @@ StatObjectList::Eval()
}
if (delta > threshold) {
-
result = ERROR_VALUE;
if (object->m_node_dest) {
result = object->NodeStatEval(false);
@@ -1236,33 +1084,22 @@ StatObjectList::Eval()
}
object->m_last_update = object->m_current_time;
-
} else {
-
if (StatDebug) {
Debug(MODULE, "\tEVAL: Timer not expired, do nothing\n");
}
-
}
-
} /* delta? */
-
} else {
-
if (StatDebug) {
Debug(MODULE, "\tEVAL: Timer not expired, nor 1st time, nor wrapped, SORRY!\n");
}
-
} /* timed event */
-
}
-
count += 1;
-
} /* for */
return count;
-
} /* Eval() */
@@ -1274,9 +1111,7 @@ StatObjectList::Eval()
void
StatObjectList::print(const char *prefix)
{
-
for (StatObject * object = first(); object; object = next(object)) {
-
if (StatDebug) {
Debug(MODULE, "\n%sSTAT OBJECT#: %d\n", prefix, object->m_id);
}
@@ -1288,7 +1123,5 @@ StatObjectList::print(const char *prefix
if (object->m_postfix) {
object->m_postfix->print("\t");
}
-
}
-
}
Modified: trafficserver/traffic/trunk/proxy/mgmt2/web2/WebHttpMessage.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/mgmt2/web2/WebHttpMessage.cc?rev=982078&r1=982077&r2=982078&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/mgmt2/web2/WebHttpMessage.cc (original)
+++ trafficserver/traffic/trunk/proxy/mgmt2/web2/WebHttpMessage.cc Tue Aug 3 23:22:41 2010
@@ -471,7 +471,6 @@ httpResponse::writeHdr(SocketInfo socket
const char authStr[] = "WWW-Authenticate: Basic realm=\"";
const char dateStr[] = "Date: ";
const char lastModStr[] = "Last-modified: ";
- const char expiresStr[] = "Expires: ";
const char locationStr[] = "Location: ";
const char refreshURLStr[] = "; URL=";
time_t currentTime;
@@ -479,9 +478,6 @@ httpResponse::writeHdr(SocketInfo socket
char buffer[bufSize];
char *reply;
int bytesWritten;
-
- NOWARN_UNUSED(expiresStr);
-
textBuffer hdr(4096);
hdr.copyFrom(versionStr, strlen(versionStr));
Modified: trafficserver/traffic/trunk/proxy/mgmt2/web2/WebReconfig.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/mgmt2/web2/WebReconfig.cc?rev=982078&r1=982077&r2=982078&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/mgmt2/web2/WebReconfig.cc (original)
+++ trafficserver/traffic/trunk/proxy/mgmt2/web2/WebReconfig.cc Tue Aug 3 23:22:41 2010
@@ -67,6 +67,9 @@ static int updateArray[UPDATE_ARRAY_SIZE
static int
WebConfigCB(const char *name, RecDataT data_type, RecData data, void *cookie)
{
+ NOWARN_UNUSED(name);
+ NOWARN_UNUSED(data_type);
+ NOWARN_UNUSED(data);
long index = (long) cookie;
updateArray[index] = 1;
webConfigChanged = 1;
@@ -383,10 +386,10 @@ configAuthOtherUsers()
}
// check for duplicates
if (ht->mgmt_hash_table_isbound(au->user)) {
- WebHttpAuthUser *p = 0;
- ht->mgmt_hash_table_lookup(au->user, (void **) &p);
- if (p) {
- xfree(p);
+ WebHttpAuthUser *ptr = 0;
+ ht->mgmt_hash_table_lookup(au->user, (void **) &ptr);
+ if (ptr) {
+ xfree(ptr);
}
ht->mgmt_hash_table_delete(au->user);
snprintf(error_msg, sizeof(error_msg), "Duplicate users defined, disabling user '%s'", au->user);
@@ -425,7 +428,6 @@ configLangDict()
char fpath[FILE_NAME_MAX];
char *fbuf;
char *file_buf;
- int fsize;
int file_size;
WebHttpContext whc;
MgmtHashTable *ht;
@@ -462,7 +464,6 @@ configLangDict()
return;
}
fbuf = whc.response_bdy->bufPtr();
- fsize = whc.response_bdy->spaceUsed();
// FIXME: by empting the current hash-table element at a time, and
// then re-populating it later, we create a small window where
@@ -520,8 +521,6 @@ configRefreshRate()
void
configSSLenable()
{
- char *sslCertFile = NULL;
- char *configDir = NULL;
char *sslCertPath = NULL;
RecInt sslEnabled;
@@ -580,9 +579,7 @@ SSL_FAILED:
mgmt_elog(stderr, "[configSSLenable] %s\n", errMsg);
lmgmt->alarm_keeper->signalAlarm(MGMT_ALARM_WEB_ERROR, errMsg);
adminContext.SSLenabled = -1;
- xfree(sslCertFile);
xfree(sslCertPath);
- xfree(configDir);
return;
}