davide/palladum-lightning
1
0
Fork 0
Code Issues Pull Requests Actions 5 Packages Projects Releases Wiki Activity

ccan: update to get improved grab_file API, and adapt code.

Browse Source 
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
This commit is contained in:
Rusty Russell
2025-10-24 13:57:51 +10:30
parent b676171f86
commit 42f9361375
39 changed files with 180 additions and 114 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
devtools/checkchannels.c
View File

@@ -144,7 +144,7 @@ int main(int argc, char *argv[])
errx(1, "failed to open database %s: %s", dbfile,
sqlite3_errstr(dberr));
hsm_secret = grab_file(hsmfile, hsmfile);
hsm_secret = grab_file_raw(hsmfile, hsmfile);
if (!hsm_secret)
err(1, "failed to read %s", hsmfile);

2
devtools/decodemsg.c
View File

@@ -83,7 +83,7 @@ int main(int argc, char *argv[])
ok &= printwire(m);
}
} else {
u8 *f = grab_fd(NULL, STDIN_FILENO);
u8 *f = grab_fd_str(NULL, STDIN_FILENO);
size_t off = 0;
while (off != tal_count(f)) {

4
devtools/onion.c
View File

@@ -141,7 +141,7 @@ static void do_decode(int argc, char **argv, const u8 *assocdata)
opt_usage_exit_fail("Expect an filename and privkey with 'decode' method");
/* "-" means stdin, which is NULL for grab_file */
char *hextemp = grab_file(ctx, streq(argv[2], "-") ? NULL : argv[2]);
char *hextemp = grab_file_str(ctx, streq(argv[2], "-") ? NULL : argv[2]);
size_t hexlen = strlen(hextemp);
// trim trailing whitespace
@@ -193,7 +193,7 @@ static char *opt_set_node_id(const char *arg, struct node_id *node_id)
static void runtest(const char *filename)
{
const tal_t *ctx = tal(NULL, u8);
char *buffer = grab_file(ctx, filename);
char *buffer = grab_file_str(ctx, filename);
const jsmntok_t *toks, *session_key_tok, *associated_data_tok, *gentok,
*hopstok, *hop, *payloadtok, *pubkeytok, *typetok, *oniontok, *decodetok;
const u8 *associated_data, *session_key_raw, *payload, *serialized, *onion;