INN commit: branches/2.6 (3 files)

[INN Commit]

    Date: Friday, December 11, 2015 @ 12:40:29
  Author: iulius
Revision: 9979

Properly cast size_t to unsigned long when printf'ing them as %lu

Modified:
  branches/2.6/contrib/reset-cnfs.c
  branches/2.6/nnrpd/line.c
  branches/2.6/nnrpd/tls.c

----------------------+
 contrib/reset-cnfs.c |    2 +-
 nnrpd/line.c         |    2 +-
 nnrpd/tls.c          |   10 ++++++----
 3 files changed, 8 insertions(+), 6 deletions(-)

Modified: contrib/reset-cnfs.c
===================================================================
--- contrib/reset-cnfs.c	2015-12-11 20:39:56 UTC (rev 9978)
+++ contrib/reset-cnfs.c	2015-12-11 20:40:29 UTC (rev 9979)
@@ -46,7 +46,7 @@
                  * for (512 * 8) * 512 bytes of data. */
                 numwr = (st.st_size / (512*8) / sizeof(buf)) + 50;
                 printf("File %s: %lu %u\n", argv[i],
-                       (long unsigned) st.st_size, numwr);
+                       (unsigned long) st.st_size, numwr);
                 for (j = 0; j < numwr; j++) {
                     if (!(j % 100)) {
                         printf("\t%d/%d\n", j, numwr);

Modified: nnrpd/line.c
===================================================================
--- nnrpd/line.c	2015-12-11 20:39:56 UTC (rev 9978)
+++ nnrpd/line.c	2015-12-11 20:40:29 UTC (rev 9979)
@@ -210,7 +210,7 @@
                 }
                 if (newsize == zbuf_in_size) {
                     warn("%s overflowed our zstream_in buffer (%lu)",
-                         Client.host, newsize);
+                         Client.host, (unsigned long) newsize);
                     n = -1;
                     break;
                 }

Modified: nnrpd/tls.c
===================================================================
--- nnrpd/tls.c	2015-12-11 20:39:56 UTC (rev 9978)
+++ nnrpd/tls.c	2015-12-11 20:40:29 UTC (rev 9979)
@@ -705,13 +705,15 @@
 	return (ret);
 
     if (cmd == (BIO_CB_READ | BIO_CB_RETURN)) {
-	Printf("read from %08lX [%08lX] (%d bytes => %ld (0x%X))", (long unsigned int) bio, (long unsigned int) argp,
-		 argi, ret, (unsigned int) ret);
+        Printf("read from %08lX [%08lX] (%d bytes => %ld (0x%X))",
+               (unsigned long) bio, (unsigned long) argp,
+               argi, ret, (unsigned int) ret);
 	tls_dump(argp, (int) ret);
 	return (ret);
     } else if (cmd == (BIO_CB_WRITE | BIO_CB_RETURN)) {
-	Printf("write to %08lX [%08lX] (%d bytes => %ld (0x%X))", (long unsigned int) bio, (long unsigned int) argp,
-		 argi, ret, (unsigned int) ret);
+        Printf("write to %08lX [%08lX] (%d bytes => %ld (0x%X))",
+               (unsigned long) bio, (unsigned long) argp,
+               argi, ret, (unsigned int) ret);
 	tls_dump(argp, (int) ret);
     }
     return (ret);