Author: zwoop
Date: Wed Sep 7 02:53:27 2011
New Revision: 1165976
URL: http://svn.apache.org/viewvc?rev=1165976&view=rev
Log:
TS-567 Third set of xmalloc -> ats_malloc conversion, more to come
Modified:
trafficserver/traffic/trunk/mgmt/LocalManager.cc
trafficserver/traffic/trunk/mgmt/cluster/ClusterCom.cc
trafficserver/traffic/trunk/mgmt/preparse/StoreReadConfig.cc
trafficserver/traffic/trunk/mgmt/stats/StatProcessor.cc
trafficserver/traffic/trunk/mgmt/utils/MgmtUtils.cc
trafficserver/traffic/trunk/mgmt/web2/WebIntrMain.cc
trafficserver/traffic/trunk/proxy/ControlMatcher.cc
trafficserver/traffic/trunk/proxy/CoreUtils.cc
trafficserver/traffic/trunk/proxy/FetchSM.cc
trafficserver/traffic/trunk/proxy/MuxVC.cc
trafficserver/traffic/trunk/proxy/Prefetch.cc
trafficserver/traffic/trunk/proxy/congest/Congestion.cc
trafficserver/traffic/trunk/proxy/hdrs/MIME.cc
trafficserver/traffic/trunk/proxy/http/HttpBodyFactory.cc
trafficserver/traffic/trunk/proxy/http/HttpPages.cc
trafficserver/traffic/trunk/proxy/logging/LogConfig.cc
trafficserver/traffic/trunk/proxy/logging/LogFormat.cc
trafficserver/traffic/trunk/proxy/logstats.cc
Modified: trafficserver/traffic/trunk/mgmt/LocalManager.cc
URL:
http://svn.apache.org/viewvc/trafficserver/traffic/trunk/mgmt/LocalManager.cc?rev=1165976&r1=1165975&r2=1165976&view=diff
==============================================================================
--- trafficserver/traffic/trunk/mgmt/LocalManager.cc (original)
+++ trafficserver/traffic/trunk/mgmt/LocalManager.cc Wed Sep 7 02:53:27 2011
@@ -437,7 +437,7 @@ LocalManager::initCCom(int port, char *a
// Set the cluster ip addr variable so that proxy can read it
// and flush it to disk
const size_t envBuf_size = strlen(envVar) + strlen(clusterAddrStr) + 1;
- envBuf = (char *) xmalloc(envBuf_size);
+ envBuf = (char *)ats_malloc(envBuf_size);
ink_strncpy(envBuf, envVar, envBuf_size);
strncat(envBuf, clusterAddrStr, envBuf_size - strlen(envBuf) - 1);
ink_release_assert(putenv(envBuf) == 0);
@@ -958,7 +958,7 @@ LocalManager::signalEvent(int msg_id, co
{
MgmtMessageHdr *mh;
- mh = (MgmtMessageHdr *) xmalloc(sizeof(MgmtMessageHdr) + data_len);
+ mh = (MgmtMessageHdr *)ats_malloc(sizeof(MgmtMessageHdr) + data_len);
mh->msg_id = msg_id;
mh->data_len = data_len;
memcpy((char *) mh + sizeof(MgmtMessageHdr), data_raw, data_len);
Modified: trafficserver/traffic/trunk/mgmt/cluster/ClusterCom.cc
URL:
http://svn.apache.org/viewvc/trafficserver/traffic/trunk/mgmt/cluster/ClusterCom.cc?rev=1165976&r1=1165975&r2=1165976&view=diff
==============================================================================
--- trafficserver/traffic/trunk/mgmt/cluster/ClusterCom.cc (original)
+++ trafficserver/traffic/trunk/mgmt/cluster/ClusterCom.cc Wed Sep 7 02:53:27
2011
@@ -800,7 +800,7 @@ ClusterCom::handleMultiCastMessage(char
/* Have we see this guy before? */
ink_mutex_acquire(&(mutex)); /* Grab cluster lock to access hash table */
if (ink_hash_table_lookup(peers, (InkHashTableKey) ip, &hash_value) == 0) {
- ink_assert((p = (ClusterPeerInfo *) xmalloc(sizeof(ClusterPeerInfo))));
+ ink_assert((p = (ClusterPeerInfo *)ats_malloc(sizeof(ClusterPeerInfo))));
p->inet_address = inet_addr(ip);
p->num_virt_addrs = 0;
@@ -809,7 +809,7 @@ ClusterCom::handleMultiCastMessage(char
// how many RECT_NODE stats there are. I'm hoping it's negligible though,
but worst
// case we can reoptimize this later (and more efficiently).
int cnt = 0;
- p->node_rec_data.recs = (RecRecord *) xmalloc(sizeof(RecRecord) *
g_num_records);
+ p->node_rec_data.recs = (RecRecord *)ats_malloc(sizeof(RecRecord) *
g_num_records);
for (int j = 0; j < g_num_records; j++) {
RecRecord *rec = &(g_records[j]);
@@ -957,7 +957,7 @@ ClusterCom::handleMultiCastStatPacket(ch
xfree(rec->data.rec_string);
}
int rec_string_size = strlen(tmp_msg_val) + 1;
- ink_assert((rec->data.rec_string = (RecString)
xmalloc(rec_string_size)));
+ ink_assert((rec->data.rec_string =
(RecString)ats_malloc(rec_string_size)));
ink_strncpy(rec->data.rec_string, tmp_msg_val, rec_string_size);
}
break;
@@ -1009,7 +1009,7 @@ extract_locals(MgmtHashTable * local_ht,
// is this line a LOCAL?
if (strncmp(q, "LOCAL", strlen("LOCAL")) == 0) {
int line_cp_len = strlen(line) + 1;
- line_cp = (char *) xmalloc(line_cp_len);
+ line_cp = (char *)ats_malloc(line_cp_len);
ink_strncpy(line_cp, line, line_cp_len);
q += strlen("LOCAL");
while ((*q == ' ') || (*q == '\t'))
@@ -1156,7 +1156,7 @@ ClusterCom::handleMultiCastFilePacket(ch
} else {
our_locals_ht = NEW(new MgmtHashTable("our_locals_ht", true,
InkHashTableKeyType_String));
our_rec_cfg_cp_len = our_rec_cfg->spaceUsed();
- our_rec_cfg_cp = (char *) xmalloc(our_rec_cfg_cp_len + 1);
+ our_rec_cfg_cp = (char *)ats_malloc(our_rec_cfg_cp_len + 1);
ink_strncpy(our_rec_cfg_cp, our_rec_cfg->bufPtr(),
(our_rec_cfg_cp_len + 1));
extract_locals(our_locals_ht, our_rec_cfg_cp);
reply_new = NEW(new textBuffer(reply->spaceUsed()));
Modified: trafficserver/traffic/trunk/mgmt/preparse/StoreReadConfig.cc
URL:
http://svn.apache.org/viewvc/trafficserver/traffic/trunk/mgmt/preparse/StoreReadConfig.cc?rev=1165976&r1=1165975&r2=1165976&view=diff
==============================================================================
--- trafficserver/traffic/trunk/mgmt/preparse/StoreReadConfig.cc (original)
+++ trafficserver/traffic/trunk/mgmt/preparse/StoreReadConfig.cc Wed Sep 7
02:53:27 2011
@@ -67,7 +67,8 @@ parseStorageFile(int fd)
return NULL;
Lfail:
int e_size = 1000;
- char *e = (char *) xmalloc(e_size);
+ char *e = (char *)ats_malloc(e_size);
+
snprintf(e, e_size, "Error reading storage.config: %s line %d\n", err, ln);
return e;
}
Modified: trafficserver/traffic/trunk/mgmt/stats/StatProcessor.cc
URL:
http://svn.apache.org/viewvc/trafficserver/traffic/trunk/mgmt/stats/StatProcessor.cc?rev=1165976&r1=1165975&r2=1165976&view=diff
==============================================================================
--- trafficserver/traffic/trunk/mgmt/stats/StatProcessor.cc (original)
+++ trafficserver/traffic/trunk/mgmt/stats/StatProcessor.cc Wed Sep 7 02:53:27
2011
@@ -86,7 +86,7 @@ startElement(void *userData, const char
break;
case EXPR_TAG:
- exprContent = (char*)xmalloc(BUFSIZ * 10);
+ exprContent = (char*)ats_malloc(BUFSIZ * 10);
memset(exprContent, 0, BUFSIZ * 10);
break;
Modified: trafficserver/traffic/trunk/mgmt/utils/MgmtUtils.cc
URL:
http://svn.apache.org/viewvc/trafficserver/traffic/trunk/mgmt/utils/MgmtUtils.cc?rev=1165976&r1=1165975&r2=1165976&view=diff
==============================================================================
--- trafficserver/traffic/trunk/mgmt/utils/MgmtUtils.cc (original)
+++ trafficserver/traffic/trunk/mgmt/utils/MgmtUtils.cc Wed Sep 7 02:53:27 2011
@@ -622,7 +622,7 @@ mgmt_getAddrForIntr(char *intrName, stru
lastlen = 0;
len = 128 * sizeof(struct ifreq); // initial buffer size guess
for (;;) {
- ifbuf = (char *) xmalloc(len);
+ ifbuf = (char *)ats_malloc(len);
memset(ifbuf, 0, len); // prevent UMRs
ifc.ifc_len = len;
ifc.ifc_buf = ifbuf;
@@ -766,6 +766,7 @@ mgmt_localhost_ip()
char *hostname;
in_addr ip;
int rec_err = RecGetRecordString_Xmalloc("proxy.node.hostname_FQ",
&hostname);
+
found = (rec_err == REC_ERR_OKAY);
if (found && hostname) {
ip.s_addr = host_to_ip(hostname);
Modified: trafficserver/traffic/trunk/mgmt/web2/WebIntrMain.cc
URL:
http://svn.apache.org/viewvc/trafficserver/traffic/trunk/mgmt/web2/WebIntrMain.cc?rev=1165976&r1=1165975&r2=1165976&view=diff
==============================================================================
--- trafficserver/traffic/trunk/mgmt/web2/WebIntrMain.cc (original)
+++ trafficserver/traffic/trunk/mgmt/web2/WebIntrMain.cc Wed Sep 7 02:53:27
2011
@@ -506,7 +506,7 @@ webIntr_main(void *x)
ink_atomic_increment((int32_t *) & numServiceThr, 1);
// coverity[alloc_fn]
- clientInfo = (struct sockaddr_in *) xmalloc(sizeof(struct sockaddr_in));
+ clientInfo = (struct sockaddr_in *)ats_malloc(sizeof(struct sockaddr_in));
addrLen = sizeof(struct sockaddr_in);
// coverity[noescape]
Modified: trafficserver/traffic/trunk/proxy/ControlMatcher.cc
URL:
http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/ControlMatcher.cc?rev=1165976&r1=1165975&r2=1165976&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/ControlMatcher.cc (original)
+++ trafficserver/traffic/trunk/proxy/ControlMatcher.cc Wed Sep 7 02:53:27 2011
@@ -270,7 +270,7 @@ template<class Data, class Result> void
// Should not have been allocated before
ink_assert(array_len == -1);
- re_array = (pcre**) xmalloc(sizeof(pcre*) * num_entries);
+ re_array = (pcre**)ats_malloc(sizeof(pcre*) * num_entries);
memset(re_array, 0, sizeof(pcre*) * num_entries);
data_array = NEW(new Data[num_entries]);
@@ -309,7 +309,7 @@ template<class Data, class Result> char
// Create the compiled regular expression
re_array[num_el] = pcre_compile(pattern, 0, &error, &erroffset, NULL);
if (!re_array[num_el]) {
- errBuf = (char *) xmalloc(1024 * sizeof(char));
+ errBuf = (char *)ats_malloc(1024 * sizeof(char));
*errBuf = '\0';
snprintf(errBuf, 1024, "%s regular expression error at line %d position %d
: %s",
matcher_name, line_info->line_num, erroffset, error);
@@ -502,7 +502,7 @@ template<class Data, class Result> char
errPtr = ExtractIpRange(match_data, &addr1, &addr2);
if (errPtr != NULL) {
const size_t errorSize = 1024;
- errBuf = (char *) xmalloc(errorSize * sizeof(char));
+ errBuf = (char *)ats_malloc(errorSize * sizeof(char));
snprintf(errBuf, errorSize, "%s %s at %s line %d", matcher_name, errPtr,
file_name, line_info->line_num);
return errBuf;
}
@@ -696,7 +696,7 @@ template<class Data, class Result> int C
if (*tmp != '#' && *tmp != '\0') {
- current = (matcher_line *) xmalloc(sizeof(matcher_line));
+ current = (matcher_line *)ats_malloc(sizeof(matcher_line));
errPtr = parseConfigLine((char *) tmp, current, config_tags);
if (errPtr != NULL) {
Modified: trafficserver/traffic/trunk/proxy/CoreUtils.cc
URL:
http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/CoreUtils.cc?rev=1165976&r1=1165975&r2=1165976&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/CoreUtils.cc (original)
+++ trafficserver/traffic/trunk/proxy/CoreUtils.cc Wed Sep 7 02:53:27 2011
@@ -810,7 +810,7 @@ CoreUtils::load_http_hdr(HTTPHdr * core_
#if defined(__GNUC__)
char rw_heap[sizeof(char) * nto_copy];
#else
- char *rw_heap = (char *)xmalloc(sizeof(char) * nto_copy);
+ char *rw_heap = (char *)ats_malloc(sizeof(char) * nto_copy);
#endif
if (read_from_core((intptr_t) copy_start, nto_copy, rw_heap) == -1) {
printf("Cannot read from core\n");
@@ -833,7 +833,7 @@ CoreUtils::load_http_hdr(HTTPHdr * core_
#if defined(__GNUC__)
char ro_heap[sizeof(char) * heap->m_ronly_heap[i].m_heap_len];
#else
- char * ro_heap = (char *) xmalloc(sizeof(char) *
heap->m_ronly_heap[i].m_heap_len);
+ char * ro_heap = (char *)ats_malloc(sizeof(char) *
heap->m_ronly_heap[i].m_heap_len);
#endif
if (read_from_core((intptr_t) heap->m_ronly_heap[i].m_heap_start,
heap->m_ronly_heap[i].m_heap_len, ro_heap) == -1) {
printf("Cannot read from core\n");
Modified: trafficserver/traffic/trunk/proxy/FetchSM.cc
URL:
http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/FetchSM.cc?rev=1165976&r1=1165975&r2=1165976&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/FetchSM.cc (original)
+++ trafficserver/traffic/trunk/proxy/FetchSM.cc Wed Sep 7 02:53:27 2011
@@ -95,11 +95,10 @@ FetchSM::get_info_from_buffer(IOBufferRe
read_avail = the_reader->read_avail();
Debug(DEBUG_TAG, "[%s] total avail " PRId64 , __FUNCTION__, read_avail);
//size_t hdr_size = _headers.size();
- //info = (char *) xmalloc(sizeof(char) * (read_avail+1) + hdr_size);
- info = (char *) xmalloc(sizeof(char) * (read_avail+1));
- if (info == NULL)
- return ;
+ //info = (char *)ats_malloc(sizeof(char) * (read_avail+1) + hdr_size);
+ info = (char *)ats_malloc(sizeof(char) * (read_avail+1));
client_response = info;
+
//strncpy(info, _headers.data(), hdr_size);
//info += hdr_size;
Modified: trafficserver/traffic/trunk/proxy/MuxVC.cc
URL:
http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/MuxVC.cc?rev=1165976&r1=1165975&r2=1165976&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/MuxVC.cc (original)
+++ trafficserver/traffic/trunk/proxy/MuxVC.cc Wed Sep 7 02:53:27 2011
@@ -2843,7 +2843,7 @@ MuxPagesHandler::handle_callback(int eve
StatPageData data;
data.data = response;
- data.type = (char *) xmalloc(10);
+ data.type = (char *)ats_malloc(10);
snprintf(data.type, 10, "text/html");
data.length = response_length;
response = NULL;
Modified: trafficserver/traffic/trunk/proxy/Prefetch.cc
URL:
http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/Prefetch.cc?rev=1165976&r1=1165975&r2=1165976&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/Prefetch.cc (original)
+++ trafficserver/traffic/trunk/proxy/Prefetch.cc Wed Sep 7 02:53:27 2011
@@ -484,7 +484,7 @@ PrefetchTransform::redirect(HTTPHdr *res
int redirect_url_len = 0;
const char *tmp_url = resp->value_get(MIME_FIELD_LOCATION,
MIME_LEN_LOCATION, &redirect_url_len);
- redirect_url = (char *) xmalloc(redirect_url_len + 1);
+ redirect_url = (char *)ats_malloc(redirect_url_len + 1);
strncpy(redirect_url, tmp_url, redirect_url_len);
redirect_url[redirect_url_len] = '\0';
Debug("PrefetchTransform", "redirect_url = %s\n", redirect_url);
@@ -1106,7 +1106,7 @@ inline void
cookie_debug(const char *level, const char *value, int value_len)
{
if (is_debug_tag_set("PrefetchCookies")) {
- char *str = (char *) xmalloc(value_len + 1);
+ char *str = (char *)ats_malloc(value_len + 1);
memcpy(str, value, value_len);
str[value_len] = 0;
Debug("PrefetchCookies", "Processing %s value: %s", level, str);
@@ -1939,8 +1939,8 @@ PrefetchConfiguration::readHtmlTags(int
}
if (ntags > 0) {
- html_tag *xtags = (html_tag *) xmalloc((ntags + 3) * sizeof(html_tag));
- ink_assert(xtags);
+ html_tag *xtags = (html_tag *)ats_malloc((ntags + 3) * sizeof(html_tag));
+
memcpy(xtags, &tags[0], ntags * sizeof(tags[0]));
//the following two are always added
xtags[ntags].tag = "base";
@@ -1951,7 +1951,7 @@ PrefetchConfiguration::readHtmlTags(int
*ptags = xtags;
if (attrs_exist) {
- html_tag *xattrs = (html_tag *) xmalloc((ntags + 3) * sizeof(html_tag));
+ html_tag *xattrs = (html_tag *)ats_malloc((ntags + 3) *
sizeof(html_tag));
memcpy(xattrs, &attrs[0], 256 * sizeof(html_tag));
*pattrs = xattrs;
} else
Modified: trafficserver/traffic/trunk/proxy/congest/Congestion.cc
URL:
http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/congest/Congestion.cc?rev=1165976&r1=1165975&r2=1165976&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/congest/Congestion.cc (original)
+++ trafficserver/traffic/trunk/proxy/congest/Congestion.cc Wed Sep 7 02:53:27
2011
@@ -128,7 +128,7 @@ CongestionControlRecord::validate()
#define IsGt0(var)\
if ( var < 1 ) { \
- error_buf = (char*) xmalloc(error_len); \
+ error_buf = (char*)ats_malloc(error_len); \
snprintf(error_buf, error_len, "line %d: invalid %s = %d, %s must > 0", \
line_num, #var, var, #var); \
cleanup(); \
@@ -140,7 +140,7 @@ CongestionControlRecord::validate()
if (max_connection_failures >= CONG_RULE_MAX_max_connection_failures ||
(max_connection_failures <= 0 && max_connection_failures !=
CONG_RULE_ULIMITED_max_connection_failures)
) {
- error_buf = (char *) xmalloc(error_len);
+ error_buf = (char *)ats_malloc(error_len);
snprintf(error_buf, error_len, "line %d: invalid %s = %d not in [1, %d)
range",
line_num, "max_connection_failures", max_connection_failures,
CONG_RULE_MAX_max_connection_failures);
cleanup();
@@ -234,7 +234,7 @@ CongestionControlRecord::Init(matcher_li
tmp = ProcessModifiers(line_info);
if (tmp != NULL) {
- errBuf = (char *) xmalloc(errBufLen * sizeof(char));
+ errBuf = (char *)ats_malloc(errBufLen * sizeof(char));
snprintf(errBuf, errBufLen, "%s %s at line %d in congestion.config",
congestPrefix, tmp, line_num);
return errBuf;
}
Modified: trafficserver/traffic/trunk/proxy/hdrs/MIME.cc
URL:
http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/hdrs/MIME.cc?rev=1165976&r1=1165975&r2=1165976&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/hdrs/MIME.cc (original)
+++ trafficserver/traffic/trunk/proxy/hdrs/MIME.cc Wed Sep 7 02:53:27 2011
@@ -947,7 +947,7 @@ mime_init_date_format_table()
last_days = now_days + 366;
num_days = last_days - first_days + 1;
- _days_to_mdy_fast_lookup_table = (MDY *) xmalloc(num_days * sizeof(MDY));
+ _days_to_mdy_fast_lookup_table = (MDY *)ats_malloc(num_days * sizeof(MDY));
_days_to_mdy_fast_lookup_table_first_day = first_days;
_days_to_mdy_fast_lookup_table_last_day = last_days;
@@ -2112,7 +2112,7 @@ mime_field_value_extend_comma_val(HdrHea
if (extended_len <= sizeof(temp_buf))
temp_ptr = temp_buf;
else
- temp_ptr = (char *) xmalloc(extended_len);
+ temp_ptr = (char *)ats_malloc(extended_len);
// (7) construct new extended token
dest = temp_ptr;
@@ -2347,20 +2347,17 @@ mime_scanner_append(MIMEScanner * scanne
// if not enough space, allocate or grow the buffer //
//////////////////////////////////////////////////////
- if (data_size > free_size) // need to allocate/grow the buffer
- {
+ if (data_size > free_size) { // need to allocate/grow the buffer
if (scanner->m_line_size == 0) // buffer should be at least 128 bytes
scanner->m_line_size = 128;
- while (free_size < data_size) // grow buffer by powers of 2
- {
+ while (free_size < data_size) { // grow buffer by powers of 2
scanner->m_line_size *= 2;
free_size = scanner->m_line_size - scanner->m_line_length;
}
- if (scanner->m_line == NULL) // if no buffer yet, allocate one
- {
- scanner->m_line = (char *) xmalloc(scanner->m_line_size);
+ if (scanner->m_line == NULL) { // if no buffer yet, allocate one
+ scanner->m_line = (char *)ats_malloc(scanner->m_line_size);
} else {
scanner->m_line = (char *) xrealloc(scanner->m_line,
scanner->m_line_size);
}
Modified: trafficserver/traffic/trunk/proxy/http/HttpBodyFactory.cc
URL:
http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/http/HttpBodyFactory.cc?rev=1165976&r1=1165975&r2=1165976&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/http/HttpBodyFactory.cc (original)
+++ trafficserver/traffic/trunk/proxy/http/HttpBodyFactory.cc Wed Sep 7
02:53:27 2011
@@ -127,7 +127,7 @@ HttpBodyFactory::fabricate_with_old_api(
if (context->return_xbuf_plain && format) {
int l = ink_bvsprintf(NULL, format, ap);
if (l < max_buffer_length) {
- buffer = (char *) xmalloc(l + 1);
+ buffer = (char *)ats_malloc(l + 1);
*resulting_buffer_length = ink_bvsprintf(buffer, format, ap);
plain_flag = true;
}
@@ -631,8 +631,7 @@ HttpBodyFactory::load_sets_from_director
}
new_table_of_sets = NEW(new RawHashTable(RawHashTable_KeyType_String));
- entry_buffer = (struct dirent *)
- xmalloc(sizeof(struct dirent) + MAXPATHLEN + 1);
+ entry_buffer = (struct dirent *)ats_malloc(sizeof(struct dirent) +
MAXPATHLEN + 1);
//////////////////////////////////////////
// loop over each language subdirectory //
@@ -714,8 +713,7 @@ HttpBodyFactory::load_body_set_from_dire
Debug("body_factory", " body_set = 0x%0X (set_name '%s', lang '%s', charset
'%s')",
body_set, body_set->set_name, body_set->content_language,
body_set->content_charset);
- entry_buffer = (struct dirent *)
- xmalloc(sizeof(struct dirent) + MAXPATHLEN + 1);
+ entry_buffer = (struct dirent *)ats_malloc(sizeof(struct dirent) +
MAXPATHLEN + 1);
while ((readdir_r(dir, entry_buffer, &result) == 0) && (result != NULL)) {
HttpBodyTemplate *tmpl;
@@ -993,7 +991,7 @@ HttpBodyTemplate::load_from_file(char *d
////////////////////////////////////////
new_byte_count = stat_buf.st_size;
- new_template_buffer = (char *) xmalloc(new_byte_count + 1);
+ new_template_buffer = (char *)ats_malloc(new_byte_count + 1);
bytes_read = read(fd, new_template_buffer, new_byte_count);
new_template_buffer[new_byte_count] = '\0';
close(fd);
@@ -1019,7 +1017,7 @@ HttpBodyTemplate::load_from_file(char *d
template_buffer = new_template_buffer;
byte_count = new_byte_count;
size_t pathlen = strlen(path) + 1;
- template_pathname = (char *) xmalloc(pathlen);
+ template_pathname = (char *)ats_malloc(pathlen);
ink_strncpy(template_pathname, path, pathlen);
return (1);
Modified: trafficserver/traffic/trunk/proxy/http/HttpPages.cc
URL:
http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/http/HttpPages.cc?rev=1165976&r1=1165975&r2=1165976&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/http/HttpPages.cc (original)
+++ trafficserver/traffic/trunk/proxy/http/HttpPages.cc Wed Sep 7 02:53:27 2011
@@ -447,7 +447,7 @@ HttpPagesHandler::handle_callback(int ev
StatPageData data;
data.data = response;
- data.type = (char *) xmalloc(10);
+ data.type = (char *)ats_malloc(10);
snprintf(data.type, 10, "text/html");
data.length = response_length;
response = NULL;
Modified: trafficserver/traffic/trunk/proxy/logging/LogConfig.cc
URL:
http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/logging/LogConfig.cc?rev=1165976&r1=1165975&r2=1165976&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/logging/LogConfig.cc (original)
+++ trafficserver/traffic/trunk/proxy/logging/LogConfig.cc Wed Sep 7 02:53:27
2011
@@ -1410,8 +1410,7 @@ LogConfig::update_space_used()
//
ink_release_assert(name_max > 0);
- m_dir_entry = (struct dirent *) xmalloc(sizeof(struct dirent) + name_max +
1);
- ink_assert(m_dir_entry != NULL);
+ m_dir_entry = (struct dirent *)ats_malloc(sizeof(struct dirent) + name_max
+ 1);
}
total_space_used = 0LL;
@@ -1668,7 +1667,7 @@ LogConfig::read_xml_log_config(int from_
int filedes[2];
int nbytes = sizeof(xml_config_buffer);
const size_t ptr_size = nbytes + 20;
- char *ptr = (char *) xmalloc(ptr_size);
+ char *ptr = (char *)ats_malloc(ptr_size);
if (pipe(filedes) != 0) {
Note("xml parsing: Error in Opening a pipe\n");
Modified: trafficserver/traffic/trunk/proxy/logging/LogFormat.cc
URL:
http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/logging/LogFormat.cc?rev=1165976&r1=1165975&r2=1165976&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/logging/LogFormat.cc (original)
+++ trafficserver/traffic/trunk/proxy/logging/LogFormat.cc Wed Sep 7 02:53:27
2011
@@ -87,7 +87,7 @@ LogFormat::setup(const char *name, const
} else {
const char *tag = " %<phn>";
const size_t m_format_str_size = strlen(format_str) + (m_tagging_on ?
strlen(tag) : 0) + 1;
- m_format_str = (char *) xmalloc(m_format_str_size);
+ m_format_str = (char *)ats_malloc(m_format_str_size);
ink_strncpy(m_format_str, format_str, m_format_str_size);
if (m_tagging_on) {
Note("Log tagging enabled, adding %%<phn> field at the end of " "format
%s", name);
@@ -154,7 +154,7 @@ LogFormat::init_variables(const char *na
m_valid = false;
} else {
if (m_aggregate) {
- m_agg_marshal_space = (char *) xmalloc(m_field_count * INK_MIN_ALIGN);
+ m_agg_marshal_space = (char *)ats_malloc(m_field_count * INK_MIN_ALIGN);
}
if (m_name_str) {
@@ -613,7 +613,7 @@ LogFormat::parse_symbol_string(const cha
combination of printf characters and logging field names, separating this
combined format string into a normal printf string and a fieldlist. The
number of logging fields parsed will be returned. The two strings
- returned are allocated with xmalloc, and should be released by the
+ returned are allocated with ats_malloc, and should be released by the
caller. The function returns -1 on error.
For 3.1, I've added the ability to log summary information using
@@ -637,9 +637,8 @@ LogFormat::parse_format_string(const cha
// string.
//
unsigned len = (unsigned)::strlen(format_str);
- *printf_str = (char *) xmalloc(len + 1);
- *fields_str = (char *) xmalloc(len + 1);
- ink_assert(*printf_str != NULL && *fields_str != NULL);
+ *printf_str = (char *)ats_malloc(len + 1);
+ *fields_str = (char *)ats_malloc(len + 1);
unsigned printf_pos = 0;
unsigned fields_pos = 0;
Modified: trafficserver/traffic/trunk/proxy/logstats.cc
URL:
http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/logstats.cc?rev=1165976&r1=1165975&r2=1165976&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/logstats.cc (original)
+++ trafficserver/traffic/trunk/proxy/logstats.cc Wed Sep 7 02:53:27 2011
@@ -1338,7 +1338,7 @@ parse_log_buff(LogBufferHeader * buf_hea
if (origin_set ? (origin_set->find(tok) != origin_set->end()) : 1)
{
o_iter = origins.find(tok);
if (origins.end() == o_iter) {
- o_stats = (OriginStats *) xmalloc(sizeof(OriginStats));
+ o_stats = (OriginStats *)ats_malloc(sizeof(OriginStats));
memset(o_stats, 0, sizeof(OriginStats));
init_elapsed(o_stats);
o_server = xstrdup(tok);
