INN commit: trunk/storage/cnfs (cnfs.c)

INN Commit rra at isc.org
Mon Nov 23 19:24:56 UTC 2020


    Date: Monday, November 23, 2020 @ 11:24:56
  Author: iulius
Revision: 10426

Fix use of %m outside syslog() functions

Modified:
  trunk/storage/cnfs/cnfs.c

--------+
 cnfs.c |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

Modified: cnfs.c
===================================================================
--- cnfs.c	2020-11-23 19:21:30 UTC (rev 10425)
+++ cnfs.c	2020-11-23 19:24:56 UTC (rev 10426)
@@ -714,8 +714,8 @@
                            SMopenmode ? (PROT_READ | PROT_WRITE) : PROT_READ,
                            MAP_SHARED, cycbuff->fd, 0);
      if (cycbuff->bitfield == MAP_FAILED || errno != 0) {
-      warn("CNFS: CNFSinitdisks: mmap for %s offset %d len %ld failed: %m",
-           cycbuff->path, 0, (long) cycbuff->minartoffset);
+      warn("CNFS: CNFSinitdisks: mmap for %s offset %d len %ld failed: %s",
+           cycbuff->path, 0, (long) cycbuff->minartoffset, strerror(errno));
       cycbuff->bitfield = NULL;
       return false;
     }
@@ -1404,9 +1404,9 @@
 	*(CNFSARTHEADER *)&cahh = cah;
 	if(pread(cycbuff->fd, ((char *)&cahh)+sizeof(CNFSARTHEADER), sizeof(oldCNFSARTHEADER)-sizeof(CNFSARTHEADER), offset+sizeof(cah)) != sizeof(oldCNFSARTHEADER)-sizeof(CNFSARTHEADER)) {
             SMseterror(SMERR_UNDEFINED, "read2 failed");
-            syswarn("CNFS: could not read2 token %s %s:0x%s:%u: %m",
+            syswarn("CNFS: could not read2 token %s %s:0x%s:%u: %s",
                     TokenToText(token), cycbuffname,
-                    CNFSofft2hex(offset, false), cycnum);
+                    CNFSofft2hex(offset, false), cycnum, strerror(errno));
             free(art);
             if (!SMpreopen) CNFSshutdowncycbuff(cycbuff);
             return NULL;



More information about the inn-committers mailing list