@@ -138,7 +138,7 @@ static struct bolt11 *decode_fail(struct bolt11 *b11, char **fail,
138
138
*/
139
139
static const char * unknown_field (struct bolt11 * b11 ,
140
140
struct hash_u5 * hu5 ,
141
- const u5 * * data , size_t * field_len ,
141
+ const u5 * * data , u64 * field_len ,
142
142
u5 type )
143
143
{
144
144
struct bolt11_field * extra = tal (b11 , struct bolt11_field );
@@ -157,7 +157,7 @@ static const char *unknown_field(struct bolt11 *b11,
157
157
* Otherwise copy into dst without padding, set have_flag if non-NULL. */
158
158
static const char * pull_expected_length (struct bolt11 * b11 ,
159
159
struct hash_u5 * hu5 ,
160
- const u5 * * data , size_t * field_len ,
160
+ const u5 * * data , u64 * field_len ,
161
161
size_t expected_length ,
162
162
u5 type ,
163
163
bool * have_flag ,
@@ -179,7 +179,7 @@ static const char *pull_expected_length(struct bolt11 *b11,
179
179
static const char * decode_p (struct bolt11 * b11 ,
180
180
const struct feature_set * our_features ,
181
181
struct hash_u5 * hu5 ,
182
- const u5 * * data , size_t * field_len ,
182
+ const u5 * * data , u64 * field_len ,
183
183
bool * have_p )
184
184
{
185
185
/* BOLT #11:
@@ -207,7 +207,7 @@ static const char *decode_p(struct bolt11 *b11,
207
207
static const char * decode_d (struct bolt11 * b11 ,
208
208
const struct feature_set * our_features ,
209
209
struct hash_u5 * hu5 ,
210
- const u5 * * data , size_t * field_len ,
210
+ const u5 * * data , u64 * field_len ,
211
211
bool * have_d )
212
212
{
213
213
u8 * desc ;
@@ -236,7 +236,7 @@ static const char *decode_d(struct bolt11 *b11,
236
236
static const char * decode_h (struct bolt11 * b11 ,
237
237
const struct feature_set * our_features ,
238
238
struct hash_u5 * hu5 ,
239
- const u5 * * data , size_t * field_len ,
239
+ const u5 * * data , u64 * field_len ,
240
240
bool * have_h )
241
241
{
242
242
const char * err ;
@@ -266,7 +266,7 @@ static const char *decode_h(struct bolt11 *b11,
266
266
static const char * decode_x (struct bolt11 * b11 ,
267
267
const struct feature_set * our_features ,
268
268
struct hash_u5 * hu5 ,
269
- const u5 * * data , size_t * field_len ,
269
+ const u5 * * data , u64 * field_len ,
270
270
bool * have_x )
271
271
{
272
272
const char * err ;
@@ -290,7 +290,7 @@ static const char *decode_x(struct bolt11 *b11,
290
290
static const char * decode_c (struct bolt11 * b11 ,
291
291
const struct feature_set * our_features ,
292
292
struct hash_u5 * hu5 ,
293
- const u5 * * data , size_t * field_len ,
293
+ const u5 * * data , u64 * field_len ,
294
294
bool * have_c )
295
295
{
296
296
u64 c ;
@@ -314,7 +314,7 @@ static const char *decode_c(struct bolt11 *b11,
314
314
static const char * decode_n (struct bolt11 * b11 ,
315
315
const struct feature_set * our_features ,
316
316
struct hash_u5 * hu5 ,
317
- const u5 * * data , size_t * field_len ,
317
+ const u5 * * data , u64 * field_len ,
318
318
bool * have_n )
319
319
{
320
320
assert (!* have_n );
@@ -335,7 +335,7 @@ static const char *decode_n(struct bolt11 *b11,
335
335
static const char * decode_s (struct bolt11 * b11 ,
336
336
const struct feature_set * our_features ,
337
337
struct hash_u5 * hu5 ,
338
- const u5 * * data , size_t * field_len ,
338
+ const u5 * * data , u64 * field_len ,
339
339
bool * have_s )
340
340
{
341
341
const char * err ;
@@ -364,7 +364,7 @@ static const char *decode_s(struct bolt11 *b11,
364
364
static const char * decode_f (struct bolt11 * b11 ,
365
365
const struct feature_set * our_features ,
366
366
struct hash_u5 * hu5 ,
367
- const u5 * * data , size_t * field_len ,
367
+ const u5 * * data , u64 * field_len ,
368
368
bool * have_f )
369
369
{
370
370
u64 version ;
@@ -466,7 +466,7 @@ static void towire_route_info(u8 **pptr, const struct route_info *route_info)
466
466
static const char * decode_r (struct bolt11 * b11 ,
467
467
const struct feature_set * our_features ,
468
468
struct hash_u5 * hu5 ,
469
- const u5 * * data , size_t * field_len ,
469
+ const u5 * * data , u64 * field_len ,
470
470
bool * have_r )
471
471
{
472
472
const u8 * r8 ;
@@ -518,7 +518,7 @@ static void shift_bitmap_down(u8 *bitmap, size_t bits)
518
518
static const char * decode_9 (struct bolt11 * b11 ,
519
519
const struct feature_set * our_features ,
520
520
struct hash_u5 * hu5 ,
521
- const u5 * * data , size_t * field_len ,
521
+ const u5 * * data , u64 * field_len ,
522
522
bool * have_9 )
523
523
{
524
524
size_t flen = (* field_len * 5 + 7 ) / 8 ;
@@ -565,7 +565,7 @@ static const char *decode_9(struct bolt11 *b11,
565
565
static const char * decode_m (struct bolt11 * b11 ,
566
566
const struct feature_set * our_features ,
567
567
struct hash_u5 * hu5 ,
568
- const u5 * * data , size_t * field_len ,
568
+ const u5 * * data , u64 * field_len ,
569
569
bool * have_m )
570
570
{
571
571
const char * err ;
@@ -617,7 +617,7 @@ struct decoder {
617
617
const char * (* decode )(struct bolt11 * b11 ,
618
618
const struct feature_set * our_features ,
619
619
struct hash_u5 * hu5 ,
620
- const u5 * * data , size_t * field_len ,
620
+ const u5 * * data , u64 * field_len ,
621
621
bool * have_field );
622
622
};
623
623
@@ -864,7 +864,7 @@ struct bolt11 *bolt11_decode_nosig(const tal_t *ctx, const char *str,
864
864
if (problem )
865
865
return decode_fail (b11 , fail , "%s" , problem );
866
866
if (field_len )
867
- return decode_fail (b11 , fail , "%c: extra %zu bytes" ,
867
+ return decode_fail (b11 , fail , "%c: extra %" PRIu64 " bytes" ,
868
868
bech32_charset [type ], field_len );
869
869
}
870
870
0 commit comments