Author: zwoop
Date: Tue Mar 15 02:08:19 2011
New Revision: 1081639
URL: http://svn.apache.org/viewvc?rev=1081639&view=rev
Log:
TS-705 Fixes for gcc v4.6
Modified:
trafficserver/traffic/trunk/iocore/cache/Store.cc
trafficserver/traffic/trunk/iocore/dns/DNS.cc
trafficserver/traffic/trunk/mgmt/tools/ConfigAPI.cc
trafficserver/traffic/trunk/mgmt/web2/WebHttp.cc
trafficserver/traffic/trunk/proxy/StatSystem.cc
trafficserver/traffic/trunk/proxy/logstats.cc
Modified: trafficserver/traffic/trunk/iocore/cache/Store.cc
URL:
http://svn.apache.org/viewvc/trafficserver/traffic/trunk/iocore/cache/Store.cc?rev=1081639&r1=1081638&r2=1081639&view=diff
==============================================================================
--- trafficserver/traffic/trunk/iocore/cache/Store.cc (original)
+++ trafficserver/traffic/trunk/iocore/cache/Store.cc Tue Mar 15 02:08:19 2011
@@ -404,22 +404,25 @@ Span::init(char *an, int64_t size)
char *n = NULL;
int n_len = 0;
char real_n[PATH_NAME_MAX];
+
if ((n_len = readlink(an, real_n, sizeof(real_n) - 1)) > 0) {
real_n[n_len] = 0;
if (*real_n != '/') {
char *rs = strrchr(an, '/');
- int l = (rs - an) + 1;
- const char *ann = an;
- if (!rs) {
- ann = "./";
- l = 2;
+ int l = 2;
+ const char *ann = "./";
+
+ if (rs) {
+ ann = an;
+ l = (rs - an) + 1;
}
memmove(real_n + l, real_n, strlen(real_n) + 1);
- memcpy(real_n, an, l);
+ memcpy(real_n, ann, l);
}
n = real_n;
- } else
+ } else {
n = an;
+ }
// stat the file system
Modified: trafficserver/traffic/trunk/iocore/dns/DNS.cc
URL:
http://svn.apache.org/viewvc/trafficserver/traffic/trunk/iocore/dns/DNS.cc?rev=1081639&r1=1081638&r2=1081639&view=diff
==============================================================================
--- trafficserver/traffic/trunk/iocore/dns/DNS.cc (original)
+++ trafficserver/traffic/trunk/iocore/dns/DNS.cc Tue Mar 15 02:08:19 2011
@@ -318,10 +318,10 @@ DNSEntry::init(const char *x, int len, i
#if defined(darwin)
static int qnum = 0;
char sname[NAME_MAX];
- int retval;
+
qnum++;
snprintf(sname,NAME_MAX,"%s%d","DNSEntry",qnum);
- retval = ink_sem_unlink(sname); // FIXME: remove, semaphore should be
properly deleted after usage
+ ink_sem_unlink(sname); // FIXME: remove, semaphore should be properly
deleted after usage
sem = ink_sem_open(sname, O_CREAT | O_EXCL, 0777, 0);
#else /* !darwin */
ink_sem_init(&sem, 0);
Modified: trafficserver/traffic/trunk/mgmt/tools/ConfigAPI.cc
URL:
http://svn.apache.org/viewvc/trafficserver/traffic/trunk/mgmt/tools/ConfigAPI.cc?rev=1081639&r1=1081638&r2=1081639&view=diff
==============================================================================
--- trafficserver/traffic/trunk/mgmt/tools/ConfigAPI.cc (original)
+++ trafficserver/traffic/trunk/mgmt/tools/ConfigAPI.cc Tue Mar 15 02:08:19 2011
@@ -710,7 +710,11 @@ Config_RestoreNetConfig(char *file)
int ret = 0;
char *TagValue = NULL;
bool isFloppyConfig = false;
+
+ // TODO: Why is this only used / needed on Linux??
+#if defined(linux)
int activeInterface[] = { 0, 0, 0, 0, 0 };
+#endif
//this is the only way to know whether this is a floppy restore or not
@@ -772,7 +776,9 @@ Config_RestoreNetConfig(char *file)
TagValue = netXml.getXmlTagValueAndAttribute(eth, "InterfaceIPAddress");
if (TagValue != NULL) {
Config_SetNIC_IP(eth, TagValue);
+#if defined(linux)
activeInterface[count] = 1;
+#endif
xfree(TagValue);
} else if (count == 0)
break;
Modified: trafficserver/traffic/trunk/mgmt/web2/WebHttp.cc
URL:
http://svn.apache.org/viewvc/trafficserver/traffic/trunk/mgmt/web2/WebHttp.cc?rev=1081639&r1=1081638&r2=1081639&view=diff
==============================================================================
--- trafficserver/traffic/trunk/mgmt/web2/WebHttp.cc (original)
+++ trafficserver/traffic/trunk/mgmt/web2/WebHttp.cc Tue Mar 15 02:08:19 2011
@@ -252,7 +252,6 @@ spawn_cgi(WebHttpContext * whc, const ch
int qlen = 0;
char content_length_buffer[10];
EnvBlock env;
- bool success = false;
const char *a[MAX_ARGS + 2];
int i;
@@ -307,9 +306,6 @@ spawn_cgi(WebHttpContext * whc, const ch
mgmt_elog(stderr, "[spawn_cgi] Unable to fork child process\n");
WebHttpSetErrorResponse(whc, STATUS_INTERNAL_SERVER_ERROR);
answerHdr->setStatus(STATUS_INTERNAL_SERVER_ERROR);
-
- } else {
- success = true;
}
#else
@@ -383,7 +379,6 @@ spawn_cgi(WebHttpContext * whc, const ch
replyMsg->copyFrom(buffer, nbytes);
}
CloseHandle(hChildStdoutR);
- success = true;
}
#endif
Modified: trafficserver/traffic/trunk/proxy/StatSystem.cc
URL:
http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/StatSystem.cc?rev=1081639&r1=1081638&r2=1081639&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/StatSystem.cc (original)
+++ trafficserver/traffic/trunk/proxy/StatSystem.cc Tue Mar 15 02:08:19 2011
@@ -585,6 +585,7 @@ dyn_stats_count_cb(void *data, void *res
{
ink_statval_t count, sum;
READ_DYN_STAT((long) data, count, sum);
+ NOWARN_UNUSED(sum);
//*(ink_statval_t *)res = count;
ink_atomic_swap64((ink_statval_t *) res, count);
return res;
@@ -595,6 +596,7 @@ dyn_stats_sum_cb(void *data, void *res)
{
ink_statval_t count, sum;
READ_DYN_STAT((long) data, count, sum);
+ NOWARN_UNUSED(count);
//*(ink_statval_t *)res = sum;
ink_atomic_swap64((ink_statval_t *) res, sum);
return res;
@@ -618,6 +620,7 @@ dyn_stats_fsum_cb(void *data, void *res)
{
ink_statval_t count, sum;
READ_DYN_STAT((long) data, count, sum);
+ NOWARN_UNUSED(count);
*(float *) res = *(double *) ∑
return res;
}
@@ -707,6 +710,7 @@ http_trans_stats_count_cb(void *data, vo
{
ink_statval_t count, sum;
READ_HTTP_TRANS_STAT((long) data, count, sum);
+ NOWARN_UNUSED(sum);
//*(ink_statval_t *)res = count;
ink_atomic_swap64((ink_statval_t *) res, count);
return res;
@@ -717,6 +721,7 @@ http_trans_stats_sum_cb(void *data, void
{
ink_statval_t count, sum;
READ_HTTP_TRANS_STAT((long) data, count, sum);
+ NOWARN_UNUSED(count);
//*(ink_statval_t *)res = sum;
ink_atomic_swap64((ink_statval_t *) res, sum);
return res;
@@ -740,6 +745,7 @@ http_trans_stats_fsum_cb(void *data, voi
{
ink_statval_t count, sum;
READ_HTTP_TRANS_STAT((long) data, count, sum);
+ NOWARN_UNUSED(count);
*(float *) res = *(double *) ∑
return res;
}
Modified: trafficserver/traffic/trunk/proxy/logstats.cc
URL:
http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/logstats.cc?rev=1081639&r1=1081638&r2=1081639&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/logstats.cc (original)
+++ trafficserver/traffic/trunk/proxy/logstats.cc Tue Mar 15 02:08:19 2011
@@ -662,12 +662,11 @@ CommandLineArgs::parse_arguments(char**
cgi = 1;
if (NULL != (query = getenv("QUERY_STRING"))) {
- int len;
char buffer[MAX_ORIG_STRING];
char *tok, *sep_ptr, *val;
ink_strlcpy(buffer, query, MAX_ORIG_STRING);
- len = unescapifyStr(buffer);
+ unescapifyStr(buffer);
for (tok = strtok_r(buffer, "&", &sep_ptr); tok != NULL;) {
val = strchr(tok, '=');
