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 -urNad libspf2-1.2.5.dfsg~/src/libspf2/spf_compile.c libspf2-1.2.5.dfsg/src/libspf2/spf_compile.c
--- libspf2-1.2.5.dfsg~/src/libspf2/spf_compile.c       2007-03-27 14:28:00.931960929 +0200
+++ libspf2-1.2.5.dfsg/src/libspf2/spf_compile.c        2007-03-27 14:30:04.000000000 +0200
@@ -470,7 +470,7 @@
                                len = end - p;
                        if (spf_server->debug)
                                SPF_debugf("Adding string literal (%d): '%*.*s'",
-                                                               len, len, len, p);
+                                                               (int)len, (int)len, (int)len, p);
                        memcpy( dst, p, len );
                        ds_len += len;
                        dst += len;
diff -urNad libspf2-1.2.5.dfsg~/src/libspf2/spf_id2str.c libspf2-1.2.5.dfsg/src/libspf2/spf_id2str.c
--- libspf2-1.2.5.dfsg~/src/libspf2/spf_id2str.c        2007-03-27 14:27:58.171600935 +0200
+++ libspf2-1.2.5.dfsg/src/libspf2/spf_id2str.c 2007-03-27 14:30:51.000000000 +0200
@@ -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 %u\n", (unsigned int)*buflenp);
 
 
        /*
diff -urNad libspf2-1.2.5.dfsg~/src/libspf2/spf_print.c libspf2-1.2.5.dfsg/src/libspf2/spf_print.c
--- libspf2-1.2.5.dfsg~/src/libspf2/spf_print.c 2007-03-27 14:27:58.231608763 +0200
+++ libspf2-1.2.5.dfsg/src/libspf2/spf_print.c  2007-03-27 14:47:39.000000000 +0200
@@ -54,12 +54,12 @@
                return SPF_E_SUCCESS;
        }
 
-    SPF_infof( "SPF header:  version: %d  mech %d/%d  mod %d/%d  len=%d",
+    SPF_infof( "SPF header:  version: %d  mech %d/%u  mod %d/%u  len=%u",
            spf_record->version,
-           spf_record->num_mech, spf_record->mech_len, 
-           spf_record->num_mod, spf_record->mod_len,
-           sizeof(SPF_record_t) + spf_record->mech_len
-           + spf_record->mod_len);
+           (int)spf_record->num_mech, (unsigned int)spf_record->mech_len, 
+           (int)spf_record->num_mod, (unsigned int)spf_record->mod_len,
+           (unsigned int)(sizeof(SPF_record_t) + spf_record->mech_len
+                          + spf_record->mod_len));
 
     err = SPF_record_stringify(spf_record, &prt_buf, &prt_len);
     if ( err == SPF_E_RESULT_UNKNOWN )
@@ -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)=%u", (unsigned int)sizeof(SPF_mech_t));
+    SPF_infof( "sizeof(SPF_data_t)=%u", (unsigned int)sizeof(SPF_data_t));
+    SPF_infof( "sizeof(SPF_mod_t)=%u", (unsigned int)sizeof(SPF_mod_t));
 }