Rev 5 | Only display areas with differences | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed
Rev 5 | Rev 29 | ||
---|---|---|---|
1 | #! /bin/sh /usr/share/dpatch/dpatch-run |
1 | #! /bin/sh /usr/share/dpatch/dpatch-run |
2 | ## 20_printf_types.dpatch by Magnus Holmgren <magnus@kibibyte.se> |
2 | ## 20_printf_types.dpatch by Magnus Holmgren <magnus@kibibyte.se> |
3 | ## |
3 | ## |
4 | ## All lines beginning with `## DP:' are a description of the patch. |
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 |
5 | ## DP: Change the format strings of various calls to printf-style functions to |
6 | ## DP: match the arguments. |
6 | ## DP: match the arguments. |
7 | 7 | ||
8 | @DPATCH@ |
8 | @DPATCH@ |
9 | diff -urNad libspf2-1.2.5.dfsg~/src/libspf2/spf_compile.c libspf2-1.2.5.dfsg/src/libspf2/spf_compile.c |
9 | diff -urNad libspf2-1.2.5.dfsg~/src/libspf2/spf_compile.c libspf2-1.2.5.dfsg/src/libspf2/spf_compile.c |
10 | --- libspf2-1.2.5.dfsg~/src/libspf2/spf_compile.c 2007-03-27 14:28:00.931960929 +0200 |
10 | --- libspf2-1.2.5.dfsg~/src/libspf2/spf_compile.c 2007-03-27 14:28:00.931960929 +0200 |
11 | +++ libspf2-1.2.5.dfsg/src/libspf2/spf_compile.c 2007-03-27 14:30:04.000000000 +0200 |
11 | +++ libspf2-1.2.5.dfsg/src/libspf2/spf_compile.c 2007-03-27 14:30:04.000000000 +0200 |
12 | @@ -470,7 +470,7 @@ |
12 | @@ -470,7 +470,7 @@ |
13 | len = end - p; |
13 | len = end - p; |
14 | if (spf_server->debug) |
14 | if (spf_server->debug) |
15 | SPF_debugf("Adding string literal (%d): '%*.*s'", |
15 | SPF_debugf("Adding string literal (%d): '%*.*s'", |
16 | - len, len, len, p); |
16 | - len, len, len, p); |
17 | + (int)len, (int)len, (int)len, p); |
17 | + (int)len, (int)len, (int)len, p); |
18 | memcpy( dst, p, len ); |
18 | memcpy( dst, p, len ); |
19 | ds_len += len; |
19 | ds_len += len; |
20 | dst += len; |
20 | dst += len; |
21 | diff -urNad libspf2-1.2.5.dfsg~/src/libspf2/spf_id2str.c libspf2-1.2.5.dfsg/src/libspf2/spf_id2str.c |
21 | diff -urNad libspf2-1.2.5.dfsg~/src/libspf2/spf_id2str.c libspf2-1.2.5.dfsg/src/libspf2/spf_id2str.c |
22 | --- libspf2-1.2.5.dfsg~/src/libspf2/spf_id2str.c 2007-03-27 14:27:58.171600935 +0200 |
22 | --- libspf2-1.2.5.dfsg~/src/libspf2/spf_id2str.c 2007-03-27 14:27:58.171600935 +0200 |
23 | +++ libspf2-1.2.5.dfsg/src/libspf2/spf_id2str.c 2007-03-27 14:30:51.000000000 +0200 |
23 | +++ libspf2-1.2.5.dfsg/src/libspf2/spf_id2str.c 2007-03-27 14:30:51.000000000 +0200 |
24 | @@ -309,7 +309,7 @@ |
24 | @@ -309,7 +309,7 @@ |
25 | p_end = *bufp + *buflenp; |
25 | p_end = *bufp + *buflenp; |
26 | 26 | ||
27 | if (debug) |
27 | if (debug) |
28 | - SPF_debugf("stringify: Buffer length is %d\n", *buflenp); |
28 | - SPF_debugf("stringify: Buffer length is %d\n", *buflenp); |
29 | + SPF_debugf("stringify: Buffer length is %u\n", (unsigned int)*buflenp); |
29 | + SPF_debugf("stringify: Buffer length is %u\n", (unsigned int)*buflenp); |
30 | 30 | ||
31 | 31 | ||
32 | /* |
32 | /* |
33 | diff -urNad libspf2-1.2.5.dfsg~/src/libspf2/spf_print.c libspf2-1.2.5.dfsg/src/libspf2/spf_print.c |
33 | diff -urNad libspf2-1.2.5.dfsg~/src/libspf2/spf_print.c libspf2-1.2.5.dfsg/src/libspf2/spf_print.c |
34 | --- libspf2-1.2.5.dfsg~/src/libspf2/spf_print.c 2007-03-27 14:27:58.231608763 +0200 |
34 | --- libspf2-1.2.5.dfsg~/src/libspf2/spf_print.c 2007-03-27 14:27:58.231608763 +0200 |
35 | +++ libspf2-1.2.5.dfsg/src/libspf2/spf_print.c 2007-03-27 14:47:39.000000000 +0200 |
35 | +++ libspf2-1.2.5.dfsg/src/libspf2/spf_print.c 2007-03-27 14:47:39.000000000 +0200 |
36 | @@ -54,12 +54,12 @@ |
36 | @@ -54,12 +54,12 @@ |
37 | return SPF_E_SUCCESS; |
37 | return SPF_E_SUCCESS; |
38 | } |
38 | } |
39 | 39 | ||
40 | - SPF_infof( "SPF header: version: %d mech %d/%d mod %d/%d len=%d", |
40 | - SPF_infof( "SPF header: version: %d mech %d/%d mod %d/%d len=%d", |
41 | + SPF_infof( "SPF header: version: %d mech %d/%u mod %d/%u len=%u", |
41 | + SPF_infof( "SPF header: version: %d mech %d/%u mod %d/%u len=%u", |
42 | spf_record->version, |
42 | spf_record->version, |
43 | - spf_record->num_mech, spf_record->mech_len, |
43 | - spf_record->num_mech, spf_record->mech_len, |
44 | - spf_record->num_mod, spf_record->mod_len, |
44 | - spf_record->num_mod, spf_record->mod_len, |
45 | - sizeof(SPF_record_t) + spf_record->mech_len |
45 | - sizeof(SPF_record_t) + spf_record->mech_len |
46 | - + spf_record->mod_len); |
46 | - + spf_record->mod_len); |
47 | + (int)spf_record->num_mech, (unsigned int)spf_record->mech_len, |
47 | + (int)spf_record->num_mech, (unsigned int)spf_record->mech_len, |
48 | + (int)spf_record->num_mod, (unsigned int)spf_record->mod_len, |
48 | + (int)spf_record->num_mod, (unsigned int)spf_record->mod_len, |
49 | + (unsigned int)(sizeof(SPF_record_t) + spf_record->mech_len |
49 | + (unsigned int)(sizeof(SPF_record_t) + spf_record->mech_len |
50 | + + spf_record->mod_len)); |
50 | + + spf_record->mod_len)); |
51 | 51 | ||
52 | err = SPF_record_stringify(spf_record, &prt_buf, &prt_len); |
52 | err = SPF_record_stringify(spf_record, &prt_buf, &prt_len); |
53 | if ( err == SPF_E_RESULT_UNKNOWN ) |
53 | if ( err == SPF_E_RESULT_UNKNOWN ) |
54 | @@ -81,7 +81,7 @@ |
54 | @@ -81,7 +81,7 @@ |
55 | void SPF_print_sizeof(void) |
55 | void SPF_print_sizeof(void) |
56 | { |
56 | { |
57 | // SPF_infof( "sizeof(SPF_rec_header_t)=%u", sizeof(SPF_rec_header_t)); |
57 | // SPF_infof( "sizeof(SPF_rec_header_t)=%u", sizeof(SPF_rec_header_t)); |
58 | - SPF_infof( "sizeof(SPF_mech_t)=%u", sizeof(SPF_mech_t)); |
58 | - SPF_infof( "sizeof(SPF_mech_t)=%u", sizeof(SPF_mech_t)); |
59 | - SPF_infof( "sizeof(SPF_data_t)=%u", sizeof(SPF_data_t)); |
59 | - SPF_infof( "sizeof(SPF_data_t)=%u", sizeof(SPF_data_t)); |
60 | - SPF_infof( "sizeof(SPF_mod_t)=%u", sizeof(SPF_mod_t)); |
60 | - SPF_infof( "sizeof(SPF_mod_t)=%u", sizeof(SPF_mod_t)); |
61 | + SPF_infof( "sizeof(SPF_mech_t)=%u", (unsigned int)sizeof(SPF_mech_t)); |
61 | + SPF_infof( "sizeof(SPF_mech_t)=%u", (unsigned int)sizeof(SPF_mech_t)); |
62 | + SPF_infof( "sizeof(SPF_data_t)=%u", (unsigned int)sizeof(SPF_data_t)); |
62 | + SPF_infof( "sizeof(SPF_data_t)=%u", (unsigned int)sizeof(SPF_data_t)); |
63 | + SPF_infof( "sizeof(SPF_mod_t)=%u", (unsigned int)sizeof(SPF_mod_t)); |
63 | + SPF_infof( "sizeof(SPF_mod_t)=%u", (unsigned int)sizeof(SPF_mod_t)); |
64 | } |
64 | } |