Rev 2 | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed
| Rev 2 | Rev 5 | ||
|---|---|---|---|
| Line 4... | Line 4... | ||
| 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 | - | ||
| 10 | diff -Nur libspf2-1.2.5.dfsg/src/libspf2/spf_compile.c libspf2-1.2.5.dfsg.new/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 |
| 11 | --- libspf2-1.2.5.dfsg/src/libspf2/spf_compile.c 2007-03-23 22:37:26.000000000 +0100 |
10 | --- libspf2-1.2.5.dfsg~/src/libspf2/spf_compile.c 2007-03-27 14:28:00.931960929 +0200 |
| 12 | +++ libspf2-1.2.5.dfsg.new/src/libspf2/spf_compile.c 2007-03-23 23:18:41.000000000 +0100 |
11 | +++ libspf2-1.2.5.dfsg/src/libspf2/spf_compile.c 2007-03-27 14:30:04.000000000 +0200 |
| 13 | @@ -469,8 +469,8 @@ |
12 | @@ -470,7 +470,7 @@ |
| 14 | if ( p + len > end ) /* Don't re-parse the CIDR mask */ |
- | |
| 15 | len = end - p; |
13 | len = end - p; |
| 16 | if (spf_server->debug) |
14 | if (spf_server->debug) |
| 17 | - SPF_debugf("Adding string literal (%d): '%*.*s'",
|
15 | SPF_debugf("Adding string literal (%d): '%*.*s'",
|
| 18 | - len, len, len, p); |
16 | - len, len, len, p); |
| 19 | + SPF_debugf("Adding string literal (%zu): '%*.*s'",
|
- | |
| 20 | + len, (int)len, (int)len, p); |
17 | + (int)len, (int)len, (int)len, p); |
| 21 | memcpy( dst, p, len ); |
18 | memcpy( dst, p, len ); |
| 22 | ds_len += len; |
19 | ds_len += len; |
| 23 | dst += len; |
20 | 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 |
21 | diff -urNad libspf2-1.2.5.dfsg~/src/libspf2/spf_id2str.c libspf2-1.2.5.dfsg/src/libspf2/spf_id2str.c |
| 25 | --- libspf2-1.2.5.dfsg/src/libspf2/spf_id2str.c 2007-03-23 22:37:26.000000000 +0100 |
22 | --- libspf2-1.2.5.dfsg~/src/libspf2/spf_id2str.c 2007-03-27 14:27:58.171600935 +0200 |
| 26 | +++ libspf2-1.2.5.dfsg.new/src/libspf2/spf_id2str.c 2007-03-23 23:13:55.000000000 +0100 |
23 | +++ libspf2-1.2.5.dfsg/src/libspf2/spf_id2str.c 2007-03-27 14:30:51.000000000 +0200 |
| 27 | @@ -309,7 +309,7 @@ |
24 | @@ -309,7 +309,7 @@ |
| 28 | p_end = *bufp + *buflenp; |
25 | p_end = *bufp + *buflenp; |
| 29 | 26 | ||
| 30 | if (debug) |
27 | if (debug) |
| 31 | - SPF_debugf("stringify: Buffer length is %d\n", *buflenp);
|
28 | - SPF_debugf("stringify: Buffer length is %d\n", *buflenp);
|
| 32 | + SPF_debugf("stringify: Buffer length is %zu\n", *buflenp);
|
29 | + SPF_debugf("stringify: Buffer length is %u\n", (unsigned int)*buflenp);
|
| 33 | 30 | ||
| 34 | 31 | ||
| 35 | /* |
32 | /* |
| 36 | diff -Nur libspf2-1.2.5.dfsg/src/libspf2/spf_print.c libspf2-1.2.5.dfsg.new/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 |
| 37 | --- libspf2-1.2.5.dfsg/src/libspf2/spf_print.c 2007-03-23 22:37:26.000000000 +0100 |
34 | --- libspf2-1.2.5.dfsg~/src/libspf2/spf_print.c 2007-03-27 14:27:58.231608763 +0200 |
| 38 | +++ libspf2-1.2.5.dfsg.new/src/libspf2/spf_print.c 2007-03-23 23:12:30.000000000 +0100 |
35 | +++ libspf2-1.2.5.dfsg/src/libspf2/spf_print.c 2007-03-27 14:47:39.000000000 +0200 |
| 39 | @@ -54,7 +54,7 @@ |
36 | @@ -54,12 +54,12 @@ |
| 40 | return SPF_E_SUCCESS; |
37 | return SPF_E_SUCCESS; |
| 41 | } |
38 | } |
| 42 | 39 | ||
| 43 | - 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", |
| 44 | + SPF_infof( "SPF header: version: %hhu mech %hhu/%zu mod %hhu/%zu len=%zu", |
41 | + SPF_infof( "SPF header: version: %d mech %d/%u mod %d/%u len=%u", |
| 45 | spf_record->version, |
42 | spf_record->version, |
| 46 | spf_record->num_mech, spf_record->mech_len, |
43 | - spf_record->num_mech, spf_record->mech_len, |
| 47 | 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 |
|
| - | 46 | - + spf_record->mod_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, |
|
| - | 49 | + (unsigned int)(sizeof(SPF_record_t) + spf_record->mech_len |
|
| - | 50 | + + spf_record->mod_len)); |
|
| - | 51 | ||
| - | 52 | err = SPF_record_stringify(spf_record, &prt_buf, &prt_len); |
|
| - | 53 | if ( err == SPF_E_RESULT_UNKNOWN ) |
|
| 48 | @@ -81,7 +81,7 @@ |
54 | @@ -81,7 +81,7 @@ |
| 49 | void SPF_print_sizeof(void) |
55 | void SPF_print_sizeof(void) |
| 50 | {
|
56 | {
|
| 51 | // 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)); |
| 52 | - SPF_infof( "sizeof(SPF_mech_t)=%u", sizeof(SPF_mech_t)); |
58 | - SPF_infof( "sizeof(SPF_mech_t)=%u", sizeof(SPF_mech_t)); |
| 53 | - SPF_infof( "sizeof(SPF_data_t)=%u", sizeof(SPF_data_t)); |
59 | - SPF_infof( "sizeof(SPF_data_t)=%u", sizeof(SPF_data_t)); |
| 54 | - SPF_infof( "sizeof(SPF_mod_t)=%u", sizeof(SPF_mod_t)); |
60 | - SPF_infof( "sizeof(SPF_mod_t)=%u", sizeof(SPF_mod_t)); |
| 55 | + SPF_infof( "sizeof(SPF_mech_t)=%zu", sizeof(SPF_mech_t)); |
61 | + SPF_infof( "sizeof(SPF_mech_t)=%u", (unsigned int)sizeof(SPF_mech_t)); |
| 56 | + SPF_infof( "sizeof(SPF_data_t)=%zu", sizeof(SPF_data_t)); |
62 | + SPF_infof( "sizeof(SPF_data_t)=%u", (unsigned int)sizeof(SPF_data_t)); |
| 57 | + SPF_infof( "sizeof(SPF_mod_t)=%zu", sizeof(SPF_mod_t)); |
63 | + SPF_infof( "sizeof(SPF_mod_t)=%u", (unsigned int)sizeof(SPF_mod_t)); |
| 58 | } |
64 | } |