interesting
/
getdns
mirror of https://github.com/getdnsapi/getdns.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

PRIsz usage like PRIu64 etc.

This commit is contained in:
Willem Toorop 2017-09-27 13:15:12 +02:00
parent 7ac289f726
commit cefeed2b47
3 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/context.c
View File

@ -2550,15 +2550,15 @@ getdns_context_set_dns_root_servers(
if (addr_bd->size == 16 && if (addr_bd->size == 16 &&
inet_ntop(AF_INET6, addr_bd->data, dst, sizeof(dst))) inet_ntop(AF_INET6, addr_bd->data, dst, sizeof(dst)))
fprintf(fh,". NS "PRIsz".root-servers.getdnsapi.net.\n" fprintf(fh,". NS %"PRIsz".root-servers.getdnsapi.net.\n"
PRIsz".root-servers.getdnsapi.net. AAAA %s\n", "%"PRIsz".root-servers.getdnsapi.net. AAAA %s\n",
i, i, dst); i, i, dst);
else if (addr_bd->size == 4 && else if (addr_bd->size == 4 &&
inet_ntop(AF_INET, addr_bd->data, dst, sizeof(dst))) inet_ntop(AF_INET, addr_bd->data, dst, sizeof(dst)))
fprintf(fh,". NS "PRIsz".root-servers.getdnsapi.net.\n" fprintf(fh,". NS %"PRIsz".root-servers.getdnsapi.net.\n"
PRIsz".root-servers.getdnsapi.net. A %s\n", "%"PRIsz".root-servers.getdnsapi.net. A %s\n",
i, i, dst); i, i, dst);
} }
fclose(fh); fclose(fh);

16
src/dnssec.c
View File

