.

wcfs/internal/wcfs.cpp

@@ -242,7 +242,7 @@ error _Conn::__pin1(PinReq *req) {
     FileH f;
     bool  ok;
     wconn._filehmu.lock();
-    tie(f, ok) = wconn._filehtab.get(req->foid);
+    tie(f, ok) = wconn._filehtab.get_(req->foid);
     if (!ok) {
         wconn._filehmu.unlock();
         // XXX err = we are not watching the file - why wcfs sent us this update?
@@ -306,8 +306,8 @@ pair<FileH, error> _Conn::open(zodb::Oid foid) {
         return make_pair(nil, E(wconn._downErr));
 
     FileH f; bool ok;
-    tie(f, ok) = wconn._filehtab.get(foid);
-    if (f != nil) {
+    tie(f, ok) = wconn._filehtab.get_(foid);
+    if (ok) {
         // XXX incref open count
         return make_pair(f, nil);
     }
@@ -360,7 +360,7 @@ error _FileH::close() {
     // fileh could be opened for the same foid. Be careful not to erase it.
     wconn->_filehmu.lock();
     // XXX decref open count
-    if (wconn->_filehtab.get(fileh.foid) == fileh)
+    if (wconn->_filehtab.get(fileh.foid) == &fileh)
         wconn->_filehtab.erase(fileh.foid);
     wconn->_filehmu.unlock();
 
@@ -562,7 +562,7 @@ void _Mapping::remmap_blk(int64_t blk) {
 
     // blkrev = rev | @head
     zodb::Tid blkrev; bool ok;
-    tie(blkrev, ok) = mmap.fileh->_pinned.get(blk);
+    tie(blkrev, ok) = mmap.fileh->_pinned.get_(blk);
     if (!ok)
         blkrev = TidHead;
 

wcfs/internal/wcfs_watchlink.cpp

@@ -173,7 +173,7 @@ error _WatchLink::_serveRX(context::Context ctx) {    // XXX error -> where ?
             bool ok;
 
             wlink._rxmu.lock();
-            tie(rxq, ok) = wlink._rxtab.pop(pkt.stream);
+            tie(rxq, ok) = wlink._rxtab.pop_(pkt.stream);
             wlink._rxmu.unlock();
             if (!ok) {
                 // wcfs sent reply on unexpected stream