Use %p as specifier of (void *) pointers

Thanks to Richard Kettlewell for the suggestion of fix.
InterNetNews · Dec 9, 2023 · 4d14fca · 4d14fca
1 parent bb5fcb4
commit 4d14fca
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 27 deletions.
diff --git a/innd/icd.c b/innd/icd.c
@@ -486,8 +486,8 @@ ICDwriteactive(void)
 {
 #ifdef HAVE_MMAP
     if (inn_msync_page(ICDactpointer, ICDactsize, MS_ASYNC) < 0) {
-        syslog(L_FATAL, "%s msync failed %s 0x%lx %d %m", LogName, ICDactpath,
-               (unsigned long) ICDactpointer, ICDactsize);
+        syslog(L_FATAL, "%s msync failed %s 0x%p %d %m", LogName, ICDactpath,
+               (void *) ICDactpointer, ICDactsize);
         exit(1);
     }
 #else  /* !HAVE_MMAP */

diff --git a/innfeed/buffer.c b/innfeed/buffer.c
@@ -85,7 +85,7 @@ newBuffer(size_t size)
     gBufferList = nb;
 
 #if defined(INNFEED_DEBUG)
-    d_printf(1, "Creating a DELETABLE buffer %p\n", nb);
+    d_printf(1, "Creating a DELETABLE buffer %p\n", (void *) nb);
 #endif
 
     return nb;
@@ -120,7 +120,7 @@ newBufferByCharP(const char *ptr, size_t size, size_t dataSize)
 
     bufferCount++;
 #if defined(INNFEED_DEBUG)
-    d_printf(1, "Creating a NON-DELETABLE buffer %p\n", nb);
+    d_printf(1, "Creating a NON-DELETABLE buffer %p\n", (void *) nb);
 #endif
 
     return nb;
@@ -133,7 +133,8 @@ delBuffer(Buffer buff)
     if (buff != NULL && --(buff->refCount) == 0) {
 #if defined(INNFEED_DEBUG)
         d_printf(1, "Freeing a %s buffer (%p)\n",
-                 (buff->deletable ? "DELETABLE" : "NON-DELETABLE"), buff);
+                 (buff->deletable ? "DELETABLE" : "NON-DELETABLE"),
+                 (void *) buff);
 #endif
 
         bufferCount--;

diff --git a/nnrpd/tls.c b/nnrpd/tls.c
@@ -822,15 +822,13 @@ bio_dump_cb(BIO *bio, int cmd, const char *argp, int argi, long argl UNUSED,
         return (ret);
 
     if (cmd == (BIO_CB_READ | BIO_CB_RETURN)) {
-        syslog(L_NOTICE, "read from %08lX [%08lX] (%d bytes => %ld (0x%lX))",
-               (unsigned long) bio, (unsigned long) argp, argi, ret,
-               (unsigned long) ret);
+        syslog(L_NOTICE, "read from %p [%p] (%d bytes => %ld (0x%lX))",
+               (void *) bio, (void *) argp, argi, ret, (unsigned long) ret);
         tls_dump(argp, (int) ret);
         return (ret);
     } else if (cmd == (BIO_CB_WRITE | BIO_CB_RETURN)) {
-        syslog(L_NOTICE, "write to %08lX [%08lX] (%d bytes => %ld (0x%lX))",
-               (unsigned long) bio, (unsigned long) argp, argi, ret,
-               (unsigned long) ret);
+        syslog(L_NOTICE, "write to %p [%p] (%d bytes => %ld (0x%lX))",
+               (void *) bio, (void *) argp, argi, ret, (unsigned long) ret);
         tls_dump(argp, (int) ret);
     }
     return (ret);
@@ -845,29 +843,25 @@ bio_dump_cb(BIO *bio, int cmd, const char *argp, size_t len, int argi UNUSED,
 
     if (cmd == (BIO_CB_READ | BIO_CB_RETURN)) {
         if (ret > 0 && processed != NULL) {
-            syslog(
-                L_NOTICE, "read from %08lX [%08lX] (%lu bytes => %lu (0x%lX))",
-                (unsigned long) bio, (unsigned long) argp, (unsigned long) len,
-                (unsigned long) *processed, (unsigned long) *processed);
+            syslog(L_NOTICE, "read from %p [%p] (%lu bytes => %lu (0x%lX))",
+                   (void *) bio, (void *) argp, (unsigned long) len,
+                   (unsigned long) *processed, (unsigned long) *processed);
             tls_dump(argp, (int) *processed);
         } else {
-            syslog(L_NOTICE,
-                   "read from %08lX [%08lX] (%lu bytes => %d (0x%lX))",
-                   (unsigned long) bio, (unsigned long) argp,
-                   (unsigned long) len, ret, (unsigned long) ret);
+            syslog(L_NOTICE, "read from %p [%p] (%lu bytes => %d (0x%lX))",
+                   (void *) bio, (void *) argp, (unsigned long) len, ret,
+                   (unsigned long) ret);
         }
     } else if (cmd == (BIO_CB_WRITE | BIO_CB_RETURN)) {
         if (ret > 0 && processed != NULL) {
-            syslog(
-                L_NOTICE, "write to %08lX [%08lX] (%lu bytes => %lu (0x%lX))",
-                (unsigned long) bio, (unsigned long) argp, (unsigned long) len,
-                (unsigned long) *processed, (unsigned long) *processed);
+            syslog(L_NOTICE, "write to %p [%p] (%lu bytes => %lu (0x%lX))",
+                   (void *) bio, (void *) argp, (unsigned long) len,
+                   (unsigned long) *processed, (unsigned long) *processed);
             tls_dump(argp, (int) *processed);
         } else {
-            syslog(L_NOTICE,
-                   "write to %08lX [%08lX] (%lu bytes => %d (0x%lX))",
-                   (unsigned long) bio, (unsigned long) argp,
-                   (unsigned long) len, ret, (unsigned long) ret);
+            syslog(L_NOTICE, "write to %p [%p] (%lu bytes => %d (0x%lX))",
+                   (void *) bio, (void *) argp, (unsigned long) len, ret,
+                   (unsigned long) ret);
         }
     }
     return (ret);