Skip to content

Commit 0194413

Browse files
author
Jamie C. Driver
committed
consistency wally: namespace prefix jade wrappers of wally free calls
As per 3cd0745
1 parent 0ba5ed1 commit 0194413

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

main/process.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -232,11 +232,11 @@ void cleanup_jade_process(jade_process_t* process)
232232

233233
// On-exit handlers - register functions to be called when process is freed
234234

235-
static void wally_free_string_wrapper(void* str) { JADE_WALLY_VERIFY(wally_free_string((char*)str)); }
235+
static void jade_wally_free_string_wrapper(void* str) { JADE_WALLY_VERIFY(wally_free_string((char*)str)); }
236236

237237
void jade_process_wally_free_string_on_exit(jade_process_t* process, char* str)
238238
{
239-
jade_process_call_on_exit(process, wally_free_string_wrapper, str);
239+
jade_process_call_on_exit(process, jade_wally_free_string_wrapper, str);
240240
}
241241

242242
void jade_process_free_on_exit(jade_process_t* process, void* param)

main/process/sign_psbt.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ bool show_btc_transaction_outputs_activity(
3131
bool show_btc_fee_confirmation_activity(const struct wally_tx* tx, const output_info_t* outinfo,
3232
script_flavour_t aggregate_inputs_scripts_flavour, uint64_t input_amount, uint64_t output_amount);
3333

34-
static void wally_free_psbt_wrapper(void* psbt) { JADE_WALLY_VERIFY(wally_psbt_free((struct wally_psbt*)psbt)); }
34+
static void jade_wally_free_psbt_wrapper(void* psbt) { JADE_WALLY_VERIFY(wally_psbt_free((struct wally_psbt*)psbt)); }
3535

3636
// From https://github.com/bitcoin/bips/blob/master/bip-0174.mediawiki
3737
static const uint8_t PSBT_MAGIC_PREFIX[5] = { 0x70, 0x73, 0x62, 0x74, 0xFF }; // 'psbt' + 0xff
@@ -968,7 +968,7 @@ void sign_psbt_process(void* process_ptr)
968968
jade_process_reject_message(process, CBOR_RPC_BAD_PARAMETERS, "Failed to extract psbt from passed bytes", NULL);
969969
goto cleanup;
970970
}
971-
jade_process_call_on_exit(process, wally_free_psbt_wrapper, psbt);
971+
jade_process_call_on_exit(process, jade_wally_free_psbt_wrapper, psbt);
972972

973973
// Sign the psbt - parameter updated with any signatures
974974
const char* errmsg = NULL;

0 commit comments

Comments
 (0)