You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by zw...@apache.org on 2013/04/15 23:20:13 UTC
[44/50] git commit: filename_to_string doesn't need to strdup
filename_to_string doesn't need to strdup
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/9ff75928
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/9ff75928
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/9ff75928
Branch: refs/heads/3.3.x
Commit: 9ff75928c552246b4f729692abc81aed79445dbb
Parents: 116b74e
Author: James Peach <jp...@apache.org>
Authored: Fri Mar 29 13:53:08 2013 -0700
Committer: James Peach <jp...@apache.org>
Committed: Thu Apr 11 13:05:29 2013 -0700
----------------------------------------------------------------------
mgmt/api/CfgContextUtils.cc | 64 +++++++++----------------------------
mgmt/api/CfgContextUtils.h | 2 +-
mgmt/api/CoreAPI.cc | 7 +---
mgmt/api/include/mgmtapi.h | 2 +-
4 files changed, 20 insertions(+), 55 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/9ff75928/mgmt/api/CfgContextUtils.cc
----------------------------------------------------------------------
diff --git a/mgmt/api/CfgContextUtils.cc b/mgmt/api/CfgContextUtils.cc
index 32cb139..7e458e7 100644
--- a/mgmt/api/CfgContextUtils.cc
+++ b/mgmt/api/CfgContextUtils.cc
@@ -1413,57 +1413,25 @@ round_robin_type_to_string(TSRrT rr)
*----------------------------------------------------------------------------
* TSFileNameT ==> string
*/
-char *
+const char *
filename_to_string(TSFileNameT file)
{
switch (file) {
- case TS_FNAME_CACHE_OBJ:
- return ats_strdup("cache.config");
-
- case TS_FNAME_CONGESTION:
- return ats_strdup("congestion.config");
-
- case TS_FNAME_HOSTING:
- return ats_strdup("hosting.config");
-
- case TS_FNAME_ICP_PEER:
- return ats_strdup("icp.config");
-
- case TS_FNAME_IP_ALLOW:
- return ats_strdup("ip_allow.config");
-
-
- case TS_FNAME_LOGS_XML:
- return ats_strdup("logs_xml.config");
-
- case TS_FNAME_PARENT_PROXY:
- return ats_strdup("parent.config");
-
- case TS_FNAME_VOLUME:
- return ats_strdup("volume.config");
-
- case TS_FNAME_PLUGIN:
- return ats_strdup("plugin.config");
-
- case TS_FNAME_REMAP:
- return ats_strdup("remap.config");
-
- case TS_FNAME_SOCKS:
- return ats_strdup("socks.config");
-
- case TS_FNAME_SPLIT_DNS:
- return ats_strdup("splitdns.config");
-
- case TS_FNAME_STORAGE:
- return ats_strdup("storage.config");
-
- case TS_FNAME_UPDATE_URL:
- return ats_strdup("update.config");
-
- case TS_FNAME_VADDRS:
- return ats_strdup("vaddrs.config");
-
-
+ case TS_FNAME_CACHE_OBJ: return "cache.config";
+ case TS_FNAME_CONGESTION: return "congestion.config";
+ case TS_FNAME_HOSTING: return "hosting.config";
+ case TS_FNAME_ICP_PEER: return "icp.config";
+ case TS_FNAME_IP_ALLOW: return "ip_allow.config";
+ case TS_FNAME_LOGS_XML: return "logs_xml.config";
+ case TS_FNAME_PARENT_PROXY: return "parent.config";
+ case TS_FNAME_VOLUME: return "volume.config";
+ case TS_FNAME_PLUGIN: return "plugin.config";
+ case TS_FNAME_REMAP: return "remap.config";
+ case TS_FNAME_SOCKS: return "socks.config";
+ case TS_FNAME_SPLIT_DNS: return "splitdns.config";
+ case TS_FNAME_STORAGE: return "storage.config";
+ case TS_FNAME_UPDATE_URL: return "update.config";
+ case TS_FNAME_VADDRS: return "vaddrs.config";
default: /* no such config file */
return NULL;
}
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/9ff75928/mgmt/api/CfgContextUtils.h
----------------------------------------------------------------------
diff --git a/mgmt/api/CfgContextUtils.h b/mgmt/api/CfgContextUtils.h
index 8e91f9b..b6fc86d 100644
--- a/mgmt/api/CfgContextUtils.h
+++ b/mgmt/api/CfgContextUtils.h
@@ -119,7 +119,7 @@ TSRrT string_to_round_robin_type(const char *rr);
char *round_robin_type_to_string(TSRrT rr);
/* TSFileNameT <==> string */
-char *filename_to_string(TSFileNameT file);
+const char *filename_to_string(TSFileNameT file);
TSCongestionSchemeT string_to_congest_scheme_type(const char *scheme);
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/9ff75928/mgmt/api/CoreAPI.cc
----------------------------------------------------------------------
diff --git a/mgmt/api/CoreAPI.cc b/mgmt/api/CoreAPI.cc
index c5a1a21..f1aeae3 100644
--- a/mgmt/api/CoreAPI.cc
+++ b/mgmt/api/CoreAPI.cc
@@ -534,7 +534,7 @@ MgmtRecordSetString(const char *rec_name, const char *string_val, TSActionNeedT
TSError
ReadFile(TSFileNameT file, char **text, int *size, int *version)
{
- char *fname;
+ const char *fname;
Rollback *file_rb;
int ret, old_file_len;
textBuffer *old_file_content;
@@ -551,10 +551,8 @@ ReadFile(TSFileNameT file, char **text, int *size, int *version)
ret = configFiles->getRollbackObj(fname, &file_rb);
if (ret != TRUE) {
Debug("FileOp", "[get_lines_from_file] Can't get Rollback for file: %s\n", fname);
- ats_free(fname);
return TS_ERR_READ_FILE;
}
- ats_free(fname);
ver = file_rb->getCurrentVersion();
file_rb->getVersion(ver, &old_file_content);
*version = ver;
@@ -586,7 +584,7 @@ ReadFile(TSFileNameT file, char **text, int *size, int *version)
TSError
WriteFile(TSFileNameT file, char *text, int size, int version)
{
- char *fname;
+ const char *fname;
Rollback *file_rb;
textBuffer *file_content;
int ret;
@@ -603,7 +601,6 @@ WriteFile(TSFileNameT file, char *text, int size, int version)
mgmt_log(stderr, "[CfgFileIO::WriteFile] ERROR getting rollback object\n");
//goto generate_error_msg;
}
- ats_free(fname);
// if version < 0 then, just use next version in sequence;
// otherwise check if trying to commit an old version
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/9ff75928/mgmt/api/include/mgmtapi.h
----------------------------------------------------------------------
diff --git a/mgmt/api/include/mgmtapi.h b/mgmt/api/include/mgmtapi.h
index 0e9c45e..9e38380 100644
--- a/mgmt/api/include/mgmtapi.h
+++ b/mgmt/api/include/mgmtapi.h
@@ -368,7 +368,7 @@ extern "C"
TS_FNAME_IP_ALLOW, /* ip_allow.config */
TS_FNAME_LOGS_XML, /* logs_xml.config */
TS_FNAME_PARENT_PROXY, /* parent.config */
- TS_FNAME_VOLUME, /* volume.config */
+ TS_FNAME_VOLUME, /* volume.config */
TS_FNAME_PLUGIN, /* plugin.config */
TS_FNAME_REMAP, /* remap.config */
TS_FNAME_SOCKS, /* socks.config */