.

wcfs/client/wcfs_watchlink.cpp

@@ -87,12 +87,10 @@ error _WatchLink::close() {
 
     error err = wlink.closeWrite();
     wlink._serveCancel();
-    // XXX we can get stuck here if wcfs does not behave as we want.
-    // XXX in particular if there is a silly - e.g. syntax or type error in
-    //     test code - we currently get stuck here.
+    // NOTE we can get stuck here if wcfs does not behave correctly by closing
+    // its side in reply to our "bye" message.
     //
-    // XXX -> better pthread_kill(SIGINT) instead of relying on wcfs proper behaviour?
-    // XXX -> we now have `kill -QUIT` to wcfs.go on test timeout - remove ^^^ comments?
+    // TODO -> better pthread_kill(SIGINT) instead of relying on wcfs proper behaviour?
     error err2 = wlink._serveWG->wait();
     // canceled is expected and ok
     if (errors::Is(err2, context::canceled))
@@ -108,7 +106,7 @@ error _WatchLink::close() {
 }
 
 // _serveRX receives messages from ._f and dispatches them according to streamID.
-error _WatchLink::_serveRX(context::Context ctx) {    // XXX error -> where ?
+error _WatchLink::_serveRX(context::Context ctx) {
     _WatchLink& wlink = *this;
     xerr::Contextf E("%s: serve rx", v(wlink));
 

wcfs/client/wcfs_watchlink.h

@@ -92,7 +92,7 @@ class _WatchLink : public object {
 
     // XXX for tests
 public:
-    vector<string>  fatalv; // ad-hoc, racy. TODO rework to send messeges to control channel
+    vector<string>  fatalv; // ad-hoc, racy. TODO rework to send messages to control channel
     chan<structZ>   rx_eof; // becomes ready when wcfs closes its tx side
 
     // don't new - create only via WCFS._openwatch()