Subversion Repositories

#! /bin/sh /usr/share/dpatch/dpatch-run
## 20_printf_types.dpatch by Magnus Holmgren <magnus@kibibyte.se>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Change the format strings of various calls to printf-style functions to 
## DP: match the arguments.

@DPATCH@

diff -Nur libspf2-1.2.5.dfsg/src/libspf2/spf_compile.c libspf2-1.2.5.dfsg.new/src/libspf2/spf_compile.c
--- libspf2-1.2.5.dfsg/src/libspf2/spf_compile.c        2007-03-23 22:37:26.000000000 +0100
+++ libspf2-1.2.5.dfsg.new/src/libspf2/spf_compile.c    2007-03-23 23:18:41.000000000 +0100
@@ -469,8 +469,8 @@
                        if ( p + len > end )    /* Don't re-parse the CIDR mask */
                                len = end - p;
                        if (spf_server->debug)
-                               SPF_debugf("Adding string literal (%d): '%*.*s'",
-                                                               len, len, len, p);
+                               SPF_debugf("Adding string literal (%zu): '%*.*s'",
+                                                               len, (int)len, (int)len, p);
                        memcpy( dst, p, len );
                        ds_len += len;
                        dst += len;
diff -Nur libspf2-1.2.5.dfsg/src/libspf2/spf_id2str.c libspf2-1.2.5.dfsg.new/src/libspf2/spf_id2str.c
--- libspf2-1.2.5.dfsg/src/libspf2/spf_id2str.c 2007-03-23 22:37:26.000000000 +0100
+++ libspf2-1.2.5.dfsg.new/src/libspf2/spf_id2str.c     2007-03-23 23:13:55.000000000 +0100
@@ -309,7 +309,7 @@
        p_end = *bufp + *buflenp;
 
        if (debug)
-               SPF_debugf("stringify: Buffer length is %d\n", *buflenp);
+               SPF_debugf("stringify: Buffer length is %zu\n", *buflenp);
 
 
        /*
diff -Nur libspf2-1.2.5.dfsg/src/libspf2/spf_print.c libspf2-1.2.5.dfsg.new/src/libspf2/spf_print.c
--- libspf2-1.2.5.dfsg/src/libspf2/spf_print.c  2007-03-23 22:37:26.000000000 +0100
+++ libspf2-1.2.5.dfsg.new/src/libspf2/spf_print.c      2007-03-23 23:12:30.000000000 +0100
@@ -54,7 +54,7 @@
                return SPF_E_SUCCESS;
        }
 
-    SPF_infof( "SPF header:  version: %d  mech %d/%d  mod %d/%d  len=%d",
+    SPF_infof( "SPF header:  version: %hhu  mech %hhu/%zu  mod %hhu/%zu  len=%zu",
            spf_record->version,
            spf_record->num_mech, spf_record->mech_len, 
            spf_record->num_mod, spf_record->mod_len,
@@ -81,7 +81,7 @@
 void SPF_print_sizeof(void)
 {
     // SPF_infof( "sizeof(SPF_rec_header_t)=%u", sizeof(SPF_rec_header_t));
-    SPF_infof( "sizeof(SPF_mech_t)=%u", sizeof(SPF_mech_t));
-    SPF_infof( "sizeof(SPF_data_t)=%u", sizeof(SPF_data_t));
-    SPF_infof( "sizeof(SPF_mod_t)=%u", sizeof(SPF_mod_t));
+    SPF_infof( "sizeof(SPF_mech_t)=%zu", sizeof(SPF_mech_t));
+    SPF_infof( "sizeof(SPF_data_t)=%zu", sizeof(SPF_data_t));
+    SPF_infof( "sizeof(SPF_mod_t)=%zu", sizeof(SPF_mod_t));
 }