@ -602,7 +602,7 @@ static chain_head *add_rrset2val_chain(struct mem_funcs *mf,
dname_len = *labels - last_label[-1] + 1; dname_len = *labels - last_label[-1] + 1;
head_sz = (sizeof(chain_head) + dname_len + 7) / 8 * 8; head_sz = (sizeof(chain_head) + dname_len + 7) / 8 * 8;
node_count = last_label - labels - max_labels; node_count = last_label - labels - max_labels;
DEBUG_SEC( PRIsz" labels in common. "PRIsz" labels to allocate\n" DEBUG_SEC( "%"PRIsz" labels in common. %"PRIsz" labels to allocate\n"
, max_labels, node_count); , max_labels, node_count);
if (! (region = GETDNS_XMALLOC(*mf, uint8_t, head_sz + if (! (region = GETDNS_XMALLOC(*mf, uint8_t, head_sz +
@ -1424,7 +1424,7 @@ static int _getdns_verify_rrsig(struct mem_funcs *mf,
/* More space needed for val_rrset */ /* More space needed for val_rrset */
val_rrset = GETDNS_XMALLOC(*mf, _getdns_rr_iter, n_rrs); val_rrset = GETDNS_XMALLOC(*mf, _getdns_rr_iter, n_rrs);
} }
DEBUG_SEC( "sizes: "PRIsz" rrs, "PRIsz" bytes for validation buffer\n" DEBUG_SEC( "sizes: %"PRIsz" rrs, %"PRIsz" bytes for validation buffer\n"
, n_rrs, valbuf_sz); , n_rrs, valbuf_sz);
qsort(val_rrset, n_rrs, sizeof(_getdns_rr_iter), _rr_iter_rdata_cmp); qsort(val_rrset, n_rrs, sizeof(_getdns_rr_iter), _rr_iter_rdata_cmp);
@ -1481,7 +1481,7 @@ static int _getdns_verify_rrsig(struct mem_funcs *mf,
gldns_buffer_write_u16_at(&valbuf, pos, gldns_buffer_write_u16_at(&valbuf, pos,
(uint16_t)(gldns_buffer_position(&valbuf) - pos - 2)); (uint16_t)(gldns_buffer_position(&valbuf) - pos - 2));
} }
DEBUG_SEC( "written to valbuf: "PRIsz" bytes\n" DEBUG_SEC( "written to valbuf: %"PRIsz" bytes\n"
, gldns_buffer_position(&valbuf)); , gldns_buffer_position(&valbuf));
assert(gldns_buffer_position(&valbuf) <= valbuf_sz); assert(gldns_buffer_position(&valbuf) <= valbuf_sz);
@ -1903,7 +1903,7 @@ static int ds_authenticates_keys(struct mem_funcs *mf,
if (digest_buf != digest_buf_spc) if (digest_buf != digest_buf_spc)
GETDNS_FREE(*mf, digest_buf); GETDNS_FREE(*mf, digest_buf);
DEBUG_SEC("HASH length mismatch "PRIsz" != "PRIsz"\n", DEBUG_SEC("HASH length mismatch %"PRIsz" != %"PRIsz"\n",
digest_len, ds->rr_i.nxt - ds->rr_i.rr_type-14); digest_len, ds->rr_i.nxt - ds->rr_i.rr_type-14);
continue; continue;
} }
@ -1926,7 +1926,7 @@ static int ds_authenticates_keys(struct mem_funcs *mf,
max_supported_result = SIGNATURE_VERIFIED | keytag; max_supported_result = SIGNATURE_VERIFIED | keytag;
} }
} }
DEBUG_SEC("valid_dsses: "PRIsz", supported_dsses: "PRIsz"\n", DEBUG_SEC("valid_dsses: %"PRIsz", supported_dsses: %"PRIsz"\n",
valid_dsses, supported_dsses); valid_dsses, supported_dsses);
if (valid_dsses && !supported_dsses) if (valid_dsses && !supported_dsses)
return NO_SUPPORTED_ALGORITHMS; return NO_SUPPORTED_ALGORITHMS;
@ -3059,7 +3059,7 @@ static void check_chain_complete(chain_head *chain)
_getdns_rrset_iter tas_iter; _getdns_rrset_iter tas_iter;
if ((o = count_outstanding_requests(chain)) > 0) { if ((o = count_outstanding_requests(chain)) > 0) {
DEBUG_SEC(PRIsz" outstanding requests\n", o); DEBUG_SEC("%"PRIsz" outstanding requests\n", o);
return; return;
} }
DEBUG_SEC("Chain done!\n"); DEBUG_SEC("Chain done!\n");
@ -3561,7 +3561,7 @@ getdns_validate_dnssec2(getdns_list *records_to_validate,
for (i = 0; !getdns_list_get_dict(records_to_validate,i,&reply); i++) { for (i = 0; !getdns_list_get_dict(records_to_validate,i,&reply); i++) {
DEBUG_SEC("REPLY "PRIsz", r: %d\n", i, r); DEBUG_SEC("REPLY %"PRIsz", r: %d\n", i, r);
if (to_val != to_val_buf) if (to_val != to_val_buf)
GETDNS_FREE(*mf, to_val); GETDNS_FREE(*mf, to_val);
to_val_len = sizeof(to_val_buf); to_val_len = sizeof(to_val_buf);
@ -3588,7 +3588,7 @@ getdns_validate_dnssec2(getdns_list *records_to_validate,
break; break;
} }
} }
DEBUG_SEC("REPLY "PRIsz", r: %d\n", i, r); DEBUG_SEC("REPLY %"PRIsz", r: %d\n", i, r);
exit_free_to_val: exit_free_to_val:
if (to_val != to_val_buf) if (to_val != to_val_buf)

6
src/pubkey-pinning.c
View File

@ -437,14 +437,14 @@ _getdns_verify_pinset_match(const sha256_pin_t *pinset,
/* digest the cert with sha256 */ /* digest the cert with sha256 */
len = i2d_X509_PUBKEY(X509_get_X509_PUBKEY(x), NULL); len = i2d_X509_PUBKEY(X509_get_X509_PUBKEY(x), NULL);
if (len > (int)sizeof(raw)) { if (len > (int)sizeof(raw)) {
DEBUG_STUB("%s %-35s: Pubkey %d is larger than "PRIsz" octets\n", DEBUG_STUB("%s %-35s: Pubkey %d is larger than %"PRIsz" octets\n",
STUB_DEBUG_SETUP_TLS, __FUNC__, i, sizeof(raw)); STUB_DEBUG_SETUP_TLS, __FUNC__, i, sizeof(raw));
continue; continue;
} }
next = raw; next = raw;
i2d_X509_PUBKEY(X509_get_X509_PUBKEY(x), &next); i2d_X509_PUBKEY(X509_get_X509_PUBKEY(x), &next);
if (next - raw != len) { if (next - raw != len) {
DEBUG_STUB("%s %-35s: Pubkey %d claimed it needed %d octets, really needed "PRIsz"\n", DEBUG_STUB("%s %-35s: Pubkey %d claimed it needed %d octets, really needed %"PRIsz"\n",
STUB_DEBUG_SETUP_TLS, __FUNC__, i, len, next - raw); STUB_DEBUG_SETUP_TLS, __FUNC__, i, len, next - raw);
continue; continue;
} }
@ -453,7 +453,7 @@ _getdns_verify_pinset_match(const sha256_pin_t *pinset,
/* compare it */ /* compare it */
for (p = pinset; p; p = p->next) for (p = pinset; p; p = p->next)
if (0 == memcmp(buf, p->pin, sizeof(p->pin))) { if (0 == memcmp(buf, p->pin, sizeof(p->pin))) {
DEBUG_STUB("%s %-35s: Pubkey %d matched pin %p ("PRIsz")\n", DEBUG_STUB("%s %-35s: Pubkey %d matched pin %p (%"PRIsz")\n",
STUB_DEBUG_SETUP_TLS, __FUNC__, i, (void*)p, sizeof(p->pin)); STUB_DEBUG_SETUP_TLS, __FUNC__, i, (void*)p, sizeof(p->pin));
return GETDNS_RETURN_GOOD; return GETDNS_RETURN_GOOD;
} else } else