From f9eacebf687fa655d1f1294f39c9db4d929011b4 Mon Sep 17 00:00:00 2001
From: Olof hagsand <olof@hagsand.se>
Date: Fri, 22 Jul 2022 18:36:53 +0200
Subject: [PATCH] Enable calling clicon_err_fn with fn=NULL

---
 lib/src/clixon_err.c | 54 +++++++++++++++++++++++++++++---------------
 1 file changed, 36 insertions(+), 18 deletions(-)

diff --git a/lib/src/clixon_err.c b/lib/src/clixon_err.c
index 88f6d5f6..be8ab50e 100644
--- a/lib/src/clixon_err.c
+++ b/lib/src/clixon_err.c
@@ -239,30 +239,48 @@ clicon_err_fn(const char *fn,
 	if (cec->cec_logfn(cec->cec_handle, suberr, cb) < 0)
 	    goto done;
 	/* Here we could take care of specific errno, like application-defined errors */
-	clicon_log(LOG_ERR, "%s: %d: %s: %s: %s",
-		   fn,
-		   line,
-		   clicon_strerror(category),
-		   cbuf_get(cb),
-		   msg);
+	if (fn)
+	    clicon_log(LOG_ERR, "%s: %d: %s: %s: %s",
+		       fn,
+		       line,
+		       clicon_strerror(category),
+		       cbuf_get(cb),
+		       msg);
+	else
+	    clicon_log(LOG_ERR, "%s: %s: %s",
+		       clicon_strerror(category),
+		       cbuf_get(cb),
+		       msg);
 	if (cb)
 	    cbuf_free(cb);
     }
     else if (suberr){   /* Actually log it */
 	/* Here we could take care of specific errno, like application-defined errors */
-	clicon_log(LOG_ERR, "%s: %d: %s: %s: %s", 
-		   fn,
-		   line,
-		   clicon_strerror(category),
-		   msg,
-		   suberr==XMLPARSE_ERRNO?"XML parse error":strerror(suberr));
+	if (fn)
+	    clicon_log(LOG_ERR, "%s: %d: %s: %s: %s", 
+		       fn,
+		       line,
+		       clicon_strerror(category),
+		       msg,
+		       suberr==XMLPARSE_ERRNO?"XML parse error":strerror(suberr));
+	else
+	    clicon_log(LOG_ERR, "%s: %s: %s", 
+		       clicon_strerror(category),
+		       msg,
+		       suberr==XMLPARSE_ERRNO?"XML parse error":strerror(suberr));
+    }
+    else{
+	if (fn)
+	    clicon_log(LOG_ERR, "%s: %d: %s: %s", 
+		       fn,
+		       line,
+		       clicon_strerror(category),
+		       msg);
+	else
+	    clicon_log(LOG_ERR, "%s: %s", 
+		       clicon_strerror(category),
+		       msg);
     }
-    else
-	clicon_log(LOG_ERR, "%s: %d: %s: %s", 
-		   fn,
-		   line,
-		   clicon_strerror(category),
-		   msg);
     retval = 0;
   done:
     if (msg)