Merge commit '10d472202dc2bf1fa5c569d2a14d460e95030564' into PSI-7.0

This is before PVA is modified
2020-11-16 17:06:22 +01:00
parent ce43a67cbd 10d472202d
commit 1db2cba81d
22 changed files with 527 additions and 447 deletions
@@ -603,7 +603,7 @@ void epicsStdCall ca_signal_formated ( long ca_status, const char *pfilenm,
    }
    else {
        fprintf ( stderr, "CA exception in thread w/o CA ctx: status=%s file=%s line=%d: \n",
-            ca_message ( ca_status ), pfilenm, lineno );
+            ca_message ( ca_status ), pfilenm ? pfilenm : "<null>", lineno );
        if ( pFormat ) {
            vfprintf ( stderr, pFormat, theArgs );
        }