Go to most recent revision | Details | Last modification | View Log | RSS feed
Rev | Author | Line No. | Line |
---|---|---|---|
2 | magnus | 1 | #! /bin/sh /usr/share/dpatch/dpatch-run |
2 | ## 20_printf_types.dpatch by Magnus Holmgren <magnus@kibibyte.se> |
||
3 | ## |
||
4 | ## All lines beginning with `## DP:' are a description of the patch. |
||
5 | ## DP: Change the format strings of various calls to printf-style functions to |
||
6 | ## DP: match the arguments. |
||
7 | |||
8 | @DPATCH@ |
||
9 | |||
10 | diff -Nur libspf2-1.2.5.dfsg/src/libspf2/spf_compile.c libspf2-1.2.5.dfsg.new/src/libspf2/spf_compile.c |
||
11 | --- libspf2-1.2.5.dfsg/src/libspf2/spf_compile.c 2007-03-23 22:37:26.000000000 +0100 |
||
12 | +++ libspf2-1.2.5.dfsg.new/src/libspf2/spf_compile.c 2007-03-23 23:18:41.000000000 +0100 |
||
13 | @@ -469,8 +469,8 @@ |
||
14 | if ( p + len > end ) /* Don't re-parse the CIDR mask */ |
||
15 | len = end - p; |
||
16 | if (spf_server->debug) |
||
17 | - SPF_debugf("Adding string literal (%d): '%*.*s'", |
||
18 | - len, len, len, p); |
||
19 | + SPF_debugf("Adding string literal (%zu): '%*.*s'", |
||
20 | + len, (int)len, (int)len, p); |
||
21 | memcpy( dst, p, len ); |
||
22 | ds_len += len; |
||
23 | dst += len; |
||
24 | diff -Nur libspf2-1.2.5.dfsg/src/libspf2/spf_id2str.c libspf2-1.2.5.dfsg.new/src/libspf2/spf_id2str.c |
||
25 | --- libspf2-1.2.5.dfsg/src/libspf2/spf_id2str.c 2007-03-23 22:37:26.000000000 +0100 |
||
26 | +++ libspf2-1.2.5.dfsg.new/src/libspf2/spf_id2str.c 2007-03-23 23:13:55.000000000 +0100 |
||
27 | @@ -309,7 +309,7 @@ |
||
28 | p_end = *bufp + *buflenp; |
||
29 | |||
30 | if (debug) |
||
31 | - SPF_debugf("stringify: Buffer length is %d\n", *buflenp); |
||
32 | + SPF_debugf("stringify: Buffer length is %zu\n", *buflenp); |
||
33 | |||
34 | |||
35 | /* |
||
36 | diff -Nur libspf2-1.2.5.dfsg/src/libspf2/spf_print.c libspf2-1.2.5.dfsg.new/src/libspf2/spf_print.c |
||
37 | --- libspf2-1.2.5.dfsg/src/libspf2/spf_print.c 2007-03-23 22:37:26.000000000 +0100 |
||
38 | +++ libspf2-1.2.5.dfsg.new/src/libspf2/spf_print.c 2007-03-23 23:12:30.000000000 +0100 |
||
39 | @@ -54,7 +54,7 @@ |
||
40 | return SPF_E_SUCCESS; |
||
41 | } |
||
42 | |||
43 | - SPF_infof( "SPF header: version: %d mech %d/%d mod %d/%d len=%d", |
||
44 | + SPF_infof( "SPF header: version: %hhu mech %hhu/%zu mod %hhu/%zu len=%zu", |
||
45 | spf_record->version, |
||
46 | spf_record->num_mech, spf_record->mech_len, |
||
47 | spf_record->num_mod, spf_record->mod_len, |
||
48 | @@ -81,7 +81,7 @@ |
||
49 | void SPF_print_sizeof(void) |
||
50 | { |
||
51 | // SPF_infof( "sizeof(SPF_rec_header_t)=%u", sizeof(SPF_rec_header_t)); |
||
52 | - SPF_infof( "sizeof(SPF_mech_t)=%u", sizeof(SPF_mech_t)); |
||
53 | - SPF_infof( "sizeof(SPF_data_t)=%u", sizeof(SPF_data_t)); |
||
54 | - SPF_infof( "sizeof(SPF_mod_t)=%u", sizeof(SPF_mod_t)); |
||
55 | + SPF_infof( "sizeof(SPF_mech_t)=%zu", sizeof(SPF_mech_t)); |
||
56 | + SPF_infof( "sizeof(SPF_data_t)=%zu", sizeof(SPF_data_t)); |
||
57 | + SPF_infof( "sizeof(SPF_mod_t)=%zu", sizeof(SPF_mod_t)); |
||
58 | } |