diff options
| author | Sage Weil <sage@newdream.net> | 2013-02-25 09:10:49 -0800 |
|---|---|---|
| committer | Sage Weil <sage@newdream.net> | 2013-02-25 09:10:49 -0800 |
| commit | 7f61072ad631096e3657ff94ddfb35ed1b7e8111 (patch) | |
| tree | a031c36dc7fad90433781e2b69257eb28aad1cfe | |
| parent | 35ce9d6374f5a6c61ddfa11c2a7a8cf1161c8df2 (diff) | |
| parent | 6ae10fe7fcd95423759003db81a0436c82f3ade0 (diff) | |
| download | ceph-7f61072ad631096e3657ff94ddfb35ed1b7e8111.tar.gz | |
Merge pull request #71 from dalgaaf/wip-da-sca-c_str
fix some c_str() usage
Reviewed-by: Sage Weil <sage@inktank.com>
| -rw-r--r-- | src/client/Client.cc | 2 | ||||
| -rw-r--r-- | src/mon/Paxos.h | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/client/Client.cc b/src/client/Client.cc index 9f1f9aa5d34..697804431aa 100644 --- a/src/client/Client.cc +++ b/src/client/Client.cc @@ -3900,7 +3900,7 @@ int Client::path_walk(const filepath& origpath, Inode **final, bool followsym) ldout(cct, 10) << " " << i << " " << *cur << " " << dname << dendl; ldout(cct, 20) << " (path is " << path << ")" << dendl; Inode *next; - int r = _lookup(cur, dname.c_str(), &next); + int r = _lookup(cur, dname, &next); if (r < 0) return r; // only follow trailing symlink if followsym. always follow diff --git a/src/mon/Paxos.h b/src/mon/Paxos.h index ccabb438028..1edfbc853a5 100644 --- a/src/mon/Paxos.h +++ b/src/mon/Paxos.h @@ -191,7 +191,7 @@ public: * @param s State value. * @return The state's name. */ - static const char *get_statename(int s) { + static const string get_statename(int s) { stringstream ss; if (s & STATE_RECOVERING) { ss << "recovering"; @@ -211,7 +211,7 @@ public: if (s & STATE_LOCKED) ss << " (locked)"; - return ss.str().c_str(); + return ss.str(); } private: |