librados: prefix msg handler with handle_

Signed-off-by: Sage Weil <sage@redhat.com>

diff --git a/src/librados/RadosClient.cc b/src/librados/RadosClient.cc
index 583c16c1d9bb31982cf1337bf2641c53bdeb692b..956cc2c1428c544cf66c9af56a3ea1f4ed203118 100644 (file)
--- a/src/librados/RadosClient.cc
+++ b/src/librados/RadosClient.cc
@@ -385,7 +385,7 @@ bool librados::RadosClient::_dispatch(Message *m)
     break;
 
   case CEPH_MSG_WATCH_NOTIFY:
-    watch_notify(static_cast<MWatchNotify *>(m));
+    handle_watch_notify(static_cast<MWatchNotify *>(m));
     break;
 
   case MSG_LOG:
@@ -658,7 +658,7 @@ public:
   }
 };
 
-void librados::RadosClient::watch_notify(MWatchNotify *m)
+void librados::RadosClient::handle_watch_notify(MWatchNotify *m)
 {
   Mutex::Locker l(lock);
   map<uint64_t, WatchContext *>::iterator iter = watchers.find(m->cookie);

diff --git a/src/librados/RadosClient.h b/src/librados/RadosClient.h
index 1c870180b11d8924bf62903902575e4859dd2ae4..b2e44cadaa11cd67e6e39e0008b65ea037c0699f 100755 (executable)
--- a/src/librados/RadosClient.h
+++ b/src/librados/RadosClient.h
@@ -113,7 +113,7 @@ public:
   void register_watch_notify_callback(librados::WatchContext *wc,
                                      uint64_t *cookie);
   void unregister_watch_notify_callback(uint64_t cookie);
-  void watch_notify(MWatchNotify *m);
+  void handle_watch_notify(MWatchNotify *m);
   int mon_command(const vector<string>& cmd, const bufferlist &inbl,
                  bufferlist *outbl, string *outs);
   int mon_command(int rank,