diff --git a/src/block.c b/src/block.c index b1b780727..b1044a9da 100644 --- a/src/block.c +++ b/src/block.c @@ -247,9 +247,9 @@ void print_transaction(dogecoin_tx* x) { // parse inputs: unsigned int i = 0; for (; i < x->vin->len; i++) { - printf("block->parent_coinbase->tx_in->i: %d\n", i); + printf("block->parent_coinbase->tx_in->i: %u\n", i); dogecoin_tx_in* tx_in = vector_idx(x->vin, i); - printf("block->parent_coinbase->vin->prevout.n: %d\n", tx_in->prevout.n); + printf("block->parent_coinbase->vin->prevout.n: %" PRIu32 "\n", tx_in->prevout.n); char* hex_utxo_txid = utils_uint8_to_hex(tx_in->prevout.hash, sizeof tx_in->prevout.hash); printf("block->parent_coinbase->tx_in->prevout.hash: %s\n", hex_utxo_txid); char* script_sig = utils_uint8_to_hex((const uint8_t*)tx_in->script_sig->str, tx_in->script_sig->len); @@ -261,12 +261,12 @@ void print_transaction(dogecoin_tx* x) { // parse outputs: i = 0; for (; i < x->vout->len; i++) { - printf("block->parent_coinbase->tx_out->i: %d\n", i); + printf("block->parent_coinbase->tx_out->i: %u\n", i); dogecoin_tx_out* tx_out = vector_idx(x->vout, i); printf("block->parent_coinbase->tx_out->script_pubkey: %s\n", utils_uint8_to_hex((const uint8_t*)tx_out->script_pubkey->str, tx_out->script_pubkey->len)); printf("block->parent_coinbase->tx_out->value: %" PRId64 "\n", tx_out->value); } - printf("block->parent_coinbase->locktime: %d\n", x->locktime); + printf("block->parent_coinbase->locktime: %" PRIu32 "\n", x->locktime); cstr_free(tx, true); } @@ -287,14 +287,14 @@ void print_parent_header(dogecoin_auxpow_block* block) { printf("block->parent_coinbase_merkle[%zu]: " "%s\n", j, hash_to_string((uint8_t*)block->parent_coinbase_merkle[j])); } - printf("block->parent_merkle_index: %d\n", block->parent_merkle_index); + printf("block->parent_merkle_index: %" PRIu32 "\n", block->parent_merkle_index); printf("block->aux_merkle_count: %d\n", block->aux_merkle_count); j = 0; for (; j < block->aux_merkle_count; j++) { printf("block->aux_merkle_branch[%zu]: " "%s\n", j, hash_to_string((uint8_t*)block->aux_merkle_branch[j])); } - printf("block->aux_merkle_index: %d\n", block->aux_merkle_index); + printf("block->aux_merkle_index: %" PRIu32 "\n", block->aux_merkle_index); printf("block->parent_header->version: %i\n", block->parent_header->version); printf("block->parent_header->prev_block: %s\n", hash_to_string(block->parent_header->prev_block)); printf("block->parent_header->merkle_root: %s\n", hash_to_string(block->parent_header->merkle_root)); diff --git a/src/cli/spvnode.c b/src/cli/spvnode.c index 1d17a1659..58650b15f 100644 --- a/src/cli/spvnode.c +++ b/src/cli/spvnode.c @@ -275,7 +275,7 @@ dogecoin_bool spv_header_message_processed(struct dogecoin_spv_client_* client, UNUSED(node); if (newtip) { time_t timestamp = client->headers_db->getchaintip(client->headers_db_ctx)->header.timestamp; - printf("New headers tip height %d from %s\n", newtip->height, ctime(×tamp)); + printf("New headers tip height %" PRIu32 " from %s\n", newtip->height, ctime(×tamp)); } return true; } diff --git a/src/cli/such.c b/src/cli/such.c index b48995251..5f2108aca 100644 --- a/src/cli/such.c +++ b/src/cli/such.c @@ -27,6 +27,7 @@ */ +#include #include #include #ifndef _MSC_VER @@ -1604,7 +1605,7 @@ int main(int argc, char* argv[]) enum dogecoin_tx_out_type type = dogecoin_script_classify(script, NULL); printf("script: %s\n", scripthex); printf("script-type: %s\n", dogecoin_tx_out_type_to_str(type)); - printf("inputindex: %d\n", inputindex); + printf("inputindex: %" PRIu32 "\n", inputindex); printf("sighashtype: %d\n", sighashtype); printf("hash: %s\n", hex); @@ -2347,7 +2348,7 @@ int main(int argc, char* argv[]) return showError("Failed to generate wif address from mnemonic\n"); } - printf("Address %d: %s\n", inputindex, hd_pubkey_address); + printf("Address %" PRIu32 ": %s\n", inputindex, hd_pubkey_address); } /* clear and free passphrase */ diff --git a/src/cli/tool.c b/src/cli/tool.c index a8ad4319e..8579cb052 100644 --- a/src/cli/tool.c +++ b/src/cli/tool.c @@ -22,6 +22,7 @@ OTHER DEALINGS IN THE SOFTWARE. */ +#include #include #ifdef HAVE_CONFIG_H # include "libdogecoin-config.h" @@ -184,7 +185,7 @@ dogecoin_bool hd_print_node(const dogecoin_chainparams* chain, const char* nodes if (dogecoin_hdnode_has_privkey(&node)) { printf("privatekey WIF: %s\n", privkey_wif); } - printf("depth: %d\n", node.depth); + printf("depth: %" PRIu32 "\n", node.depth); printf("child index: %u\n", node.child_num); char addr[34 + 1]; addresses_from_pubkey(&dogecoin_chainparams_main, str, addr); diff --git a/src/headersdb_file.c b/src/headersdb_file.c index a851c413c..2014dd223 100644 --- a/src/headersdb_file.c +++ b/src/headersdb_file.c @@ -26,6 +26,7 @@ */ +#include #include #include @@ -255,7 +256,7 @@ dogecoin_bool dogecoin_headers_db_load(dogecoin_headers_db* db, const char *file dogecoin_blockindex *pindex = dogecoin_headers_db_connect_hdr(db, &cbuf_all, true, &connected); if (!connected) { - printf("\nConnecting header %s failed (at height: %d) read_write: %d\n", hash_to_string(hash), db->chaintip->height, db->read_write_file); + printf("\nConnecting header %s failed (at height: %" PRIu32 ") read_write: %d\n", hash_to_string(hash), db->chaintip->height, db->read_write_file); dogecoin_free(pindex); } else { @@ -266,7 +267,7 @@ dogecoin_bool dogecoin_headers_db_load(dogecoin_headers_db* db, const char *file } } } - printf("\nConnected %ld headers, now at height: %d\n", connected_headers_count, db->chaintip->height); + printf("\nConnected %ld headers, now at height: %" PRIu32 "\n", connected_headers_count, db->chaintip->height); return (db->headers_tree_file != NULL); } @@ -412,7 +413,7 @@ dogecoin_blockindex * dogecoin_headers_db_connect_hdr(dogecoin_headers_db* db, s current_block = prev_block; } - printf("\nChain reorganization: %d blocks disconnected, %d blocks connected\n", blockindex->height - common_ancestor->height, blockindex->height - db->chaintip->height); + printf("\nChain reorganization: %" PRIu32 " blocks disconnected, %" PRIu32 " blocks connected\n", blockindex->height - common_ancestor->height, blockindex->height - db->chaintip->height); // Set the new block as the new chain tip db->chaintip = blockindex; diff --git a/src/spv.c b/src/spv.c index ffab9d4a9..3944a818c 100644 --- a/src/spv.c +++ b/src/spv.c @@ -27,6 +27,7 @@ */ #ifdef _WIN32 +#include #include #include #include @@ -1102,7 +1103,7 @@ void dogecoin_net_spv_post_cmd(dogecoin_node *node, dogecoin_p2p_msg_hdr *hdr, s strftime(s, sizeof s, "%F %T", p); char *ctime_no_newline; ctime_no_newline = strtok(s, "\n"); - printf("%s|%d|%s|%d\n", hash_to_string(pindex->hash), pindex->height, ctime_no_newline, hdr->data_len); + printf("%s|%" PRIu32 "|%s|%" PRIu32 "\n", hash_to_string(pindex->hash), pindex->height, ctime_no_newline, hdr->data_len); uint64_t start = time(NULL); uint32_t amount_of_txs; diff --git a/src/validation.c b/src/validation.c index 56f30b860..8154aef13 100644 --- a/src/validation.c +++ b/src/validation.c @@ -28,6 +28,7 @@ */ +#include #include #include @@ -71,7 +72,7 @@ dogecoin_bool check_auxpow(dogecoin_auxpow_block* block, dogecoin_chainparams* p where the height is known. */ if (!is_legacy(block->header->version) && params->strict_id && get_chainid(block->header->version) != params->auxpow_id) { printf("%s:%d:%s : block does not have our chain ID" - " (got %d, expected %d, full nVersion %d) : %s\n", + " (got %" PRIu32 ", expected %u, full nVersion %" PRIu32 ") : %s\n", __FILE__, __LINE__, __func__, get_chainid(block->header->version), params->auxpow_id, block->header->version, strerror(errno)); return false; diff --git a/src/wallet.c b/src/wallet.c index 6c567d3f2..e5461867f 100644 --- a/src/wallet.c +++ b/src/wallet.c @@ -2137,7 +2137,7 @@ uint8_t* dogecoin_get_utxos(char* address) { if (strncmp(utxo->address, address, strlen(utxo->address))==0 && !is_spent(utxo)) { int utxo_index_length = integer_length(i); char* utxo_index_hex = dogecoin_char_vla(utxo_index_length+1); - sprintf(utxo_index_hex, "%d", i); + sprintf(utxo_index_hex, "%u", i); // index concat_str = concat(concat_str, utxo_index_hex); char* txid_hex = utils_uint8_to_hex(utxo->txid, 32);