You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by bc...@apache.org on 2010/05/12 20:33:41 UTC
svn commit: r943621 [1/5] - in /trafficserver/traffic/trunk: iocore/cache/
iocore/cluster/ iocore/dns/ iocore/eventsystem/ iocore/hostdb/ iocore/net/
libinktomi++/ librecords/ proxy/ proxy/congest/ proxy/hdrs/ proxy/http2/
proxy/http2/remap/ proxy/logg...
Author: bcall
Date: Wed May 12 18:33:38 2010
New Revision: 943621
URL: http://svn.apache.org/viewvc?rev=943621&view=rev
Log:
TS-211 Removed most of the ink_*printf functions. Removed all the ones
that didn't add functionality.
Removed:
trafficserver/traffic/trunk/libinktomi++/ink_snprintf.cc
trafficserver/traffic/trunk/libinktomi++/ink_snprintf.h
Modified:
trafficserver/traffic/trunk/iocore/cache/CacheHosting.cc
trafficserver/traffic/trunk/iocore/cache/CacheHttp.cc
trafficserver/traffic/trunk/iocore/cache/CachePages.cc
trafficserver/traffic/trunk/iocore/cache/CachePagesInternal.cc
trafficserver/traffic/trunk/iocore/cache/NewCacheVC.cc
trafficserver/traffic/trunk/iocore/cache/Store.cc
trafficserver/traffic/trunk/iocore/cluster/ClusterHandlerBase.cc
trafficserver/traffic/trunk/iocore/dns/SplitDNS.cc
trafficserver/traffic/trunk/iocore/eventsystem/IOBuffer.cc
trafficserver/traffic/trunk/iocore/hostdb/HostDB.cc
trafficserver/traffic/trunk/iocore/hostdb/MultiCache.cc
trafficserver/traffic/trunk/iocore/net/SSLCertLookup.cc
trafficserver/traffic/trunk/libinktomi++/Diags.cc
trafficserver/traffic/trunk/libinktomi++/Makefile.am
trafficserver/traffic/trunk/libinktomi++/ink_args.cc
trafficserver/traffic/trunk/libinktomi++/inktomi++.h
trafficserver/traffic/trunk/librecords/P_RecCore.i
trafficserver/traffic/trunk/librecords/RecCore.cc
trafficserver/traffic/trunk/librecords/RecUtils.cc
trafficserver/traffic/trunk/proxy/CacheControl.cc
trafficserver/traffic/trunk/proxy/ControlMatcher.cc
trafficserver/traffic/trunk/proxy/Error.cc
trafficserver/traffic/trunk/proxy/Error.h
trafficserver/traffic/trunk/proxy/ICPConfig.cc
trafficserver/traffic/trunk/proxy/InkAPI.cc
trafficserver/traffic/trunk/proxy/Main.cc
trafficserver/traffic/trunk/proxy/ParentSelection.cc
trafficserver/traffic/trunk/proxy/Plugin.cc
trafficserver/traffic/trunk/proxy/Prefetch.cc
trafficserver/traffic/trunk/proxy/Raf.cc
trafficserver/traffic/trunk/proxy/Show.h
trafficserver/traffic/trunk/proxy/StatPages.cc
trafficserver/traffic/trunk/proxy/TestClock.cc
trafficserver/traffic/trunk/proxy/congest/Congestion.cc
trafficserver/traffic/trunk/proxy/congest/CongestionDB.cc
trafficserver/traffic/trunk/proxy/hdrs/HdrTest.cc
trafficserver/traffic/trunk/proxy/http2/HttpBodyFactory.cc
trafficserver/traffic/trunk/proxy/http2/HttpTransact.cc
trafficserver/traffic/trunk/proxy/http2/HttpTransact.h
trafficserver/traffic/trunk/proxy/http2/HttpTransactCache.cc
trafficserver/traffic/trunk/proxy/http2/remap/RemapProcessor.cc
trafficserver/traffic/trunk/proxy/http2/remap/UrlRewrite.cc
trafficserver/traffic/trunk/proxy/logging/LogAccess.cc
trafficserver/traffic/trunk/proxy/logging/LogConfig.cc
trafficserver/traffic/trunk/proxy/logging/LogFieldAliasMap.h
trafficserver/traffic/trunk/proxy/logging/LogFile.cc
trafficserver/traffic/trunk/proxy/logging/LogFilter.cc
trafficserver/traffic/trunk/proxy/logging/LogHost.cc
trafficserver/traffic/trunk/proxy/logging/LogObject.cc
trafficserver/traffic/trunk/proxy/logging/LogUtils.cc
trafficserver/traffic/trunk/proxy/logstats.cc
trafficserver/traffic/trunk/proxy/mgmt2/BaseRecords.cc
trafficserver/traffic/trunk/proxy/mgmt2/Main.cc
trafficserver/traffic/trunk/proxy/mgmt2/MultiFile.cc
trafficserver/traffic/trunk/proxy/mgmt2/ProcessManager.cc
trafficserver/traffic/trunk/proxy/mgmt2/Rollback.cc
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/INKMgmtAPI.cc
trafficserver/traffic/trunk/proxy/mgmt2/api2/TSControlMain.cc
trafficserver/traffic/trunk/proxy/mgmt2/api2/remote/CoreAPIRemote.cc
trafficserver/traffic/trunk/proxy/mgmt2/cli/CLI.cc
trafficserver/traffic/trunk/proxy/mgmt2/cli/CliMain.cc
trafficserver/traffic/trunk/proxy/mgmt2/cli/clientCLI.cc
trafficserver/traffic/trunk/proxy/mgmt2/cli2/ConfigCmd.cc
trafficserver/traffic/trunk/proxy/mgmt2/cluster/ClusterCom.cc
trafficserver/traffic/trunk/proxy/mgmt2/preparse/RemapReadConfig.cc
trafficserver/traffic/trunk/proxy/mgmt2/utils/MgmtConverter.cc
trafficserver/traffic/trunk/proxy/mgmt2/utils/MgmtServerRPC.cc
trafficserver/traffic/trunk/proxy/mgmt2/utils/WebMgmtUtils.cc
trafficserver/traffic/trunk/proxy/mgmt2/web2/MgmtRaf.cc
trafficserver/traffic/trunk/proxy/mgmt2/web2/WebConfig.cc
trafficserver/traffic/trunk/proxy/mgmt2/web2/WebConfigRender.cc
trafficserver/traffic/trunk/proxy/mgmt2/web2/WebHttp.cc
trafficserver/traffic/trunk/proxy/mgmt2/web2/WebHttpLog.cc
trafficserver/traffic/trunk/proxy/mgmt2/web2/WebHttpRender.cc
trafficserver/traffic/trunk/proxy/mgmt2/web2/WebHttpSession.cc
trafficserver/traffic/trunk/proxy/mgmt2/web2/WebHttpTree.cc
trafficserver/traffic/trunk/proxy/mgmt2/web2/WebIntrMain.cc
trafficserver/traffic/trunk/proxy/mgmt2/web2/WebOverview.cc
trafficserver/traffic/trunk/proxy/mgmt2/web2/WebReconfig.cc
trafficserver/traffic/trunk/test/deft/log_sender.cc
trafficserver/traffic/trunk/test/deft/proc_manager.cc
trafficserver/traffic/trunk/test/deft/sio_raf_server.cc
trafficserver/traffic/trunk/test/deft/test_exec.cc
trafficserver/traffic/trunk/test/deft/test_log_collate.cc
trafficserver/traffic/trunk/test/deft/test_results.cc
Modified: trafficserver/traffic/trunk/iocore/cache/CacheHosting.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/iocore/cache/CacheHosting.cc?rev=943621&r1=943620&r2=943621&view=diff
==============================================================================
--- trafficserver/traffic/trunk/iocore/cache/CacheHosting.cc (original)
+++ trafficserver/traffic/trunk/iocore/cache/CacheHosting.cc Wed May 12 18:33:38 2010
@@ -465,7 +465,7 @@ CacheHostRecord::Init(int typ)
}
}
if (!num_cachepart) {
- ink_snprintf(err, 1024, "error: No partitions found for Cache Type %d\n", type);
+ snprintf(err, 1024, "error: No partitions found for Cache Type %d\n", type);
IOCORE_SignalError(err, alarmAlready);
return -1;
}
@@ -514,7 +514,7 @@ CacheHostRecord::Init(matcher_line * lin
s++;
if (!(*s)) {
const char *errptr = "A partition number expected";
- ink_snprintf(err, 1024,
+ snprintf(err, 1024,
"%s discarding %s entry at line %d :%s",
"[CacheHosting]", config_file, line_info->line_num, errptr);
IOCORE_SignalError(err, alarmAlready);
@@ -525,7 +525,7 @@ CacheHostRecord::Init(matcher_line * lin
}
}
if ((*s<'0') || (*s> '9')) {
- ink_snprintf(err, 1024,
+ snprintf(err, 1024,
"%s discarding %s entry at line %d : bad token [%c]",
"[CacheHosting]", config_file, line_info->line_num, *s);
IOCORE_SignalError(err, alarmAlready);
@@ -563,7 +563,7 @@ CacheHostRecord::Init(matcher_line * lin
}
}
if (!is_part_present) {
- ink_snprintf(err, 1024,
+ snprintf(err, 1024,
"%s discarding %s entry at line %d : bad partition number [%d]",
"[CacheHosting]", config_file, line_info->line_num, partition_number);
IOCORE_SignalError(err, alarmAlready);
@@ -584,7 +584,7 @@ CacheHostRecord::Init(matcher_line * lin
break;
}
- ink_snprintf(err, 1024,
+ snprintf(err, 1024,
"%s discarding %s entry at line %d : bad token [%s]",
"[CacheHosting]", config_file, line_info->line_num, label);
IOCORE_SignalError(err, alarmAlready);
@@ -592,7 +592,7 @@ CacheHostRecord::Init(matcher_line * lin
}
if (i == MATCHER_MAX_TOKENS) {
- ink_snprintf(err, 1024,
+ snprintf(err, 1024,
"%s discarding %s entry at line %d : No partitions specified",
"[CacheHosting]", config_file, line_info->line_num);
IOCORE_SignalError(err, alarmAlready);
Modified: trafficserver/traffic/trunk/iocore/cache/CacheHttp.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/iocore/cache/CacheHttp.cc?rev=943621&r1=943620&r2=943621&view=diff
==============================================================================
--- trafficserver/traffic/trunk/iocore/cache/CacheHttp.cc (original)
+++ trafficserver/traffic/trunk/iocore/cache/CacheHttp.cc Wed May 12 18:33:38 2010
@@ -145,7 +145,7 @@ CacheHTTPInfoVector::print(char *buffer,
data[i].alternate.request_url_get(&u);
url = u.string_get(&arena);
if (url) {
- ink_snprintf(p, buf_size, "[%s] ", url);
+ snprintf(p, buf_size, "[%s] ", url);
tmp = strlen(p);
p += tmp;
buf_size -= tmp;
@@ -153,7 +153,7 @@ CacheHTTPInfoVector::print(char *buffer,
}
if (temps || !(data[i].alternate.object_key_get() == zero_key)) {
- ink_snprintf(p, buf_size, "[%d %s]", data[i].alternate.id_get(),
+ snprintf(p, buf_size, "[%d %s]", data[i].alternate.id_get(),
CacheKey(data[i].alternate.object_key_get()).string(buf));
tmp = strlen(p);
p += tmp;
Modified: trafficserver/traffic/trunk/iocore/cache/CachePages.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/iocore/cache/CachePages.cc?rev=943621&r1=943620&r2=943621&view=diff
==============================================================================
--- trafficserver/traffic/trunk/iocore/cache/CachePages.cc (original)
+++ trafficserver/traffic/trunk/iocore/cache/CachePages.cc Wed May 12 18:33:38 2010
@@ -381,7 +381,7 @@ ShowCache::lookup_url(int event, Event *
{
char header_str[300];
- ink_snprintf(header_str, sizeof(header_str), "<font color=red>%s</font>", show_cache_urlstrs[0]);
+ snprintf(header_str, sizeof(header_str), "<font color=red>%s</font>", show_cache_urlstrs[0]);
CHECK_SHOW(begin(header_str));
url.create(NULL);
const char *s;
Modified: trafficserver/traffic/trunk/iocore/cache/CachePagesInternal.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/iocore/cache/CachePagesInternal.cc?rev=943621&r1=943620&r2=943621&view=diff
==============================================================================
--- trafficserver/traffic/trunk/iocore/cache/CachePagesInternal.cc (original)
+++ trafficserver/traffic/trunk/iocore/cache/CachePagesInternal.cc Wed May 12 18:33:38 2010
@@ -216,7 +216,7 @@ ShowCacheInternal::showPartEvacuations(i
for (int i = 0; i < last; i++) {
for (b = p->evacuate[i].head; b; b = b->link.next) {
char offset[60];
- ink_sprintf(offset, "%lld", (inku64) part_offset(p, &b->dir));
+ sprintf(offset, "%lld", (inku64) part_offset(p, &b->dir));
CHECK_SHOW(show("<tr>" "<td>%s</td>" // offset
"<td>%d</td>" // estimated size
"<td>%d</td>" // reader count
Modified: trafficserver/traffic/trunk/iocore/cache/NewCacheVC.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/iocore/cache/NewCacheVC.cc?rev=943621&r1=943620&r2=943621&view=diff
==============================================================================
--- trafficserver/traffic/trunk/iocore/cache/NewCacheVC.cc (original)
+++ trafficserver/traffic/trunk/iocore/cache/NewCacheVC.cc Wed May 12 18:33:38 2010
@@ -540,7 +540,7 @@ NewCacheVC::add_sub_header(int index)
_vio.ndone += getTunnel()->get_producer(this)->read_buffer->write("\r\n", 2);
_vio.ndone += getTunnel()->get_producer(this)->read_buffer->write(cont_range, sizeof(cont_range) - 1);
- ink_snprintf(numbers, sizeof(numbers), "%d-%d/%d", m_ranges[index]._start, m_ranges[index]._end, m_content_length);
+ snprintf(numbers, sizeof(numbers), "%d-%d/%d", m_ranges[index]._start, m_ranges[index]._end, m_content_length);
len = strlen(numbers);
if (len < RANGE_NUMBERS_LENGTH)
_vio.ndone += getTunnel()->get_producer(this)->read_buffer->write(numbers, len);
@@ -740,7 +740,7 @@ NewCacheVC::modifyRespHdr()
char numbers[60];
field = response->field_create(MIME_FIELD_CONTENT_RANGE, MIME_LEN_CONTENT_RANGE);
- ink_snprintf(numbers, sizeof(numbers), "bytes %d-%d/%d", m_ranges[0]._start, m_ranges[0]._end, m_content_length);
+ snprintf(numbers, sizeof(numbers), "bytes %d-%d/%d", m_ranges[0]._start, m_ranges[0]._end, m_content_length);
field->value_append(response->m_heap, response->m_mime, numbers, strlen(numbers));
response->field_attach(field);
}
Modified: trafficserver/traffic/trunk/iocore/cache/Store.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/iocore/cache/Store.cc?rev=943621&r1=943620&r2=943621&view=diff
==============================================================================
--- trafficserver/traffic/trunk/iocore/cache/Store.cc (original)
+++ trafficserver/traffic/trunk/iocore/cache/Store.cc Wed May 12 18:33:38 2010
@@ -418,7 +418,7 @@ Store::write_config_data(int fd)
for (int i = 0; i < n_disks; i++)
for (Span * sd = disk[i]; sd; sd = sd->link.next) {
char buf[PATH_NAME_MAX + 64];
- ink_snprintf(buf, sizeof(buf), "%s %lld\n", sd->pathname, (ink64) sd->blocks * (ink64) STORE_BLOCK_SIZE);
+ snprintf(buf, sizeof(buf), "%s %lld\n", sd->pathname, (ink64) sd->blocks * (ink64) STORE_BLOCK_SIZE);
if (ink_file_fd_writestring(fd, buf) == -1)
return (-1);
}
@@ -914,7 +914,7 @@ Span::write(int fd)
if (ink_file_fd_writestring(fd, "\n") == -1)
return (-1);
- ink_snprintf(buf, sizeof(buf), "%llu\n", blocks);
+ snprintf(buf, sizeof(buf), "%llu\n", blocks);
if (ink_file_fd_writestring(fd, buf) == -1)
return (-1);
@@ -922,7 +922,7 @@ Span::write(int fd)
if (ink_file_fd_writestring(fd, buf) == -1)
return (-1);
- ink_snprintf(buf, sizeof(buf), "%llu\n", offset);
+ snprintf(buf, sizeof(buf), "%llu\n", offset);
if (ink_file_fd_writestring(fd, buf) == -1)
return (-1);
Modified: trafficserver/traffic/trunk/iocore/cluster/ClusterHandlerBase.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/iocore/cluster/ClusterHandlerBase.cc?rev=943621&r1=943620&r2=943621&view=diff
==============================================================================
--- trafficserver/traffic/trunk/iocore/cluster/ClusterHandlerBase.cc (original)
+++ trafficserver/traffic/trunk/iocore/cluster/ClusterHandlerBase.cc Wed May 12 18:33:38 2010
@@ -771,7 +771,7 @@ ClusterHandler::machine_down()
#ifdef NON_MODULAR
machine_offline_APIcallout(ip);
#endif
- ink_snprintf(textbuf, sizeof(textbuf), "%u.%u.%u.%u:%d", DOT_SEPARATED(ip), port);
+ snprintf(textbuf, sizeof(textbuf), "%u.%u.%u.%u:%d", DOT_SEPARATED(ip), port);
REC_SignalManager(REC_SIGNAL_MACHINE_DOWN, textbuf);
if (net_vc) {
net_vc->do_io(VIO::CLOSE);
@@ -1069,7 +1069,7 @@ ClusterHandler::startClusterEvent(int ev
machine_online_APIcallout(ip);
#endif
// Signal the manager
- ink_snprintf(textbuf, sizeof(textbuf), "%u.%u.%u.%u:%d", DOT_SEPARATED(ip), port);
+ snprintf(textbuf, sizeof(textbuf), "%u.%u.%u.%u:%d", DOT_SEPARATED(ip), port);
REC_SignalManager(REC_SIGNAL_MACHINE_UP, textbuf);
#ifdef LOCAL_CLUSTER_TEST_MODE
Note("machine up %u.%u.%u.%u:%d, protocol version=%d.%d",
Modified: trafficserver/traffic/trunk/iocore/dns/SplitDNS.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/iocore/dns/SplitDNS.cc?rev=943621&r1=943620&r2=943621&view=diff
==============================================================================
--- trafficserver/traffic/trunk/iocore/dns/SplitDNS.cc (original)
+++ trafficserver/traffic/trunk/iocore/dns/SplitDNS.cc Wed May 12 18:33:38 2010
@@ -670,7 +670,7 @@ SplitDNSRecord::Init(matcher_line * line
if (strcasecmp(label, "def_domain") == 0) {
if (NULL != (errPtr = ProcessDefDomain(val))) {
- ink_snprintf(errBuf, errBufLen, "%s %s at line %d", modulePrefix, errPtr, line_num);
+ snprintf(errBuf, errBufLen, "%s %s at line %d", modulePrefix, errPtr, line_num);
return errBuf;
}
@@ -683,7 +683,7 @@ SplitDNSRecord::Init(matcher_line * line
if (strcasecmp(label, "search_list") == 0) {
if (NULL != (errPtr = ProcessDomainSrchList(val))) {
- ink_snprintf(errBuf, errBufLen, "%s %s at line %d", modulePrefix, errPtr, line_num);
+ snprintf(errBuf, errBufLen, "%s %s at line %d", modulePrefix, errPtr, line_num);
return errBuf;
}
@@ -696,7 +696,7 @@ SplitDNSRecord::Init(matcher_line * line
if (strcasecmp(label, "named") == 0) {
if (NULL != (errPtr = ProcessDNSHosts(val))) {
- ink_snprintf(errBuf, errBufLen, "%s %s at line %d", modulePrefix, errPtr, line_num);
+ snprintf(errBuf, errBufLen, "%s %s at line %d", modulePrefix, errPtr, line_num);
return errBuf;
}
@@ -707,7 +707,7 @@ SplitDNSRecord::Init(matcher_line * line
if (this->m_servers.x_server_ip[0] == 0) {
- ink_snprintf(errBuf, errBufLen, "%s No server specified in splitdns.config at line %d", modulePrefix, line_num);
+ snprintf(errBuf, errBufLen, "%s No server specified in splitdns.config at line %d", modulePrefix, line_num);
return errBuf;
}
@@ -721,7 +721,7 @@ SplitDNSRecord::Init(matcher_line * line
&m_servers.x_dns_server_port[0],
&m_servers.x_def_domain[0], &m_servers.x_domain_srch_list[0]))) {
- ink_snprintf(errBuf, errBufLen,
+ snprintf(errBuf, errBufLen,
"Failed to build res record for the servers %ld ... on port %d",
m_servers.x_server_ip[0], m_servers.x_dns_server_port[0]);
@@ -749,7 +749,7 @@ SplitDNSRecord::Init(matcher_line * line
if (tmp != NULL) {
- ink_snprintf(errBuf, errBufLen, "%s %s at line %d in splitdns.config", modulePrefix, tmp, line_num);
+ snprintf(errBuf, errBufLen, "%s %s at line %d in splitdns.config", modulePrefix, tmp, line_num);
return errBuf;
}
}
Modified: trafficserver/traffic/trunk/iocore/eventsystem/IOBuffer.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/iocore/eventsystem/IOBuffer.cc?rev=943621&r1=943620&r2=943621&view=diff
==============================================================================
--- trafficserver/traffic/trunk/iocore/eventsystem/IOBuffer.cc (original)
+++ trafficserver/traffic/trunk/iocore/eventsystem/IOBuffer.cc Wed May 12 18:33:38 2010
@@ -56,7 +56,7 @@ init_buffer_allocators()
a = s;
name = NEW(new char[64]);
- ink_snprintf(name, 64, "ioBufAllocator[%d]", i);
+ snprintf(name, 64, "ioBufAllocator[%d]", i);
ioBufAllocator[i].re_init(name, s, n, a);
}
}
Modified: trafficserver/traffic/trunk/iocore/hostdb/HostDB.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/iocore/hostdb/HostDB.cc?rev=943621&r1=943620&r2=943621&view=diff
==============================================================================
--- trafficserver/traffic/trunk/iocore/hostdb/HostDB.cc (original)
+++ trafficserver/traffic/trunk/iocore/hostdb/HostDB.cc Wed May 12 18:33:38 2010
@@ -1073,7 +1073,7 @@ remove_round_robin(HostDBInfo * r, char
#ifdef __alpha
int nbytes = sprintf(p, "%u.%u.%u.%u ", pip[0], pip[1], pip[2], pip[3]);
#else
- int nbytes = ink_snprintf(p, bufsize, "%u.%u.%u.%u ", pip[0], pip[1], pip[2], pip[3]);
+ int nbytes = snprintf(p, bufsize, "%u.%u.%u.%u ", pip[0], pip[1], pip[2], pip[3]);
#endif
p += nbytes;
bufsize -= nbytes;
Modified: trafficserver/traffic/trunk/iocore/hostdb/MultiCache.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/iocore/hostdb/MultiCache.cc?rev=943621&r1=943620&r2=943621&view=diff
==============================================================================
--- trafficserver/traffic/trunk/iocore/hostdb/MultiCache.cc (original)
+++ trafficserver/traffic/trunk/iocore/hostdb/MultiCache.cc Wed May 12 18:33:38 2010
@@ -545,7 +545,7 @@ MultiCacheBase::read_config(const char *
int scratch;
char p[PATH_NAME_MAX + 1], buf[256];
- ink_snprintf(p, PATH_NAME_MAX + 1, "%s%s%s%s%s", system_config_directory,
+ snprintf(p, PATH_NAME_MAX + 1, "%s%s%s%s%s", system_config_directory,
DIR_SEP, "internal", DIR_SEP, config_filename);
int fd =::open(p, O_RDONLY);
@@ -772,11 +772,11 @@ Lfail:
if (!silent) {
char msg[PATH_NAME_MAX + 1024];
if (reconfigure) {
- ink_snprintf(msg, PATH_NAME_MAX + 1024, "%s: [%s] %s: disabling database\n"
+ snprintf(msg, PATH_NAME_MAX + 1024, "%s: [%s] %s: disabling database\n"
"You may need to 'reconfigure' your cache manually. Please refer to\n"
"the 'Configuration' chapter in the manual.", err, config_filename, serr ? serr : "");
} else {
- ink_snprintf(msg, PATH_NAME_MAX + 1024, "%s: [%s] %s: reinitializing database", err, config_filename,
+ snprintf(msg, PATH_NAME_MAX + 1024, "%s: [%s] %s: reinitializing database", err, config_filename,
serr ? serr : "");
}
IOCORE_SignalWarning(REC_SIGNAL_CONFIG_ERROR, msg);
Modified: trafficserver/traffic/trunk/iocore/net/SSLCertLookup.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/iocore/net/SSLCertLookup.cc?rev=943621&r1=943620&r2=943621&view=diff
==============================================================================
--- trafficserver/traffic/trunk/iocore/net/SSLCertLookup.cc (original)
+++ trafficserver/traffic/trunk/iocore/net/SSLCertLookup.cc Wed May 12 18:33:38 2010
@@ -99,7 +99,7 @@ SSLCertLookup::buildTable()
errPtr = parseConfigLine(line, &line_info, &sslCertTags);
if (errPtr != NULL) {
- ink_snprintf(errBuf, 1024, "%s discarding %s entry at line %d : %s",
+ snprintf(errBuf, 1024, "%s discarding %s entry at line %d : %s",
moduleName, configFilePath, line_num, errPtr);
IOCORE_SignalError(errBuf, alarmAlready);
} else {
@@ -108,7 +108,7 @@ SSLCertLookup::buildTable()
errPtr = extractIPAndCert(&line_info, &addr, &sslCert, &priKey);
if (errPtr != NULL) {
- ink_snprintf(errBuf, 1024, "%s discarding %s entry at line %d : %s",
+ snprintf(errBuf, 1024, "%s discarding %s entry at line %d : %s",
moduleName, configFilePath, line_num, errPtr);
IOCORE_SignalError(errBuf, alarmAlready);
} else {
Modified: trafficserver/traffic/trunk/libinktomi++/Diags.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/libinktomi%2B%2B/Diags.cc?rev=943621&r1=943620&r2=943621&view=diff
==============================================================================
--- trafficserver/traffic/trunk/libinktomi++/Diags.cc (original)
+++ trafficserver/traffic/trunk/libinktomi++/Diags.cc Wed May 12 18:33:38 2010
@@ -44,7 +44,6 @@
#include "Diags.h"
#include <time.h>
#include "ink_platform.h"
-#include "ink_snprintf.h"
//fixme #include "BaseRecords.h"
#include "ink_port.h"
#include "Compatability.h"
@@ -72,9 +71,9 @@ SrcLoc::str(char *buf, int buflen)
if (!valid || buflen < 1)
return (NULL);
if (func != NULL) {
- ink_snprintf(buf, buflen, "%s:%d (%s)", file, line, func);
+ snprintf(buf, buflen, "%s:%d (%s)", file, line, func);
} else {
- ink_snprintf(buf, buflen, "%s:%d", file, line);
+ snprintf(buf, buflen, "%s:%d", file, line);
}
buf[buflen - 1] = NUL;
return (buf);
@@ -290,7 +289,7 @@ Diags::print_va(const char *debug_tag, D
va_copy(ap_scratch, ap);
char *buffer;
buffer = format_buf_w_ts;
- ink_vfprintf(diags_log_fp, buffer, ap_scratch);
+ vfprintf(diags_log_fp, buffer, ap_scratch);
{
int len = strlen(buffer);
if (len > 0 && buffer[len - 1] != '\n') {
@@ -305,7 +304,7 @@ Diags::print_va(const char *debug_tag, D
va_copy(ap_scratch, ap);
char *buffer;
buffer = format_buf_w_ts;
- ink_vfprintf(stdout, buffer, ap_scratch);
+ vfprintf(stdout, buffer, ap_scratch);
{
int len = strlen(buffer);
if (len > 0 && buffer[len - 1] != '\n') {
@@ -319,7 +318,7 @@ Diags::print_va(const char *debug_tag, D
va_copy(ap_scratch, ap);
char *buffer;
buffer = format_buf_w_ts;
- ink_vfprintf(stderr, buffer, ap_scratch);
+ vfprintf(stderr, buffer, ap_scratch);
{
int len = strlen(buffer);
if (len > 0 && buffer[len - 1] != '\n') {
@@ -367,7 +366,7 @@ Diags::print_va(const char *debug_tag, D
priority = LOG_NOTICE;
break;
}
- ink_vsnprintf(syslog_buffer, sizeof(syslog_buffer) - 1, format_buf, ap);
+ vsnprintf(syslog_buffer, sizeof(syslog_buffer) - 1, format_buf, ap);
syslog(priority, "%s", syslog_buffer);
}
#if (HOST_OS == freebsd)
Modified: trafficserver/traffic/trunk/libinktomi++/Makefile.am
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/libinktomi%2B%2B/Makefile.am?rev=943621&r1=943620&r2=943621&view=diff
==============================================================================
--- trafficserver/traffic/trunk/libinktomi++/Makefile.am (original)
+++ trafficserver/traffic/trunk/libinktomi++/Makefile.am Wed May 12 18:33:38 2010
@@ -93,8 +93,6 @@ libinktomi___a_SOURCES = \
ink_resource.h \
ink_rwlock.cc \
ink_rwlock.h \
- ink_snprintf.cc \
- ink_snprintf.h \
ink_sock.cc \
ink_sock.h \
ink_spill.cc \
Modified: trafficserver/traffic/trunk/libinktomi++/ink_args.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/libinktomi%2B%2B/ink_args.cc?rev=943621&r1=943620&r2=943621&view=diff
==============================================================================
--- trafficserver/traffic/trunk/libinktomi++/ink_args.cc (original)
+++ trafficserver/traffic/trunk/libinktomi++/ink_args.cc Wed May 12 18:33:38 2010
@@ -27,7 +27,6 @@ Process arguments
****************************************************************************/
#include "inktomi++.h"
-#include "ink_snprintf.h"
#include "ink_unused.h" /* MAGIC_EDITING_TAG */
//
@@ -120,7 +119,7 @@ show_argument_configuration(ArgumentDesc
printf("%f", *(double *) argument_descriptions[i].location);
break;
case 'L':
- ink_printf("%lld", *(ink64 *) argument_descriptions[i].location);
+ printf("%lld", *(ink64 *) argument_descriptions[i].location);
break;
case 'S':
printf("%s", (char *) argument_descriptions[i].location);
Modified: trafficserver/traffic/trunk/libinktomi++/inktomi++.h
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/libinktomi%2B%2B/inktomi%2B%2B.h?rev=943621&r1=943620&r2=943621&view=diff
==============================================================================
--- trafficserver/traffic/trunk/libinktomi++/inktomi++.h (original)
+++ trafficserver/traffic/trunk/libinktomi++/inktomi++.h Wed May 12 18:33:38 2010
@@ -105,7 +105,6 @@ extern "C"
#include "ink_rand.h"
#include "ink_resolver.h"
#include "ink_resource.h"
-#include "ink_snprintf.h"
#include "ink_sock.h"
#include "ink_inet.h"
#include "ink_spill.h"
Modified: trafficserver/traffic/trunk/librecords/P_RecCore.i
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/librecords/P_RecCore.i?rev=943621&r1=943620&r2=943621&view=diff
==============================================================================
--- trafficserver/traffic/trunk/librecords/P_RecCore.i (original)
+++ trafficserver/traffic/trunk/librecords/P_RecCore.i Wed May 12 18:33:38 2010
@@ -24,7 +24,6 @@
#include "TextBuffer.h"
#include "Tokenizer.h"
#include "ink_string.h"
-#include "ink_snprintf.h"
#include "P_RecCompatibility.h"
#include "P_RecUtils.h"
@@ -988,17 +987,17 @@ RecSyncConfigToTB(textBuffer * tb)
switch (r->data_type) {
case RECD_INT:
tb->copyFrom("INT ", 4);
- ink_snprintf(b, 1023, "%lld", r->data.rec_int);
+ snprintf(b, 1023, "%lld", r->data.rec_int);
tb->copyFrom(b, strlen(b));
break;
case RECD_LLONG:
tb->copyFrom("LLONG ", 6);
- ink_snprintf(b, 1023, "%lld", r->data.rec_llong);
+ snprintf(b, 1023, "%lld", r->data.rec_llong);
tb->copyFrom(b, strlen(b));
break;
case RECD_FLOAT:
tb->copyFrom("FLOAT ", 6);
- ink_snprintf(b, 1023, "%f", r->data.rec_float);
+ snprintf(b, 1023, "%f", r->data.rec_float);
tb->copyFrom(b, strlen(b));
break;
case RECD_STRING:
@@ -1011,7 +1010,7 @@ RecSyncConfigToTB(textBuffer * tb)
break;
case RECD_COUNTER:
tb->copyFrom("COUNTER ", 8);
- ink_snprintf(b, 1023, "%lld", r->data.rec_counter);
+ snprintf(b, 1023, "%lld", r->data.rec_counter);
tb->copyFrom(b, strlen(b));
break;
default:
Modified: trafficserver/traffic/trunk/librecords/RecCore.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/librecords/RecCore.cc?rev=943621&r1=943620&r2=943621&view=diff
==============================================================================
--- trafficserver/traffic/trunk/librecords/RecCore.cc (original)
+++ trafficserver/traffic/trunk/librecords/RecCore.cc Wed May 12 18:33:38 2010
@@ -547,19 +547,19 @@ RecGetRecordGeneric_Xmalloc(const char *
memset(*rec_string, 0, 1024);
switch (data_type) {
case RECD_INT:
- ink_snprintf(*rec_string, 1023, "%lld", data.rec_int);
+ snprintf(*rec_string, 1023, "%lld", data.rec_int);
break;
case RECD_LLONG:
- ink_snprintf(*rec_string, 1023, "%lld", data.rec_llong);
+ snprintf(*rec_string, 1023, "%lld", data.rec_llong);
break;
case RECD_FLOAT:
- ink_snprintf(*rec_string, 1023, "%f", data.rec_float);
+ snprintf(*rec_string, 1023, "%f", data.rec_float);
break;
case RECD_STRING:
- ink_snprintf(*rec_string, 1023, "%s", data.rec_string);
+ snprintf(*rec_string, 1023, "%s", data.rec_string);
break;
case RECD_COUNTER:
- ink_snprintf(*rec_string, 1023, "%lld", data.rec_counter);
+ snprintf(*rec_string, 1023, "%lld", data.rec_counter);
break;
default:
return REC_ERR_FAIL;
@@ -759,13 +759,13 @@ RecGetRecordDefaultDataString_Xmalloc(ch
switch (r->data_type) {
case RECD_INT:
- ink_snprintf(*buf, 1023, "%lld", r->data_default.rec_int);
+ snprintf(*buf, 1023, "%lld", r->data_default.rec_int);
break;
case RECD_LLONG:
- ink_snprintf(*buf, 1023, "%lld", r->data_default.rec_llong);
+ snprintf(*buf, 1023, "%lld", r->data_default.rec_llong);
break;
case RECD_FLOAT:
- ink_snprintf(*buf, 1023, "%f", r->data_default.rec_float);
+ snprintf(*buf, 1023, "%f", r->data_default.rec_float);
break;
case RECD_STRING:
if (r->data_default.rec_string) {
@@ -777,7 +777,7 @@ RecGetRecordDefaultDataString_Xmalloc(ch
}
break;
case RECD_COUNTER:
- ink_snprintf(*buf, 1023, "%lld", r->data_default.rec_counter);
+ snprintf(*buf, 1023, "%lld", r->data_default.rec_counter);
break;
default:
ink_debug_assert(!"Unexpected RecD type");
@@ -1078,23 +1078,23 @@ RecGetRecordPrefix_Xmalloc(char *prefix,
switch (r->data_type) {
case RECD_INT:
num_matched++;
- ink_sprintf(&result[strlen(result)], "%s=%lld\r\n", r->name, r->data.rec_int);
+ sprintf(&result[strlen(result)], "%s=%lld\r\n", r->name, r->data.rec_int);
break;
case RECD_LLONG:
num_matched++;
- ink_sprintf(&result[strlen(result)], "%s=%lld\r\n", r->name, r->data.rec_llong);
+ sprintf(&result[strlen(result)], "%s=%lld\r\n", r->name, r->data.rec_llong);
break;
case RECD_FLOAT:
num_matched++;
- ink_sprintf(&result[strlen(result)], "%s=%f\r\n", r->name, r->data.rec_float);
+ sprintf(&result[strlen(result)], "%s=%f\r\n", r->name, r->data.rec_float);
break;
case RECD_STRING:
num_matched++;
- ink_sprintf(&result[strlen(result)], "%s=%s\r\n", r->name, r->data.rec_string ? r->data.rec_string : "NULL");
+ sprintf(&result[strlen(result)], "%s=%s\r\n", r->name, r->data.rec_string ? r->data.rec_string : "NULL");
break;
case RECD_COUNTER:
num_matched++;
- ink_sprintf(&result[strlen(result)], "%s=%lld\r\n", r->name, r->data.rec_int);
+ sprintf(&result[strlen(result)], "%s=%lld\r\n", r->name, r->data.rec_int);
break;
default:
break;
Modified: trafficserver/traffic/trunk/librecords/RecUtils.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/librecords/RecUtils.cc?rev=943621&r1=943620&r2=943621&view=diff
==============================================================================
--- trafficserver/traffic/trunk/librecords/RecUtils.cc (original)
+++ trafficserver/traffic/trunk/librecords/RecUtils.cc Wed May 12 18:33:38 2010
@@ -154,7 +154,7 @@ RecDataSetFromInk64(RecDataT data_type,
if (data_dst->rec_string) {
xfree(data_dst->rec_string);
}
- ink_snprintf(buf, 32, "%lld", data_ink64);
+ snprintf(buf, 32, "%lld", data_ink64);
data_dst->rec_string = xstrdup(buf);
break;
}
@@ -194,7 +194,7 @@ RecDataSetFromFloat(RecDataT data_type,
if (data_dst->rec_string) {
xfree(data_dst->rec_string);
}
- ink_snprintf(buf, 32, "%f", data_float);
+ snprintf(buf, 32, "%f", data_float);
data_dst->rec_string = xstrdup(buf);
break;
}
Modified: trafficserver/traffic/trunk/proxy/CacheControl.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/CacheControl.cc?rev=943621&r1=943620&r2=943621&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/CacheControl.cc (original)
+++ trafficserver/traffic/trunk/proxy/CacheControl.cc Wed May 12 18:33:38 2010
@@ -291,7 +291,7 @@ CacheControlRecord::Init(matcher_line *
// d_found = true;
} else {
errBuf = (char *) xmalloc(errBufLen * sizeof(char));
- ink_snprintf(errBuf, errBufLen, "%s Invalid action at line %d in cache.config", modulePrefix, line_num);
+ snprintf(errBuf, errBufLen, "%s Invalid action at line %d in cache.config", modulePrefix, line_num);
return errBuf;
}
} else {
@@ -314,7 +314,7 @@ CacheControlRecord::Init(matcher_line *
} else {
errBuf = (char *) xmalloc(errBufLen * sizeof(char));
- ink_snprintf(errBuf, errBufLen, "%s %s at line %d in cache.config", modulePrefix, tmp, line_num);
+ snprintf(errBuf, errBufLen, "%s %s at line %d in cache.config", modulePrefix, tmp, line_num);
return errBuf;
}
}
@@ -330,7 +330,7 @@ CacheControlRecord::Init(matcher_line *
if (d_found == false) {
errBuf = (char *) xmalloc(errBufLen * sizeof(char));
- ink_snprintf(errBuf, errBufLen, "%s No directive in cache.config at line %d", modulePrefix, line_num);
+ snprintf(errBuf, errBufLen, "%s No directive in cache.config at line %d", modulePrefix, line_num);
return errBuf;
}
// Process any modifiers to the directive, if they exist
@@ -339,7 +339,7 @@ CacheControlRecord::Init(matcher_line *
if (tmp != NULL) {
errBuf = (char *) xmalloc(errBufLen * sizeof(char));
- ink_snprintf(errBuf, errBufLen, "%s %s at line %d in cache.config", modulePrefix, tmp, line_num);
+ snprintf(errBuf, errBufLen, "%s %s at line %d in cache.config", modulePrefix, tmp, line_num);
return errBuf;
}
}
Modified: trafficserver/traffic/trunk/proxy/ControlMatcher.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/ControlMatcher.cc?rev=943621&r1=943620&r2=943621&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/ControlMatcher.cc (original)
+++ trafficserver/traffic/trunk/proxy/ControlMatcher.cc Wed May 12 18:33:38 2010
@@ -309,7 +309,7 @@ template<class Data, class Result> char
if (!re_array[num_el]) {
errBuf = (char *) xmalloc(1024 * sizeof(char));
*errBuf = '\0';
- ink_snprintf(errBuf, 1024, "%s regular expression error at line %d position %d : %s",
+ snprintf(errBuf, 1024, "%s regular expression error at line %d position %d : %s",
matcher_name, line_info->line_num, erroffset, error);
re_array[num_el] = NULL;
return errBuf;
Modified: trafficserver/traffic/trunk/proxy/Error.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/Error.cc?rev=943621&r1=943620&r2=943621&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/Error.cc (original)
+++ trafficserver/traffic/trunk/proxy/Error.cc Wed May 12 18:33:38 2010
@@ -36,7 +36,6 @@
#include "Error.h"
#include <time.h>
#include "ink_platform.h"
-#include "ink_snprintf.h"
ErrorClass::~ErrorClass()
{
Modified: trafficserver/traffic/trunk/proxy/Error.h
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/Error.h?rev=943621&r1=943620&r2=943621&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/Error.h (original)
+++ trafficserver/traffic/trunk/proxy/Error.h Wed May 12 18:33:38 2010
@@ -35,7 +35,6 @@
#define _Error_h_
#include "inktomi++.h"
-#include "ink_snprintf.h"
#include "Diags.h"
//////////////////////////////////////////////////////////////////////////////
Modified: trafficserver/traffic/trunk/proxy/ICPConfig.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/ICPConfig.cc?rev=943621&r1=943620&r2=943621&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/ICPConfig.cc (original)
+++ trafficserver/traffic/trunk/proxy/ICPConfig.cc Wed May 12 18:33:38 2010
@@ -1421,7 +1421,7 @@ dumpICPstatEntry(int i, const char *name
sval = p->sum;
cval = p->count;
- ink_printf("%s%s %12b64d %16b64d %17.4f\n",
+ printf("%s%s %12lld %16lld %17.4f\n",
l > 30 ? "" : &SPACES[48 + l],
&name[l > 31 ? l - 31 : 0], cval, sval, cval ? (((double) sval) / ((double) cval)) : 0.0);
}
@@ -1429,7 +1429,7 @@ dumpICPstatEntry(int i, const char *name
void
dumpICPstats()
{
- ink_printf("\n");
+ printf("\n");
int i;
for (i = 0; i < icp_stat_count; ++i) {
dumpICPstatEntry(i, ICPstatNames[i]);
Modified: trafficserver/traffic/trunk/proxy/InkAPI.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/InkAPI.cc?rev=943621&r1=943620&r2=943621&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/InkAPI.cc (original)
+++ trafficserver/traffic/trunk/proxy/InkAPI.cc Wed May 12 18:33:38 2010
@@ -7661,7 +7661,7 @@ INKMgmtConfigIntSet(const char *var_name
// construct a buffer
int buffer_size = strlen(var_name) + 1 + 32 + 1 + 64 + 1;
buffer = (char *) alloca(buffer_size);
- ink_snprintf(buffer, buffer_size, "%s %d %lld", var_name, INK_INT, value);
+ snprintf(buffer, buffer_size, "%s %d %lld", var_name, INK_INT, value);
// tell manager to set the configuration; note that this is not
// transactional (e.g. we return control to the plugin before the
Modified: trafficserver/traffic/trunk/proxy/Main.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/Main.cc?rev=943621&r1=943620&r2=943621&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/Main.cc (original)
+++ trafficserver/traffic/trunk/proxy/Main.cc Wed May 12 18:33:38 2010
@@ -632,7 +632,7 @@ clear_rn_cache()
return CMD_FAILED;
}
char remove_cmd[PATH_NAME_MAX + 6];
- ink_snprintf(remove_cmd, sizeof(remove_cmd), "%s %s/*", "rm -f", rn_cache_path);
+ snprintf(remove_cmd, sizeof(remove_cmd), "%s %s/*", "rm -f", rn_cache_path);
do {
result = system(remove_cmd);
}
@@ -1272,7 +1272,7 @@ struct ShowStats:Continuation
NET_READ_DYN_STAT(net_handler_run_stat, sval, cval);
ink64 d_p = cval - last_p;
last_p += d_p;
- ink_printf("%lld:%lld %lld:%lld %lld:%lld %lld:%lld %lld %lld\n",
+ printf("%lld:%lld %lld:%lld %lld:%lld %lld:%lld %lld %lld\n",
d_rb, d_r, d_wb, d_w, d_nrb, d_nr, d_nwb, d_nw, d_o, d_p);
#ifdef ENABLE_TIME_TRACE
int i;
Modified: trafficserver/traffic/trunk/proxy/ParentSelection.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/ParentSelection.cc?rev=943621&r1=943620&r2=943621&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/ParentSelection.cc (original)
+++ trafficserver/traffic/trunk/proxy/ParentSelection.cc Wed May 12 18:33:38 2010
@@ -732,7 +732,7 @@ ParentRecord::DefaultInit(char *val)
if (errPtr != NULL) {
errBuf = (char *) xmalloc(1024);
- ink_snprintf(errBuf, 1024, "%s %s for default parent proxy", modulePrefix, errPtr);
+ snprintf(errBuf, 1024, "%s %s for default parent proxy", modulePrefix, errPtr);
SignalError(errBuf, alarmAlready);
xfree(errBuf);
return false;
@@ -803,7 +803,7 @@ ParentRecord::Init(matcher_line * line_i
// Report errors generated by ProcessParents();
if (errPtr != NULL) {
errBuf = (char *) xmalloc(errBufLen * sizeof(char));
- ink_snprintf(errBuf, errBufLen, "%s %s at line %d", modulePrefix, errPtr, line_num);
+ snprintf(errBuf, errBufLen, "%s %s at line %d", modulePrefix, errPtr, line_num);
return errBuf;
}
@@ -816,7 +816,7 @@ ParentRecord::Init(matcher_line * line_i
if (this->parents == NULL && go_direct == false) {
errBuf = (char *) xmalloc(errBufLen * sizeof(char));
- ink_snprintf(errBuf, errBufLen, "%s No parent specified in parent.config at line %d", modulePrefix, line_num);
+ snprintf(errBuf, errBufLen, "%s No parent specified in parent.config at line %d", modulePrefix, line_num);
return errBuf;
}
// Process any modifiers to the directive, if they exist
@@ -825,7 +825,7 @@ ParentRecord::Init(matcher_line * line_i
if (tmp != NULL) {
errBuf = (char *) xmalloc(errBufLen * sizeof(char));
- ink_snprintf(errBuf, errBufLen, "%s %s at line %d in parent.config", modulePrefix, tmp, line_num);
+ snprintf(errBuf, errBufLen, "%s %s at line %d in parent.config", modulePrefix, tmp, line_num);
return errBuf;
}
// record SCHEME modifier if present.
@@ -1008,7 +1008,7 @@ setup_socks_servers(ParentRecord * rec_a
Warning("Could not resolve socks server name \"%s\". " "Please correct it", pr[i].hostname);
ip = (inku8 *) & bad_ip;
}
- ink_snprintf(pr[i].hostname, DOMAIN_NAME_MAX + 1, "%u.%u.%u.%u", ip[0], ip[1], ip[2], ip[3]);
+ snprintf(pr[i].hostname, DOMAIN_NAME_MAX + 1, "%u.%u.%u.%u", ip[0], ip[1], ip[2], ip[3]);
}
}
Modified: trafficserver/traffic/trunk/proxy/Plugin.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/Plugin.cc?rev=943621&r1=943620&r2=943621&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/Plugin.cc (original)
+++ trafficserver/traffic/trunk/proxy/Plugin.cc Wed May 12 18:33:38 2010
@@ -35,7 +35,6 @@
#include "Main.h"
#include "Plugin.h"
#include "PluginDB.h"
-#include "ink_snprintf.h"
#include "stats/Stats.h"
// HPUX:
@@ -210,7 +209,7 @@ plugin_expand(char *arg)
goto not_found;
}
str = (char *) xmalloc(128);
- ink_snprintf(str, 128, "%f", (float) float_val);
+ snprintf(str, 128, "%f", (float) float_val);
return str;
break;
}
@@ -221,7 +220,7 @@ plugin_expand(char *arg)
goto not_found;
}
str = (char *) xmalloc(128);
- ink_snprintf(str, 128, "%ld", (long int) int_val);
+ snprintf(str, 128, "%ld", (long int) int_val);
return str;
break;
}
@@ -232,7 +231,7 @@ plugin_expand(char *arg)
goto not_found;
}
str = (char *) xmalloc(128);
- ink_snprintf(str, 128, "%lld", (long long) llong_val);
+ snprintf(str, 128, "%lld", (long long) llong_val);
return str;
break;
}
@@ -243,7 +242,7 @@ plugin_expand(char *arg)
goto not_found;
}
str = (char *) xmalloc(128);
- ink_snprintf(str, 128, "%ld", (long int) count_val);
+ snprintf(str, 128, "%ld", (long int) count_val);
return str;
break;
}
Modified: trafficserver/traffic/trunk/proxy/Prefetch.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/Prefetch.cc?rev=943621&r1=943620&r2=943621&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/Prefetch.cc (original)
+++ trafficserver/traffic/trunk/proxy/Prefetch.cc Wed May 12 18:33:38 2010
@@ -667,7 +667,7 @@ check_n_attach_prefetch_transform(HttpSM
Debug("PrefetchParser", "Adding Prefetch Parser 0x%p\n", prefetch_trans);
INKHttpTxnHookAdd(sm, INK_HTTP_RESPONSE_TRANSFORM_HOOK, prefetch_trans);
- DUMP_HEADER("PrefetchParserHdrs", &sm->t_state.hdr_info.client_request, 0,
+ DUMP_HEADER("PrefetchParserHdrs", &sm->t_state.hdr_info.client_request, (ink64)0,
"Request Header given for Prefetch Parser");
}
}
@@ -1009,7 +1009,7 @@ PrefetchBlaster::init(PrefetchUrlEntry *
} else
entry->child_ip = entry->req_ip;
- DUMP_HEADER("PrefetchBlasterHdrs", request, 0, "Request Header from Prefetch Blaster");
+ DUMP_HEADER("PrefetchBlasterHdrs", request, (ink64)0, "Request Header from Prefetch Blaster");
url_ent = entry->assign(); //refcount
transform = p_trans->assign();
@@ -1379,11 +1379,11 @@ Lcheckcookie:
request->field_delete(MIME_FIELD_COOKIE, MIME_LEN_COOKIE);
}
- DUMP_HEADER("PrefetchCookies", req_hdr, 0,
+ DUMP_HEADER("PrefetchCookies", req_hdr, (ink64)0,
"Request Header for the top page used as the base for the new request with Cookies");
- DUMP_HEADER("PrefetchCookies", resp_hdr, 0,
+ DUMP_HEADER("PrefetchCookies", resp_hdr, (ink64)0,
"Response Header for the top page used as the base for the new request with Cookies");
- DUMP_HEADER("PrefetchCookies", request, 0, "Request Header with Cookies generated by Prefetch Parser");
+ DUMP_HEADER("PrefetchCookies", request, (ink64)0, "Request Header with Cookies generated by Prefetch Parser");
}
int
Modified: trafficserver/traffic/trunk/proxy/Raf.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/Raf.cc?rev=943621&r1=943620&r2=943621&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/Raf.cc (original)
+++ trafficserver/traffic/trunk/proxy/Raf.cc Wed May 12 18:33:38 2010
@@ -420,7 +420,7 @@ RafCont::process_raf_cmd(const char *cmd
}
char msg[257];
- ink_snprintf(msg, 256, "Unknown cmd '%s' sent", cmd_ptrs[1]);
+ snprintf(msg, 256, "Unknown cmd '%s' sent", cmd_ptrs[1]);
msg[256] = '\0';
output_raf_error(cmd_ptrs[0], msg);
free_cmd_strs(cmd_ptrs, argc);
@@ -450,28 +450,28 @@ RafCont::process_query_stat(const char *
} else {
i = REC_readInteger(var, &tmp);
}
- ink_snprintf(val_output, 256, "%lld", i);
+ snprintf(val_output, 256, "%lld", i);
break;
}
case RECD_LLONG:
{
bool tmp = false;
RecLLong i = REC_readLLong(var, &tmp);
- ink_snprintf(val_output, 256, "%lld", i);
+ snprintf(val_output, 256, "%lld", i);
break;
}
case RECD_FLOAT:
{
bool tmp = false;
RecFloat f = REC_readFloat(var, &tmp);
- ink_snprintf(val_output, 256, "%f", f);
+ snprintf(val_output, 256, "%f", f);
break;
}
case RECD_STRING:
{
bool tmp;
char *s = REC_readString(var, &tmp);
- ink_snprintf(val_output, 256, "%s", s);
+ snprintf(val_output, 256, "%s", s);
val_output[256] = '\0';
xfree(s);
break;
@@ -488,7 +488,7 @@ RafCont::process_query_stat(const char *
output_raf_arg(val_output);
} else {
char msg[257];
- ink_snprintf(msg, 256, "%s not found", var);
+ snprintf(msg, 256, "%s not found", var);
msg[256] = '\0';
output_raf_error(id, msg);
}
@@ -521,7 +521,7 @@ RafCont::process_congestion_cmd(char **a
process_congest_remove_entries(argv + qstring_index, argc - qstring_index);
} else {
char msg[257];
- ink_snprintf(msg, 256, "Node %s not found", argv[qstring_index]);
+ snprintf(msg, 256, "Node %s not found", argv[qstring_index]);
msg[256] = '\0';
output_raf_error(argv[0], msg);
}
@@ -608,7 +608,7 @@ RafCont::process_query_cmd(char **argv,
process_query_stat(argv[0], var);
} else {
char msg[257];
- ink_snprintf(msg, 256, "Node %s not found", argv[qstring_index]);
+ snprintf(msg, 256, "Node %s not found", argv[qstring_index]);
msg[256] = '\0';
output_raf_error(argv[0], msg);
}
Modified: trafficserver/traffic/trunk/proxy/Show.h
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/Show.h?rev=943621&r1=943620&r2=943621&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/Show.h (original)
+++ trafficserver/traffic/trunk/proxy/Show.h Wed May 12 18:33:38 2010
@@ -49,7 +49,7 @@ struct ShowCont:Continuation
va_list aap;
va_start(aap, s);
int l = ebuf - buf;
- int done = ink_vsnprintf(buf, l, s, aap);
+ int done = vsnprintf(buf, l, s, aap);
if (done > l - 256)
{
char *start2 = (char *) xrealloc(start, (ebuf - start) * 2);
@@ -57,7 +57,7 @@ struct ShowCont:Continuation
buf = start2 + (buf - start);
start = start2;
l = ebuf - buf;
- done = ink_vsnprintf(buf, l, s, aap);
+ done = vsnprintf(buf, l, s, aap);
if (done > l - 256)
{
va_end(aap);
Modified: trafficserver/traffic/trunk/proxy/StatPages.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/StatPages.cc?rev=943621&r1=943620&r2=943621&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/StatPages.cc (original)
+++ trafficserver/traffic/trunk/proxy/StatPages.cc Wed May 12 18:33:38 2010
@@ -172,7 +172,7 @@ BaseStatPagesHandler::resp_add(const cha
int size;
va_start(args, fmt);
- length = ink_vsnprintf(buf, 16384, fmt, args);
+ length = vsnprintf(buf, 16384, fmt, args);
va_end(args);
size = response_size;
Modified: trafficserver/traffic/trunk/proxy/TestClock.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/TestClock.cc?rev=943621&r1=943620&r2=943621&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/TestClock.cc (original)
+++ trafficserver/traffic/trunk/proxy/TestClock.cc Wed May 12 18:33:38 2010
@@ -35,7 +35,7 @@ test()
clock_gettime(CLOCK_REALTIME, &ts);
}
ink_hrtime t2 = ink_get_hrtime();
- ink_printf("time for clock_gettime %lld nsecs\n", (t2 - t) / 1000);
+ printf("time for clock_gettime %lld nsecs\n", (t2 - t) / 1000);
t = ink_get_hrtime();
i = 1000000;
@@ -43,5 +43,5 @@ test()
ink_get_hrtime();
}
t2 = ink_get_hrtime();
- ink_printf("time for clock_gettime %lld nsecs\n", (t2 - t) / 1000);
+ printf("time for clock_gettime %lld nsecs\n", (t2 - t) / 1000);
}
Modified: trafficserver/traffic/trunk/proxy/congest/Congestion.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/congest/Congestion.cc?rev=943621&r1=943620&r2=943621&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/congest/Congestion.cc (original)
+++ trafficserver/traffic/trunk/proxy/congest/Congestion.cc Wed May 12 18:33:38 2010
@@ -263,7 +263,7 @@ CongestionControlRecord::Init(matcher_li
if (tmp != NULL) {
errBuf = (char *) xmalloc(errBufLen * sizeof(char));
- ink_snprintf(errBuf, errBufLen, "%s %s at line %d in congestion.config", congestPrefix, tmp, line_num);
+ snprintf(errBuf, errBufLen, "%s %s at line %d in congestion.config", congestPrefix, tmp, line_num);
return errBuf;
}
@@ -734,16 +734,16 @@ CongestionEntry::sprint(char *buf, int b
timestamp = m_last_congested;
state = (m_congested ? 'F' : ' ');
}
- len += ink_snprintf(buf + len, buflen - len, "%lld|%d|%s|%s",
+ len += snprintf(buf + len, buflen - len, "%lld|%d|%s|%s",
timestamp,
pRecord->line_num,
(m_hostname ? m_hostname : " "), (m_ip ? (addr.s_addr = htonl(m_ip), inet_ntoa(addr)) : " "));
- len += ink_snprintf(buf + len, buflen - len, "|%s|%s|%c",
+ len += snprintf(buf + len, buflen - len, "|%s|%s|%c",
(pRecord->congestion_scheme == PER_IP ? "per_ip" : "per_host"),
(pRecord->prefix ? pRecord->prefix : " "), state);
- len += ink_snprintf(buf + len, buflen - len, "|%d|%d", m_stat_congested_conn_failures, m_stat_congested_max_conn);
+ len += snprintf(buf + len, buflen - len, "|%d|%d", m_stat_congested_conn_failures, m_stat_congested_max_conn);
if (format > 0) {
if (m_congested) {
@@ -754,24 +754,24 @@ CongestionEntry::sprint(char *buf, int b
} else {
ink_gmtime_r(&seconds, &time);
}
- ink_snprintf(str_time, sizeof(str_time), "%04d/%02d/%02d %02d:%02d:%02d",
+ snprintf(str_time, sizeof(str_time), "%04d/%02d/%02d %02d:%02d:%02d",
time.tm_year + 1900, time.tm_mon + 1, time.tm_mday, time.tm_hour, time.tm_min, time.tm_sec);
}
- len += ink_snprintf(buf + len, buflen - len, "|%s", str_time);
+ len += snprintf(buf + len, buflen - len, "|%s", str_time);
if (format > 1) {
- len += ink_snprintf(buf + len, buflen - len, "|%llu", m_key);
+ len += snprintf(buf + len, buflen - len, "|%llu", m_key);
if (format > 2) {
- len += ink_snprintf(buf + len, buflen - len, "|%ld", m_history.last_event);
+ len += snprintf(buf + len, buflen - len, "|%ld", m_history.last_event);
if (format > 3) {
- len += ink_snprintf(buf + len, buflen - len, "|%d|%d|%d", m_history.events, m_ref_count, m_num_connections);
+ len += snprintf(buf + len, buflen - len, "|%d|%d|%d", m_history.events, m_ref_count, m_num_connections);
}
}
}
}
- len += ink_snprintf(buf + len, buflen - len, "\n");
+ len += snprintf(buf + len, buflen - len, "\n");
return len;
}
Modified: trafficserver/traffic/trunk/proxy/congest/CongestionDB.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/congest/CongestionDB.cc?rev=943621&r1=943620&r2=943621&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/congest/CongestionDB.cc (original)
+++ trafficserver/traffic/trunk/proxy/congest/CongestionDB.cc Wed May 12 18:33:38 2010
@@ -605,11 +605,11 @@ remove_congested_entry(char *buf, MIOBuf
inku64 key;
if (strcasecmp(buf, "all") == 0) {
remove_all_congested_entry();
- len = ink_snprintf(msg, MSG_LEN, "all entries in congestion control table removed\n");
+ len = snprintf(msg, MSG_LEN, "all entries in congestion control table removed\n");
// coverity[secure_coding]
} else if (sscanf(buf, "key=%llu", &key) == 1) {
remove_congested_entry(key);
- len = ink_snprintf(msg, MSG_LEN, "key %llu removed\n", key);
+ len = snprintf(msg, MSG_LEN, "key %llu removed\n", key);
} else if (strncasecmp(buf, "host=", 5) == 0) {
char *p = buf + 5;
char *prefix = strchr(p, '/');
@@ -621,7 +621,7 @@ remove_congested_entry(char *buf, MIOBuf
}
key = make_key(p, strlen(p), 0, prefix, prelen);
remove_congested_entry(key);
- len = ink_snprintf(msg, MSG_LEN, "host=%s prefix=%s removed\n", p, prefix ? prefix : "(nil)");
+ len = snprintf(msg, MSG_LEN, "host=%s prefix=%s removed\n", p, prefix ? prefix : "(nil)");
} else if (strncasecmp(buf, "ip=", 3) == 0) {
char *p = buf + 3;
ip_addr_t ip = 0;
@@ -634,11 +634,11 @@ remove_congested_entry(char *buf, MIOBuf
}
ip = htonl(inet_addr(p));
if (ip == (ip_addr_t) - 1 && strcmp(p, "255.255.255.255") != 0) {
- len = ink_snprintf(msg, MSG_LEN, "invalid ip: %s\n", buf);
+ len = snprintf(msg, MSG_LEN, "invalid ip: %s\n", buf);
} else {
key = make_key(NULL, 0, ip, prefix, prelen);
remove_congested_entry(key);
- len = ink_snprintf(msg, MSG_LEN, "ip=%s prefix=%s removed\n", p, prefix ? prefix : "(nil)");
+ len = snprintf(msg, MSG_LEN, "ip=%s prefix=%s removed\n", p, prefix ? prefix : "(nil)");
}
}
out_buffer->write(msg, len);
Modified: trafficserver/traffic/trunk/proxy/hdrs/HdrTest.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/hdrs/HdrTest.cc?rev=943621&r1=943620&r2=943621&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/hdrs/HdrTest.cc (original)
+++ trafficserver/traffic/trunk/proxy/hdrs/HdrTest.cc Wed May 12 18:33:38 2010
@@ -1436,38 +1436,38 @@ HdrTest::test_http_mutation()
char field_name[1024];
char field_value[1024];
for (i = 1; i <= 100; i++) {
- ink_snprintf(field_name, sizeof(field_name), "Test%d", i);
- ink_snprintf(field_value, sizeof(field_value), "%d %d %d %d %d", i, i, i, i, i);
+ snprintf(field_name, sizeof(field_name), "Test%d", i);
+ snprintf(field_value, sizeof(field_value), "%d %d %d %d %d", i, i, i, i, i);
resp_hdr.value_set(field_name, (int) strlen(field_name), field_value, (int) strlen(field_value));
}
/**** (3) delete all the even numbered fields *****/
for (i = 2; i <= 100; i += 2) {
- ink_snprintf(field_name, sizeof(field_name), "Test%d", i);
+ snprintf(field_name, sizeof(field_name), "Test%d", i);
resp_hdr.field_delete(field_name, (int) strlen(field_name));
}
/***** (4) add in secondary fields for all multiples of 3 ***/
for (i = 3; i <= 100; i += 3) {
- ink_snprintf(field_name, sizeof(field_name), "Test%d", i);
+ snprintf(field_name, sizeof(field_name), "Test%d", i);
MIMEField *f = resp_hdr.field_create(field_name, (int) strlen(field_name));
resp_hdr.field_attach(f);
- ink_snprintf(field_value, sizeof(field_value), "d %d %d %d %d %d", i, i, i, i, i);
+ snprintf(field_value, sizeof(field_value), "d %d %d %d %d %d", i, i, i, i, i);
f->value_set(resp_hdr.m_heap, resp_hdr.m_mime, field_value, (int) strlen(field_value));
}
/***** (5) append all fields with multiples of 5 ***/
for (i = 5; i <= 100; i += 5) {
- ink_snprintf(field_name, sizeof(field_name), "Test%d", i);
- ink_snprintf(field_value, sizeof(field_value), "a %d", i);
+ snprintf(field_name, sizeof(field_name), "Test%d", i);
+ snprintf(field_value, sizeof(field_value), "a %d", i);
resp_hdr.value_append(field_name, (int) strlen(field_name), field_value, (int) strlen(field_value), true);
}
/**** (6) delete all multiples of nine *****/
for (i = 9; i <= 100; i += 9) {
- ink_snprintf(field_name, sizeof(field_name), "Test%d", i);
+ snprintf(field_name, sizeof(field_name), "Test%d", i);
resp_hdr.field_delete(field_name, (int) strlen(field_name));
}
@@ -1814,7 +1814,7 @@ HdrTest::test_comma_vals()
hdr.create(HTTP_TYPE_REQUEST);
for (i = 0; i < ntests; i++) {
- ink_snprintf(field_name, sizeof(field_name), "Test%d", i);
+ snprintf(field_name, sizeof(field_name), "Test%d", i);
MIMEField *f = hdr.field_create(field_name, (int) strlen(field_name));
ink_release_assert(f->m_ptr_value == NULL);
@@ -1915,7 +1915,7 @@ HdrTest::test_set_comma_vals()
hdr.create(HTTP_TYPE_REQUEST);
for (i = 0; i < ntests; i++) {
- ink_snprintf(field_name, sizeof(field_name), "Test%d", i);
+ snprintf(field_name, sizeof(field_name), "Test%d", i);
MIMEField *f = hdr.field_create(field_name, (int) strlen(field_name));
hdr.field_value_set(f, tests[i].old_raw, strlen(tests[i].old_raw));
@@ -2030,7 +2030,7 @@ HdrTest::test_comma_val_slice()
hdr.create(HTTP_TYPE_REQUEST);
for (i = 0; i < ntests; i++) {
- ink_snprintf(field_name, sizeof(field_name), "Test%d", i);
+ snprintf(field_name, sizeof(field_name), "Test%d", i);
MIMEField *f = hdr.field_create(field_name, (int) strlen(field_name));
hdr.field_value_set(f, tests[i].str, strlen(tests[i].str));
Modified: trafficserver/traffic/trunk/proxy/http2/HttpBodyFactory.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/http2/HttpBodyFactory.cc?rev=943621&r1=943620&r2=943621&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/http2/HttpBodyFactory.cc (original)
+++ trafficserver/traffic/trunk/proxy/http2/HttpBodyFactory.cc Wed May 12 18:33:38 2010
@@ -654,7 +654,7 @@ HttpBodyFactory::load_sets_from_director
if ((entry_buffer->d_name)[0] == '.')
continue;
- ink_snprintf(subdir, sizeof(subdir), "%s" DIR_SEP "%s", set_dir, entry_buffer->d_name);
+ snprintf(subdir, sizeof(subdir), "%s" DIR_SEP "%s", set_dir, entry_buffer->d_name);
status = stat(subdir, &stat_buf);
if (status != 0)
continue; // can't stat
@@ -702,7 +702,7 @@ HttpBodyFactory::load_body_set_from_dire
// ensure a .body_factory_info file exists //
/////////////////////////////////////////////
- ink_snprintf(path, sizeof(path), "%s" DIR_SEP ".body_factory_info", tmpl_dir);
+ snprintf(path, sizeof(path), "%s" DIR_SEP ".body_factory_info", tmpl_dir);
status = stat(path, &stat_buf);
if ((status < 0) || !S_ISREG(stat_buf.st_mode)) {
ink_closedir(dir);
@@ -731,7 +731,7 @@ HttpBodyFactory::load_body_set_from_dire
if (strchr(entry_buffer->d_name, '#') == NULL)
continue;
- ink_snprintf(path, sizeof(path), "%s/%s", tmpl_dir, entry_buffer->d_name);
+ snprintf(path, sizeof(path), "%s/%s", tmpl_dir, entry_buffer->d_name);
status = stat(path, &stat_buf);
if (status != 0)
continue; // can't stat
@@ -795,7 +795,7 @@ HttpBodySet::init(char *set, char *dir)
char buffer[1024], name[1025], value[1024];
- ink_snprintf(info_path, sizeof(info_path), "%s" DIR_SEP ".body_factory_info", dir);
+ snprintf(info_path, sizeof(info_path), "%s" DIR_SEP ".body_factory_info", dir);
fd = ink_open(info_path, O_RDONLY | _O_ATTRIB_NORMAL);
if (fd < 0)
return (-1);
@@ -976,7 +976,7 @@ HttpBodyTemplate::load_from_file(char *d
// ensure this is actually a file //
////////////////////////////////////
- ink_snprintf(path, sizeof(path), "%s/%s", dir, file);
+ snprintf(path, sizeof(path), "%s/%s", dir, file);
// coverity[fs_check_call]
status = stat(path, &stat_buf);
if (status != 0)
Modified: trafficserver/traffic/trunk/proxy/http2/HttpTransact.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/http2/HttpTransact.cc?rev=943621&r1=943620&r2=943621&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/http2/HttpTransact.cc (original)
+++ trafficserver/traffic/trunk/proxy/http2/HttpTransact.cc Wed May 12 18:33:38 2010
@@ -551,7 +551,7 @@ how_to_open_connection(HttpTransact::Sta
if (port != url_canonicalize_port(URL_TYPE_HTTP, 0)) {
char *buf = (char *) xmalloc(host_len + 15);
strncpy(buf, host, host_len);
- host_len += ink_snprintf(buf + host_len, host_len + 15, ":%d", port);
+ host_len += snprintf(buf + host_len, host_len + 15, ":%d", port);
s->hdr_info.server_request.value_set(MIME_FIELD_HOST, MIME_LEN_HOST, buf, host_len);
xfree(buf);
} else {
@@ -3288,7 +3288,7 @@ HttpTransact::HandleICPLookup(State * s)
s->icp_info.name = (char *) s->arena.alloc(17);
unsigned char *p = (unsigned char *) &(s->icp_ip_result.sin_addr.s_addr);
- ink_snprintf(s->icp_info.name, 17, "%d.%d.%d.%d", p[0], p[1], p[2], p[3]);
+ snprintf(s->icp_info.name, 17, "%d.%d.%d.%d", p[0], p[1], p[2], p[3]);
update_current_info(&s->current, &s->icp_info, ICP_SUGGESTED_HOST, 1);
s->next_hop_scheme = URL_WKSIDX_HTTP;
@@ -8379,7 +8379,7 @@ HttpTransact::build_request(State * s, H
if (port != url_canonicalize_port(URL_TYPE_HTTP, 0)) {
char *buf = (char *) xmalloc(host_len + 15);
strncpy(buf, host, host_len);
- host_len += ink_snprintf(buf + host_len, host_len + 15, ":%d", port);
+ host_len += snprintf(buf + host_len, host_len + 15, ":%d", port);
outgoing_request->value_set(MIME_FIELD_HOST, MIME_LEN_HOST, buf, host_len);
xfree(buf);
} else {
@@ -8823,7 +8823,7 @@ HttpTransact::build_error_response(State
char *reason_buffer;
int buf_len = sizeof(char) * (strlen(get_error_string(s->cause_of_death_errno)) + 50);
reason_buffer = (char *) alloca(buf_len);
- ink_snprintf(reason_buffer, buf_len, "Connect Error <%s/%d>", get_error_string(s->cause_of_death_errno),
+ snprintf(reason_buffer, buf_len, "Connect Error <%s/%d>", get_error_string(s->cause_of_death_errno),
s->cause_of_death_errno);
reason_phrase = reason_buffer;
}
Modified: trafficserver/traffic/trunk/proxy/http2/HttpTransact.h
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/http2/HttpTransact.h?rev=943621&r1=943620&r2=943621&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/http2/HttpTransact.h (original)
+++ trafficserver/traffic/trunk/proxy/http2/HttpTransact.h Wed May 12 18:33:38 2010
@@ -66,8 +66,8 @@
{ \
if (diags->on(T)) { \
ACQUIRE_PRINT_LOCK() \
- ink_fprintf(stderr, "+++++++++ %s +++++++++\n", S); \
- ink_fprintf(stderr, "-- State Machine Id: %lld\n", I); \
+ fprintf(stderr, "+++++++++ %s +++++++++\n", S); \
+ fprintf(stderr, "-- State Machine Id: %lld\n", I); \
char b[4096]; \
int used, tmp, offset; \
int done; \
@@ -79,7 +79,7 @@
done = (H)->print (b, 4095, &used, &tmp); \
offset += used; \
b[used] = '\0'; \
- ink_fprintf (stderr, "%s", b); \
+ fprintf (stderr, "%s", b); \
} while (!done); \
} \
RELEASE_PRINT_LOCK() \
Modified: trafficserver/traffic/trunk/proxy/http2/HttpTransactCache.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/http2/HttpTransactCache.cc?rev=943621&r1=943620&r2=943621&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/http2/HttpTransactCache.cc (original)
+++ trafficserver/traffic/trunk/proxy/http2/HttpTransactCache.cc Wed May 12 18:33:38 2010
@@ -239,7 +239,7 @@ HttpTransactCache::SelectFromAlternates(
done = cached_request->print(b, sizeof(b) - 1, &used, &tmp);
offset += used;
b[used] = '\0';
- ink_fprintf(stderr, "%s", b);
+ fprintf(stderr, "%s", b);
} while (!done);
offset = 0;
@@ -249,7 +249,7 @@ HttpTransactCache::SelectFromAlternates(
done = cached_response->print(b, sizeof(b) - 1, &used, &tmp);
offset += used;
b[used] = '\0';
- ink_fprintf(stderr, "%s", b);
+ fprintf(stderr, "%s", b);
} while (!done);
}
Modified: trafficserver/traffic/trunk/proxy/http2/remap/RemapProcessor.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/http2/remap/RemapProcessor.cc?rev=943621&r1=943620&r2=943621&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/http2/remap/RemapProcessor.cc (original)
+++ trafficserver/traffic/trunk/proxy/http2/remap/RemapProcessor.cc Wed May 12 18:33:38 2010
@@ -231,7 +231,7 @@ RemapProcessor::finish_remap(HttpTransac
};
if (c && tmp < (int) (sizeof(tmp_redirect_buf) - 1)) {
- tmp += ink_snprintf(&tmp_redirect_buf[tmp], sizeof(tmp_redirect_buf) - tmp, "%s", c);
+ tmp += snprintf(&tmp_redirect_buf[tmp], sizeof(tmp_redirect_buf) - tmp, "%s", c);
}
}
tmp_redirect_buf[sizeof(tmp_redirect_buf) - 1] = 0;
@@ -284,7 +284,7 @@ RemapProcessor::finish_remap(HttpTransac
tmp = remapped_host_len;
memcpy(host_hdr_buf, remapped_host, remapped_host_len);
if (remapped_port) {
- tmp += ink_snprintf(host_hdr_buf + remapped_host_len, host_buf_len - remapped_host_len - 1, ":%d", remapped_port);
+ tmp += snprintf(host_hdr_buf + remapped_host_len, host_buf_len - remapped_host_len - 1, ":%d", remapped_port);
}
} else {
tmp = host_buf_len;
Modified: trafficserver/traffic/trunk/proxy/http2/remap/UrlRewrite.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/http2/remap/UrlRewrite.cc?rev=943621&r1=943620&r2=943621&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/http2/remap/UrlRewrite.cc (original)
+++ trafficserver/traffic/trunk/proxy/http2/remap/UrlRewrite.cc Wed May 12 18:33:38 2010
@@ -235,7 +235,7 @@ validate_filter_args(acl_filter_rule **
for (i = 0; i < argc; i++) {
if ((ul = check_remap_option(&argv[i], 1, 0, NULL, &argptr)) == 0) {
Debug("url_rewrite", "[validate_filter_args] Unknow remap option - %s", argv[i]);
- ink_snprintf(errStrBuf, errStrBufSize, "Unknown option - \"%s\"", argv[i]);
+ snprintf(errStrBuf, errStrBufSize, "Unknown option - \"%s\"", argv[i]);
errStrBuf[errStrBufSize - 1] = 0;
if (new_rule_flg) {
delete rule;
@@ -245,7 +245,7 @@ validate_filter_args(acl_filter_rule **
}
if (!argptr || !argptr[0]) {
Debug("url_rewrite", "[validate_filter_args] Empty argument in %s", argv[i]);
- ink_snprintf(errStrBuf, errStrBufSize, "Empty argument in \"%s\"", argv[i]);
+ snprintf(errStrBuf, errStrBufSize, "Empty argument in \"%s\"", argv[i]);
errStrBuf[errStrBufSize - 1] = 0;
if (new_rule_flg) {
delete rule;
@@ -257,7 +257,7 @@ validate_filter_args(acl_filter_rule **
if (ul & REMAP_OPTFLG_METHOD) { /* "method=" option */
if (rule->method_cnt >= ACL_FILTER_MAX_METHODS) {
Debug("url_rewrite", "[validate_filter_args] Too many \"method=\" filters");
- ink_snprintf(errStrBuf, errStrBufSize, "Defined more than %d \"method=\" filters!", ACL_FILTER_MAX_METHODS);
+ snprintf(errStrBuf, errStrBufSize, "Defined more than %d \"method=\" filters!", ACL_FILTER_MAX_METHODS);
errStrBuf[errStrBufSize - 1] = 0;
if (new_rule_flg) {
delete rule;
@@ -291,7 +291,7 @@ validate_filter_args(acl_filter_rule **
m = HTTP_WKSIDX_PUSH;
else {
Debug("url_rewrite", "[validate_filter_args] Unknown method value %s", argptr);
- ink_snprintf(errStrBuf, errStrBufSize, "Unknown method \"%s\"", argptr);
+ snprintf(errStrBuf, errStrBufSize, "Unknown method \"%s\"", argptr);
errStrBuf[errStrBufSize - 1] = 0;
if (new_rule_flg) {
delete rule;
@@ -309,7 +309,7 @@ validate_filter_args(acl_filter_rule **
j = j - HTTP_WKSIDX_CONNECT; // get method index
if (j<0 || j>= ACL_FILTER_MAX_METHODS) {
Debug("url_rewrite", "[validate_filter_args] Incorrect method index! Method sequence in HTTP.cc is broken");
- ink_snprintf(errStrBuf, errStrBufSize, "Incorrect method index %d", j);
+ snprintf(errStrBuf, errStrBufSize, "Incorrect method index %d", j);
errStrBuf[errStrBufSize - 1] = 0;
if (new_rule_flg) {
delete rule;
@@ -324,7 +324,7 @@ validate_filter_args(acl_filter_rule **
} else if (ul & REMAP_OPTFLG_SRC_IP) { /* "src_ip=" option */
if (rule->src_ip_cnt >= ACL_FILTER_MAX_SRC_IP) {
Debug("url_rewrite", "[validate_filter_args] Too many \"src_ip=\" filters");
- ink_snprintf(errStrBuf, errStrBufSize, "Defined more than %d \"src_ip=\" filters!", ACL_FILTER_MAX_SRC_IP);
+ snprintf(errStrBuf, errStrBufSize, "Defined more than %d \"src_ip=\" filters!", ACL_FILTER_MAX_SRC_IP);
errStrBuf[errStrBufSize - 1] = 0;
if (new_rule_flg) {
delete rule;
@@ -339,7 +339,7 @@ validate_filter_args(acl_filter_rule **
tmpbuf[sizeof(tmpbuf) - 1] = 0; // important! use copy of argument
if ((c = ExtractIpRange(tmpbuf, (unsigned long*) &ipi->start, &ipi->end)) != NULL) {
Debug("url_rewrite", "[validate_filter_args] Unable to parse IP value in %s", argv[i]);
- ink_snprintf(errStrBuf, errStrBufSize, "Unable to parse IP value in %s", argv[i]);
+ snprintf(errStrBuf, errStrBufSize, "Unable to parse IP value in %s", argv[i]);
errStrBuf[errStrBufSize - 1] = 0;
if (new_rule_flg) {
delete rule;
@@ -365,7 +365,7 @@ validate_filter_args(acl_filter_rule **
rule->allow_flag = 1;
} else {
Debug("url_rewrite", "[validate_filter_args] Unknown argument \"%s\"", argv[i]);
- ink_snprintf(errStrBuf, errStrBufSize, "Unknown argument \"%s\"", argv[i]);
+ snprintf(errStrBuf, errStrBufSize, "Unknown argument \"%s\"", argv[i]);
errStrBuf[errStrBufSize - 1] = 0;
if (new_rule_flg) {
delete rule;
@@ -400,18 +400,18 @@ parse_directive(BUILD_TABLE_INFO * bti,
Debug("url_rewrite", "[parse_directive] Start processing \"%s\" directive", directive);
if (directive[0] != '.' || directive[1] == 0) {
- ink_snprintf(errbuf, errbufsize, "Invalid directive \"%s\"", directive);
+ snprintf(errbuf, errbufsize, "Invalid directive \"%s\"", directive);
Debug("url_rewrite", "[parse_directive] %s", errbuf);
return (const char *) errbuf;
}
if (is_inkeylist(&directive[1], "definefilter", "deffilter", "defflt", NULL)) {
if (bti->paramc < 2) {
- ink_snprintf(errbuf, errbufsize, "Directive \"%s\" must have name argument", directive);
+ snprintf(errbuf, errbufsize, "Directive \"%s\" must have name argument", directive);
Debug("url_rewrite", "[parse_directive] %s", errbuf);
return (const char *) errbuf;
}
if (bti->argc < 1) {
- ink_snprintf(errbuf, errbufsize, "Directive \"%s\" must have filter parameter(s)", directive);
+ snprintf(errbuf, errbufsize, "Directive \"%s\" must have filter parameter(s)", directive);
Debug("url_rewrite", "[parse_directive] %s", errbuf);
return (const char *) errbuf;
}
@@ -430,19 +430,19 @@ parse_directive(BUILD_TABLE_INFO * bti,
}
} else if (is_inkeylist(&directive[1], "deletefilter", "delfilter", "delflt", NULL)) {
if (bti->paramc < 2) {
- ink_snprintf(errbuf, errbufsize, "Directive \"%s\" must have name argument", directive);
+ snprintf(errbuf, errbufsize, "Directive \"%s\" must have name argument", directive);
Debug("url_rewrite", "[parse_directive] %s", errbuf);
return (const char *) errbuf;
}
acl_filter_rule::delete_byname(&bti->rules_list, (const char *) bti->paramv[1]);
} else if (is_inkeylist(&directive[1], "usefilter", "activefilter", "activatefilter", "useflt", NULL)) {
if (bti->paramc < 2) {
- ink_snprintf(errbuf, errbufsize, "Directive \"%s\" must have name argument", directive);
+ snprintf(errbuf, errbufsize, "Directive \"%s\" must have name argument", directive);
Debug("url_rewrite", "[parse_directive] %s", errbuf);
return (const char *) errbuf;
}
if ((rp = acl_filter_rule::find_byname(bti->rules_list, (const char *) bti->paramv[1])) == NULL) {
- ink_snprintf(errbuf, errbufsize, "Undefined filter \"%s\" in directive \"%s\"", bti->paramv[1], directive);
+ snprintf(errbuf, errbufsize, "Undefined filter \"%s\" in directive \"%s\"", bti->paramv[1], directive);
Debug("url_rewrite", "[parse_directive] %s", errbuf);
return (const char *) errbuf;
}
@@ -451,18 +451,18 @@ parse_directive(BUILD_TABLE_INFO * bti,
if (is_inkeylist(&directive[1], "unusefilter", "deactivatefilter", "unactivefilter", "deuseflt", "unuseflt", NULL))
{
if (bti->paramc < 2) {
- ink_snprintf(errbuf, errbufsize, "Directive \"%s\" must have name argument", directive);
+ snprintf(errbuf, errbufsize, "Directive \"%s\" must have name argument", directive);
Debug("url_rewrite", "[parse_directive] %s", errbuf);
return (const char *) errbuf;
}
if ((rp = acl_filter_rule::find_byname(bti->rules_list, (const char *) bti->paramv[1])) == NULL) {
- ink_snprintf(errbuf, errbufsize, "Undefined filter \"%s\" in directive \"%s\"", bti->paramv[1], directive);
+ snprintf(errbuf, errbufsize, "Undefined filter \"%s\" in directive \"%s\"", bti->paramv[1], directive);
Debug("url_rewrite", "[parse_directive] %s", errbuf);
return (const char *) errbuf;
}
acl_filter_rule::requeue_in_passive_list(&bti->rules_list, rp);
} else {
- ink_snprintf(errbuf, errbufsize, "Unknown directive \"%s\"", directive);
+ snprintf(errbuf, errbufsize, "Unknown directive \"%s\"", directive);
Debug("url_rewrite", "[parse_directive] %s", errbuf);
return (const char *) errbuf;
}
@@ -1231,7 +1231,7 @@ bool
break;
};
if (c && tmp < (int) (sizeof(tmp_redirect_buf) - 1)) {
- tmp += ink_snprintf(&tmp_redirect_buf[tmp], sizeof(tmp_redirect_buf) - tmp, "%s", c);
+ tmp += snprintf(&tmp_redirect_buf[tmp], sizeof(tmp_redirect_buf) - tmp, "%s", c);
}
}
tmp_redirect_buf[sizeof(tmp_redirect_buf) - 1] = 0;
@@ -1285,7 +1285,7 @@ bool
tmp = remapped_host_len;
memcpy(host_hdr_buf, remapped_host, remapped_host_len);
if (remapped_port) {
- tmp += ink_snprintf(host_hdr_buf + remapped_host_len, host_buf_len - remapped_host_len - 1,
+ tmp += snprintf(host_hdr_buf + remapped_host_len, host_buf_len - remapped_host_len - 1,
":%d", remapped_port);
}
} else {
@@ -1647,7 +1647,7 @@ UrlRewrite::BuildTable()
// Initial verification for number of arguments
if (bti.paramc<1 || (bti.paramc < 3 && bti.paramv[0][0] != '.') || bti.paramc> BUILD_TABLE_MAX_ARGS) {
- ink_snprintf(errBuf, sizeof(errBuf), "%s Malformed line %d in file %s", modulePrefix, cln + 1, config_file_path);
+ snprintf(errBuf, sizeof(errBuf), "%s Malformed line %d in file %s", modulePrefix, cln + 1, config_file_path);
Debug("url_rewrite", "[BuildTable] %s", errBuf);
SignalError(errBuf, alarm_already);
cur_line = tokLine(NULL, &tok_state);
@@ -1661,7 +1661,7 @@ UrlRewrite::BuildTable()
// Check directive keywords (starting from '.')
if (bti.paramv[0][0] == '.') {
if ((errStr = parse_directive(&bti, errStrBuf, sizeof(errStrBuf))) != NULL) {
- ink_snprintf(errBuf, sizeof(errBuf) - 1, "%s Error on line %d - %s", modulePrefix, cln + 1, errStr);
+ snprintf(errBuf, sizeof(errBuf) - 1, "%s Error on line %d - %s", modulePrefix, cln + 1, errStr);
Debug("url_rewrite", "[BuildTable] %s", errBuf);
SignalError(errBuf, alarm_already);
}
@@ -1691,7 +1691,7 @@ UrlRewrite::BuildTable()
Debug("url_rewrite", "[BuildTable] - FORWARD_MAP_REFERER");
maptype = FORWARD_MAP_REFERER;
} else {
- ink_snprintf(errBuf, sizeof(errBuf) - 1, "%s Unknown mapping type at line %d", modulePrefix, cln + 1);
+ snprintf(errBuf, sizeof(errBuf) - 1, "%s Unknown mapping type at line %d", modulePrefix, cln + 1);
Debug("url_rewrite", "[BuildTable] - %s", errBuf);
SignalError(errBuf, alarm_already);
cur_line = tokLine(NULL, &tok_state);
@@ -1808,7 +1808,7 @@ UrlRewrite::BuildTable()
referer_info((char *) bti.paramv[j - 1], &refinfo_error, refinfo_error_buf,
sizeof(refinfo_error_buf)));
if (refinfo_error) {
- ink_snprintf(errBuf, sizeof(errBuf), "%s Incorrect Referer regular expression \"%s\" at line %d - %s",
+ snprintf(errBuf, sizeof(errBuf), "%s Incorrect Referer regular expression \"%s\" at line %d - %s",
modulePrefix, bti.paramv[j - 1], cln + 1, refinfo_error_buf);
SignalError(errBuf, alarm_already);
delete ri;
@@ -1951,7 +1951,7 @@ UrlRewrite::BuildTable()
url_mapping *u_mapping;
for (int i = 0; h->h_addr_list[i] != NULL; i++) {
ipv4_name[0] = '\0';
- int tmp = ink_snprintf(ipv4_name, sizeof(ipv4_name), "%d.%d.%d.%d",
+ int tmp = snprintf(ipv4_name, sizeof(ipv4_name), "%d.%d.%d.%d",
(unsigned char) h->h_addr_list[i][0],
(unsigned char) h->h_addr_list[i][1],
(unsigned char) h->h_addr_list[i][2],
@@ -1993,7 +1993,7 @@ UrlRewrite::BuildTable()
for (int i = 0; h->h_addr_list[i] != NULL; i++) {
ipv4_name[0] = '\0';
int tmp;
- tmp = ink_snprintf(ipv4_name, sizeof(ipv4_name), "%d.%d.%d.%d",
+ tmp = snprintf(ipv4_name, sizeof(ipv4_name), "%d.%d.%d.%d",
(unsigned char) h->h_addr_list[i][0],
(unsigned char) h->h_addr_list[i][1],
(unsigned char) h->h_addr_list[i][2], (unsigned char) h->h_addr_list[i][3]);
@@ -2029,7 +2029,7 @@ UrlRewrite::BuildTable()
for (int i = 0; h->h_addr_list[i] != NULL; i++) {
ipv4_name[0] = '\0';
int tmp;
- tmp = ink_snprintf(ipv4_name, sizeof(ipv4_name), "%d.%d.%d.%d",
+ tmp = snprintf(ipv4_name, sizeof(ipv4_name), "%d.%d.%d.%d",
(unsigned char) h->h_addr_list[i][0],
(unsigned char) h->h_addr_list[i][1],
(unsigned char) h->h_addr_list[i][2], (unsigned char) h->h_addr_list[i][3]);
@@ -2097,7 +2097,7 @@ UrlRewrite::BuildTable()
continue;
MAP_ERROR:
- ink_snprintf(errBuf, sizeof(errBuf), "%s %s at line %d", modulePrefix, errStr, cln + 1);
+ snprintf(errBuf, sizeof(errBuf), "%s %s at line %d", modulePrefix, errStr, cln + 1);
SignalError(errBuf, alarm_already);
if (new_mapping) {
delete new_mapping;
@@ -2257,13 +2257,13 @@ UrlRewrite::load_remap_plugin(char *argv
}
} else {
if (unlikely(!mp || (check_remap_option(argv, argc, REMAP_OPTFLG_PLUGIN, &idx) & REMAP_OPTFLG_PLUGIN) == 0)) {
- ink_snprintf(errbuf, errbufsize, "Can't find remap plugin keyword or \"url_mapping\" is NULL");
+ snprintf(errbuf, errbufsize, "Can't find remap plugin keyword or \"url_mapping\" is NULL");
return -1; /* incorrect input data - almost impossible case */
}
}
if (unlikely((c = strchr(argv[idx], (int) '=')) == NULL || !(*(++c)))) {
- ink_snprintf(errbuf, errbufsize, "Can't find remap plugin file name in \"@%s\"", argv[idx]);
+ snprintf(errbuf, errbufsize, "Can't find remap plugin file name in \"@%s\"", argv[idx]);
return -2; /* incorrect input data */
}
@@ -2281,7 +2281,7 @@ UrlRewrite::load_remap_plugin(char *argv
Debug("remap_plugin", "stat successful on %s using that", default_path);
c = &default_path[0];
} else if (stat(c, &stat_buf) != 0) {
- ink_snprintf(errbuf, errbufsize, "Can't find remap plugin file \"%s\"", c);
+ snprintf(errbuf, errbufsize, "Can't find remap plugin file \"%s\"", c);
return -3; /* incorrect input data */
}
@@ -2302,7 +2302,7 @@ UrlRewrite::load_remap_plugin(char *argv
#else
err = dlerror();
#endif
- ink_snprintf(errbuf, errbufsize, "Can't load plugin \"%s\" - %s", c, err ? err : "Unknown dlopen() error");
+ snprintf(errbuf, errbufsize, "Can't load plugin \"%s\" - %s", c, err ? err : "Unknown dlopen() error");
return -4;
}
pi->fp_tsremap_init = (_tsremap_init *) dlsym(pi->dlh, TSREMAP_FUNCNAME_INIT);
@@ -2313,14 +2313,14 @@ UrlRewrite::load_remap_plugin(char *argv
pi->fp_tsremap_os_response = (_tsremap_os_response *) dlsym(pi->dlh, TSREMAP_FUNCNAME_OS_RESPONSE);
if (!pi->fp_tsremap_init) {
- ink_snprintf(errbuf, errbufsize, "Can't find \"%s\" function in remap plugin \"%s\"", TSREMAP_FUNCNAME_INIT, c);
+ snprintf(errbuf, errbufsize, "Can't find \"%s\" function in remap plugin \"%s\"", TSREMAP_FUNCNAME_INIT, c);
retcode = -10;
} else if (!pi->fptsremap_new_instance) {
- ink_snprintf(errbuf, errbufsize, "Can't find \"%s\" function in remap plugin \"%s\"",
+ snprintf(errbuf, errbufsize, "Can't find \"%s\" function in remap plugin \"%s\"",
TSREMAP_FUNCNAME_NEW_INSTANCE, c);
retcode = -11;
} else if (!pi->fp_tsremap_remap) {
- ink_snprintf(errbuf, errbufsize, "Can't find \"%s\" function in remap plugin \"%s\"", TSREMAP_FUNCNAME_REMAP, c);
+ snprintf(errbuf, errbufsize, "Can't find \"%s\" function in remap plugin \"%s\"", TSREMAP_FUNCNAME_REMAP, c);
retcode = -12;
}
if (retcode) {
@@ -2338,7 +2338,7 @@ UrlRewrite::load_remap_plugin(char *argv
if ((retcode = pi->fp_tsremap_init(&ri, tmpbuf, sizeof(tmpbuf) - 1)) != 0) {
Error("Failed to initialize plugin %s (non-zero retval) ... bailing out", pi->path);
exit(-1); //see my comment re: exit() about 60 lines down
- ink_snprintf(errbuf, errbufsize, "Remap plugin initialization error - %d:%s", retcode,
+ snprintf(errbuf, errbufsize, "Remap plugin initialization error - %d:%s", retcode,
tmpbuf[0] ? tmpbuf : "Unknown error");
dlclose(pi->dlh);
pi->dlh = NULL;
@@ -2348,19 +2348,19 @@ UrlRewrite::load_remap_plugin(char *argv
}
if (!pi->dlh) {
- ink_snprintf(errbuf, errbufsize, "Can't load plugin \"%s\"", c);
+ snprintf(errbuf, errbufsize, "Can't load plugin \"%s\"", c);
return -5;
}
if ((err = mp->fromURL.string_get(NULL)) == NULL) {
- ink_snprintf(errbuf, errbufsize, "Can't load fromURL from URL class");
+ snprintf(errbuf, errbufsize, "Can't load fromURL from URL class");
return -6;
}
parv[parc++] = xstrdup(err);
xfree(err);
if ((err = mp->toURL.string_get(NULL)) == NULL) {
- ink_snprintf(errbuf, errbufsize, "Can't load toURL from URL class");
+ snprintf(errbuf, errbufsize, "Can't load toURL from URL class");
return -6;
}
parv[parc++] = xstrdup(err);
@@ -2404,7 +2404,7 @@ UrlRewrite::load_remap_plugin(char *argv
if (retcode != 0) {
mp->delete_instance(pi);
- ink_snprintf(errbuf, errbufsize, "Can't create new remap instance for plugin \"%s\" - %s", c,
+ snprintf(errbuf, errbufsize, "Can't create new remap instance for plugin \"%s\" - %s", c,
tmpbuf[0] ? tmpbuf : "Unknown plugin error");
Error("Failed to create new instance for plugin %s (non-zero retval)... bailing out", pi->path);
/**
Modified: trafficserver/traffic/trunk/proxy/logging/LogAccess.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/logging/LogAccess.cc?rev=943621&r1=943620&r2=943621&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/logging/LogAccess.cc (original)
+++ trafficserver/traffic/trunk/proxy/logging/LogAccess.cc Wed May 12 18:33:38 2010
@@ -887,7 +887,7 @@ LogAccess::marshal_record(char *record,
LogFloat val = REC_readFloat(record, &found);
if (found) {
- // ink_snprintf does not support "%e" in the format
+ // snprintf does not support "%e" in the format
// and we want to use "%e" because it is the most concise
// notation
@@ -1067,7 +1067,7 @@ LogAccess::unmarshal_with_map(LOG_INT co
if (msg) {
const int bufSize = 64;
char invalidCodeMsg[bufSize];
- codeStrLen = ink_snprintf(invalidCodeMsg, 64, "%s(%d)", msg, code);
+ codeStrLen = snprintf(invalidCodeMsg, 64, "%s(%d)", msg, code);
if (codeStrLen < bufSize && codeStrLen < len) {
ink_strncpy(dest, invalidCodeMsg, len);
} else {
@@ -1248,7 +1248,7 @@ LogAccess::unmarshal_ttmsf(char **buf, c
LOG_INT val = unmarshal_int(buf);
float secs = (float) val / 1000;
- int val_len = ink_snprintf(dest, len, "%.3f", secs);
+ int val_len = snprintf(dest, len, "%.3f", secs);
return val_len;
}