You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by jp...@apache.org on 2015/03/09 16:55:18 UTC
trafficserver git commit: TS-3408: minor bug fixes
Repository: trafficserver
Updated Branches:
refs/heads/master 857766c5c -> d20bc62d1
TS-3408: minor bug fixes
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/d20bc62d
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/d20bc62d
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/d20bc62d
Branch: refs/heads/master
Commit: d20bc62d14b4d4585325cff6f79d5dcdf4a608db
Parents: 857766c
Author: James Peach <jp...@apache.org>
Authored: Mon Mar 9 08:55:16 2015 -0700
Committer: James Peach <jp...@apache.org>
Committed: Mon Mar 9 08:55:16 2015 -0700
----------------------------------------------------------------------
cmd/traffic_ctl/config.cc | 2 +-
mgmt/api/TSControlMain.cc | 8 ++++----
2 files changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/d20bc62d/cmd/traffic_ctl/config.cc
----------------------------------------------------------------------
diff --git a/cmd/traffic_ctl/config.cc b/cmd/traffic_ctl/config.cc
index f8b4886..7a4aadf 100644
--- a/cmd/traffic_ctl/config.cc
+++ b/cmd/traffic_ctl/config.cc
@@ -74,7 +74,7 @@ rec_updateof(int rec_updatetype)
case RECU_RESTART_TM: return "static, restart traffic_manager";
case RECU_RESTART_TC: return "static, full restart";
case RECU_NULL: /* fallthru */
- default: return "unknown";
+ default: return "none";
}
}
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/d20bc62d/mgmt/api/TSControlMain.cc
----------------------------------------------------------------------
diff --git a/mgmt/api/TSControlMain.cc b/mgmt/api/TSControlMain.cc
index 8f8633e..866e663 100644
--- a/mgmt/api/TSControlMain.cc
+++ b/mgmt/api/TSControlMain.cc
@@ -266,19 +266,19 @@ static TSMgmtError
marshall_rec_data(RecDataT rec_type, const RecData& rec_data, MgmtMarshallData& data)
{
switch (rec_type) {
- case TS_REC_INT:
+ case RECD_INT:
data.ptr = const_cast<RecInt *>(&rec_data.rec_int);
data.len = sizeof(TSInt);
break;
- case TS_REC_COUNTER:
+ case RECD_COUNTER:
data.ptr = const_cast<RecCounter *>(&rec_data.rec_counter);
data.len = sizeof(TSCounter);
break;
- case TS_REC_FLOAT:
+ case RECD_FLOAT:
data.ptr = const_cast<RecFloat *>(&rec_data.rec_float);
data.len = sizeof(TSFloat);
break;
- case TS_REC_STRING:
+ case RECD_STRING:
// Make sure to send the NULL in the string value response.
if (rec_data.rec_string) {
data.ptr = rec_data.rec_string;