Skip to content

Commit 9221f30

Browse files
committed
common/bolt11: fix 32-bit compilation.
Fixes d9fed06: ``` common/bolt11.c:868:31: error: format specifies type 'size_t' (aka 'unsigned long') but the argument has type 'u64' (aka 'unsigned long long') [-Werror,-Wformat] bech32_charset[type], field_len); ^~~~~~~~~ ``` Signed-off-by: Rusty Russell <[email protected]>
1 parent 2dec805 commit 9221f30

File tree

1 file changed

+15
-15
lines changed

1 file changed

+15
-15
lines changed

common/bolt11.c

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ static struct bolt11 *decode_fail(struct bolt11 *b11, char **fail,
138138
*/
139139
static const char *unknown_field(struct bolt11 *b11,
140140
struct hash_u5 *hu5,
141-
const u5 **data, size_t *field_len,
141+
const u5 **data, u64 *field_len,
142142
u5 type)
143143
{
144144
struct bolt11_field *extra = tal(b11, struct bolt11_field);
@@ -157,7 +157,7 @@ static const char *unknown_field(struct bolt11 *b11,
157157
* Otherwise copy into dst without padding, set have_flag if non-NULL. */
158158
static const char *pull_expected_length(struct bolt11 *b11,
159159
struct hash_u5 *hu5,
160-
const u5 **data, size_t *field_len,
160+
const u5 **data, u64 *field_len,
161161
size_t expected_length,
162162
u5 type,
163163
bool *have_flag,
@@ -179,7 +179,7 @@ static const char *pull_expected_length(struct bolt11 *b11,
179179
static const char *decode_p(struct bolt11 *b11,
180180
const struct feature_set *our_features,
181181
struct hash_u5 *hu5,
182-
const u5 **data, size_t *field_len,
182+
const u5 **data, u64 *field_len,
183183
bool *have_p)
184184
{
185185
/* BOLT #11:
@@ -207,7 +207,7 @@ static const char *decode_p(struct bolt11 *b11,
207207
static const char *decode_d(struct bolt11 *b11,
208208
const struct feature_set *our_features,
209209
struct hash_u5 *hu5,
210-
const u5 **data, size_t *field_len,
210+
const u5 **data, u64 *field_len,
211211
bool *have_d)
212212
{
213213
u8 *desc;
@@ -236,7 +236,7 @@ static const char *decode_d(struct bolt11 *b11,
236236
static const char *decode_h(struct bolt11 *b11,
237237
const struct feature_set *our_features,
238238
struct hash_u5 *hu5,
239-
const u5 **data, size_t *field_len,
239+
const u5 **data, u64 *field_len,
240240
bool *have_h)
241241
{
242242
const char *err;
@@ -266,7 +266,7 @@ static const char *decode_h(struct bolt11 *b11,
266266
static const char *decode_x(struct bolt11 *b11,
267267
const struct feature_set *our_features,
268268
struct hash_u5 *hu5,
269-
const u5 **data, size_t *field_len,
269+
const u5 **data, u64 *field_len,
270270
bool *have_x)
271271
{
272272
const char *err;
@@ -290,7 +290,7 @@ static const char *decode_x(struct bolt11 *b11,
290290
static const char *decode_c(struct bolt11 *b11,
291291
const struct feature_set *our_features,
292292
struct hash_u5 *hu5,
293-
const u5 **data, size_t *field_len,
293+
const u5 **data, u64 *field_len,
294294
bool *have_c)
295295
{
296296
u64 c;
@@ -314,7 +314,7 @@ static const char *decode_c(struct bolt11 *b11,
314314
static const char *decode_n(struct bolt11 *b11,
315315
const struct feature_set *our_features,
316316
struct hash_u5 *hu5,
317-
const u5 **data, size_t *field_len,
317+
const u5 **data, u64 *field_len,
318318
bool *have_n)
319319
{
320320
assert(!*have_n);
@@ -335,7 +335,7 @@ static const char *decode_n(struct bolt11 *b11,
335335
static const char *decode_s(struct bolt11 *b11,
336336
const struct feature_set *our_features,
337337
struct hash_u5 *hu5,
338-
const u5 **data, size_t *field_len,
338+
const u5 **data, u64 *field_len,
339339
bool *have_s)
340340
{
341341
const char *err;
@@ -364,7 +364,7 @@ static const char *decode_s(struct bolt11 *b11,
364364
static const char *decode_f(struct bolt11 *b11,
365365
const struct feature_set *our_features,
366366
struct hash_u5 *hu5,
367-
const u5 **data, size_t *field_len,
367+
const u5 **data, u64 *field_len,
368368
bool *have_f)
369369
{
370370
u64 version;
@@ -466,7 +466,7 @@ static void towire_route_info(u8 **pptr, const struct route_info *route_info)
466466
static const char *decode_r(struct bolt11 *b11,
467467
const struct feature_set *our_features,
468468
struct hash_u5 *hu5,
469-
const u5 **data, size_t *field_len,
469+
const u5 **data, u64 *field_len,
470470
bool *have_r)
471471
{
472472
const u8 *r8;
@@ -518,7 +518,7 @@ static void shift_bitmap_down(u8 *bitmap, size_t bits)
518518
static const char *decode_9(struct bolt11 *b11,
519519
const struct feature_set *our_features,
520520
struct hash_u5 *hu5,
521-
const u5 **data, size_t *field_len,
521+
const u5 **data, u64 *field_len,
522522
bool *have_9)
523523
{
524524
size_t flen = (*field_len * 5 + 7) / 8;
@@ -565,7 +565,7 @@ static const char *decode_9(struct bolt11 *b11,
565565
static const char *decode_m(struct bolt11 *b11,
566566
const struct feature_set *our_features,
567567
struct hash_u5 *hu5,
568-
const u5 **data, size_t *field_len,
568+
const u5 **data, u64 *field_len,
569569
bool *have_m)
570570
{
571571
const char *err;
@@ -617,7 +617,7 @@ struct decoder {
617617
const char *(*decode)(struct bolt11 *b11,
618618
const struct feature_set *our_features,
619619
struct hash_u5 *hu5,
620-
const u5 **data, size_t *field_len,
620+
const u5 **data, u64 *field_len,
621621
bool *have_field);
622622
};
623623

@@ -864,7 +864,7 @@ struct bolt11 *bolt11_decode_nosig(const tal_t *ctx, const char *str,
864864
if (problem)
865865
return decode_fail(b11, fail, "%s", problem);
866866
if (field_len)
867-
return decode_fail(b11, fail, "%c: extra %zu bytes",
867+
return decode_fail(b11, fail, "%c: extra %"PRIu64" bytes",
868868
bech32_charset[type], field_len);
869869
}
870870

0 commit comments

Comments
 (0)