.

wcfs/client/wcfs_watchlink.cpp

@@ -123,7 +123,7 @@ error _WatchLink::close() {
 // _serveRX receives messages from ._f and dispatches them according to streamID.
 error _WatchLink::_serveRX(context::Context ctx) {    // XXX error -> where ?
     _WatchLink& wlink = *this;
-    xerr::Contextf E("wlink X: serve rx"); // XXX +wlink details
+    xerr::Contextf E("%s: serve rx", v(wlink));
 
     // when finishing - wakeup everyone waiting for rx
     defer([&]() {
@@ -253,7 +253,7 @@ error _WatchLink::_write(const string &pkt) {
 // XXX -> reply | None when EOF
 pair<string, error> _WatchLink::sendReq(context::Context ctx, const string &req) {
     _WatchLink *wlink = this;
-    xerr::Contextf E("wlink X: sendReq");   // XXX wlink details
+    xerr::Contextf E("%s: sendReq", v(wlink));
 
     //printf("wlink sendReq '%s'\n", v(req));
 
@@ -321,7 +321,7 @@ tuple</*rxq*/chan<rxPkt>, error> _WatchLink::_sendReq(context::Context ctx, cons
 // XXX document EOF. XXX -> no EOF here - only ErrUnexpectedEOF
 error _WatchLink::replyReq(context::Context ctx, const PinReq *req, const string& answer) {
     _WatchLink *wlink = this;
-    xerr::Contextf E("wlink X: replyReq");  // XXX +wlink details
+    xerr::Contextf E("%s: replyReq", v(wlink));
 
     //print('C: reply %s <- %r ...' % (req, answer))
     wlink->_rxmu.lock();
@@ -351,7 +351,7 @@ error _WatchLink::replyReq(context::Context ctx, const PinReq *req, const string
 static error _parsePinReq(PinReq *pin, const rxPkt *pkt);
 error _WatchLink::recvReq(context::Context ctx, PinReq *prx) {
     _WatchLink& wlink = *this;
-    xerr::Contextf E("wlink X: recvReq");   // XXX +wlink details
+    xerr::Contextf E("%s: recvReq", v(wlink));
 
     rxPkt pkt;
     bool ok;