.

wcfs/client/wcfs.cpp

@@ -161,10 +161,7 @@ error _Conn::close() {
 // _pinner receives pin messages from wcfs and adjusts wconn mappings.
 error _Conn::_pinner(context::Context ctx) {
     _Conn& wconn = *this;
-    xerr::Contextf E("pinner"); // NOTE pinner error goes to Conn::close who has its own context
-
     error err = wconn.__pinner(ctx);
-    err = E(err);
 
     // if pinner fails, wcfs will kill us.
     // log pinner error so the error is not hidden.
@@ -190,6 +187,7 @@ error _Conn::_pinner(context::Context ctx) {
 
 error _Conn::__pinner(context::Context ctx) {
     _Conn& wconn = *this;
+    xerr::Contextf E("pinner"); // NOTE pinner error goes to Conn::close who has its own context
 
     PinReq req;
     error  err;
@@ -203,13 +201,13 @@ error _Conn::__pinner(context::Context ctx) {
                 err = (wconn._downErr == errConnClosed) ? nil : io::ErrUnexpectedEOF;
                 wconn._downMu.unlock();
             }
-            return err;
+            return E(err);
         }
 
         // we received request to pin/unpin file block. handle it
         err = wconn._pin1(&req);
         if (err != nil) {
-            return err;
+            return E(err);
         }
     }
 }

wcfs/client/wcfs_misc.h

@@ -168,7 +168,7 @@ public:
 }   // xerr::
 
 
-// golang::log::        TODO -> pygolang
+// golang::log::        XXX -> pygolang ?
 namespace golang {
 namespace log {