Skip to content

Commit 25e7654

Browse files
bandi13bandi13
authored
Merge pull request #65 from douzzer/20240201-LLVM-19-cleanups
20240201-LLVM-19-cleanups
2 parents 196ccef + 66dd939 commit 25e7654

File tree

10 files changed

+44
-51
lines changed

10 files changed

+44
-51
lines changed

‎Makefile.analyzers

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ endif
3333
# lock in the expected major versions of LLVM/clang/compiler-rt-sanitizers, in
3434
# order of preference:
3535
ifndef CLANG_PATH
36-
CLANG_PATH:=/usr/lib/llvm/18/bin:/usr/lib/llvm-18:/usr/lib/llvm/17/bin:/usr/lib/llvm-17:/usr/lib/llvm/16/bin:/usr/lib/llvm-16:/usr/lib/llvm/15/bin:/usr/lib/llvm-15:/usr/lib/llvm/14/bin:/usr/lib/llvm-14:/opt/homebrew/opt/llvm/bin
36+
CLANG_PATH:=/usr/lib/llvm/19/bin:/usr/lib/llvm/18/bin:/usr/lib/llvm-18:/usr/lib/llvm/17/bin:/usr/lib/llvm-17:/usr/lib/llvm/16/bin:/usr/lib/llvm-16:/usr/lib/llvm/15/bin:/usr/lib/llvm-15:/usr/lib/llvm/14/bin:/usr/lib/llvm-14:/opt/homebrew/opt/llvm/bin
3737
endif
3838

3939
valgrind-all-clang: PATH:=$(CLANG_PATH):$(PATH)
@@ -227,7 +227,7 @@ clang-tidy-build-test:
227227
command -v clang-tidy 1>/dev/null || { echo 'clang-tidy not found -- skipping $@.'; exit 0; }; \
228228
CLANG=clang CLANG_TIDY=clang-tidy CLANG_TIDY_EXTRA_ARGS='--use-color=1' $(MAKE) $(EXTRA_MAKE_FLAGS) $(QUIET_FLAG) -f $(THIS_MAKEFILE) VERY_QUIET=1 BUILD_TOP="$(BUILD_PARENT)/wolfsentry-clang-tidy-builds" CC="$(REPO_ROOT)/../testing/git-hooks/clang-tidy-builder.sh" clean; \
229229
. $(REPO_ROOT)/scripts/analyzer-config.sh && \
230-
CLANG=clang CLANG_TIDY=clang-tidy CLANG_TIDY_EXTRA_ARGS='--use-color=1' $(MAKE) $(EXTRA_MAKE_FLAGS) $(QUIET_FLAG) -f $(THIS_MAKEFILE) VERY_QUIET=1 BUILD_TOP="$(BUILD_PARENT)/wolfsentry-clang-tidy-builds" CC="$(REPO_ROOT)/../testing/git-hooks/clang-tidy-builder.sh" test && \
230+
CLANG=clang CLANG_TIDY=clang-tidy CLANG_TIDY_EXTRA_ARGS='--use-color=1' $(MAKE) $(EXTRA_MAKE_FLAGS) $(QUIET_FLAG) -f $(THIS_MAKEFILE) VERY_QUIET=1 BUILD_TOP="$(BUILD_PARENT)/wolfsentry-clang-tidy-builds" CC="$(REPO_ROOT)/../testing/git-hooks/clang-tidy-builder.sh" EXTRA_CFLAGS='-Wunreachable-code-aggressive -Wthread-safety -Wloop-analysis -Wenum-compare-conditional -fcolor-diagnostics -fcomplete-member-pointers -Wheader-hygiene -Wstring-conversion -Wtautological-overlap-compare' test && \
231231
CLANG=clang CLANG_TIDY=clang-tidy CLANG_TIDY_EXTRA_ARGS='--use-color=1' $(MAKE) $(EXTRA_MAKE_FLAGS) $(QUIET_FLAG) -f $(THIS_MAKEFILE) VERY_QUIET=1 BUILD_TOP="$(BUILD_PARENT)/wolfsentry-clang-tidy-builds" CC="$(REPO_ROOT)/../testing/git-hooks/clang-tidy-builder.sh" clean && \
232232
echo 'passed: $@.'
233233

‎src/addr_families.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -323,7 +323,7 @@ WOLFSENTRY_LOCAL wolfsentry_errcode_t wolfsentry_addr_family_clone(
323323
if ((*new_bynumber = (struct wolfsentry_addr_family_bynumber *)WOLFSENTRY_MALLOC_1(dest_context->hpi.allocator, sizeof **new_bynumber)) == NULL)
324324
WOLFSENTRY_ERROR_RETURN(SYS_RESOURCE_FAILED);
325325
if ((*new_byname = (struct wolfsentry_addr_family_byname *)WOLFSENTRY_MALLOC_1(dest_context->hpi.allocator, byname_size)) == NULL) {
326-
(void)WOLFSENTRY_FREE_1(dest_context->hpi.allocator, new_byname);
326+
(void)WOLFSENTRY_FREE_1(dest_context->hpi.allocator, (void *)new_byname);
327327
WOLFSENTRY_ERROR_RETURN(SYS_RESOURCE_FAILED);
328328
}
329329
memcpy(*new_bynumber, src_bynumber, sizeof **new_bynumber);
@@ -501,7 +501,7 @@ WOLFSENTRY_API wolfsentry_errcode_t wolfsentry_addr_family_pton(
501501
WOLFSENTRY_CONTEXT_ARGS_OUT,
502502
wolfsentry->addr_families_byname,
503503
family_name,
504-
(int)family_name_len,
504+
family_name_len,
505505
&addr_family);
506506
WOLFSENTRY_UNLOCK_FOR_RETURN();
507507
if (ret >= 0) {

‎src/json/centijson_dom.c

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -270,7 +270,7 @@ json_dom_process(JSON_TYPE type, const unsigned char* data, size_t data_size, vo
270270

271271
if(new_path_alloc == 0)
272272
new_path_alloc = 32;
273-
new_path = (JSON_VALUE**) realloc(dom_parser->path, new_path_alloc * sizeof(JSON_VALUE*));
273+
new_path = (JSON_VALUE**) realloc((void *)dom_parser->path, new_path_alloc * sizeof(JSON_VALUE*));
274274
if(new_path == NULL)
275275
return JSON_ERR_OUTOFMEMORY;
276276

@@ -360,7 +360,7 @@ int json_dom_clean(JSON_DOM_PARSER* dom_parser) {
360360
if (ret < 0)
361361
return ret;
362362

363-
free(dom_parser->path);
363+
free((void *)dom_parser->path);
364364
dom_parser->path = NULL;
365365

366366
dom_parser->flags &= ~JSON_DOM_FLAG_INITED;
@@ -605,9 +605,9 @@ json_dom_dump_helper(
605605
if(n > 0) {
606606
size_t keys_size;
607607
#ifdef WOLFSENTRY
608-
keys = json_malloc(WOLFSENTRY_CONTEXT_ARGS_OUT_EX(allocator), sizeof(JSON_VALUE*) * n);
608+
keys = (const JSON_VALUE**)json_malloc(WOLFSENTRY_CONTEXT_ARGS_OUT_EX(allocator), sizeof(JSON_VALUE*) * n);
609609
#else
610-
keys = malloc(sizeof(JSON_VALUE*) * n);
610+
keys = (const JSON_VALUE**)malloc(sizeof(JSON_VALUE*) * n);
611611
#endif
612612
if(keys == NULL)
613613
return JSON_ERR_OUTOFMEMORY;
@@ -658,9 +658,9 @@ json_dom_dump_helper(
658658
}
659659

660660
#ifdef WOLFSENTRY
661-
json_free(WOLFSENTRY_CONTEXT_ARGS_OUT_EX(allocator), keys);
661+
json_free(WOLFSENTRY_CONTEXT_ARGS_OUT_EX(allocator), (void *)keys);
662662
#else
663-
free(keys);
663+
free((void *)keys);
664664
#endif
665665
if(ret < 0)
666666
return ret;

‎src/json/centijson_sax.c

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -536,12 +536,12 @@ json_string_automaton(JSON_PARSER* parser, const unsigned char* input, size_t si
536536
size_t off = 0;
537537

538538
if(type == JSON_KEY) {
539-
ignore_ill_utf8 = (parser->config.flags & JSON_IGNOREILLUTF8KEY);
540-
fix_ill_utf8 = (parser->config.flags & JSON_FIXILLUTF8KEY);
539+
ignore_ill_utf8 = ((parser->config.flags & JSON_IGNOREILLUTF8KEY) != 0);
540+
fix_ill_utf8 = ((parser->config.flags & JSON_FIXILLUTF8KEY) != 0);
541541
max_len = parser->config.max_key_len;
542542
} else {
543-
ignore_ill_utf8 = (parser->config.flags & JSON_IGNOREILLUTF8VALUE);
544-
fix_ill_utf8 = (parser->config.flags & JSON_FIXILLUTF8VALUE);
543+
ignore_ill_utf8 = ((parser->config.flags & JSON_IGNOREILLUTF8VALUE) != 0);
544+
fix_ill_utf8 = ((parser->config.flags & JSON_FIXILLUTF8VALUE) != 0);
545545
max_len = parser->config.max_string_len;
546546
}
547547

@@ -622,19 +622,19 @@ json_string_automaton(JSON_PARSER* parser, const unsigned char* input, size_t si
622622
*/
623623
if(IS_IN(ch, 0xc2, 0xdf)) {
624624
parser->substate = 1;
625-
} else if((unsigned char) ch == 0xe0) {
625+
} else if(ch == 0xe0) {
626626
parser->substate = 4;
627627
} else if(IS_IN(ch, 0xe1, 0xec)) {
628628
parser->substate = 2;
629-
} else if((unsigned char) ch == 0xed) {
629+
} else if(ch == 0xed) {
630630
parser->substate = 5;
631631
} else if(IS_IN(ch, 0xee, 0xef)) {
632632
parser->substate = 2;
633-
} else if((unsigned char) ch == 0xf0) {
633+
} else if(ch == 0xf0) {
634634
parser->substate = 6;
635635
} else if(IS_IN(ch, 0xf1, 0xf3)) {
636636
parser->substate = 3;
637-
} else if((unsigned char) ch == 0xf4) {
637+
} else if(ch == 0xf4) {
638638
parser->substate = 7;
639639
} else if(fix_ill_utf8) {
640640
if(json_buf_append(parser, fffd, fffd_size) < 0)
@@ -651,7 +651,7 @@ json_string_automaton(JSON_PARSER* parser, const unsigned char* input, size_t si
651651
}
652652
} else if(parser->substate <= 7) {
653653
/* Should be trailing UTF-8 byte. */
654-
if(parser->substate <= 3 && ((unsigned char)(ch) & 0xc0) == 0x80) {
654+
if(parser->substate <= 3 && (ch & 0xc0) == 0x80) {
655655
parser->substate--;
656656
} else if(parser->substate == 4 && IS_IN(ch, 0xa0, 0xbf)) {
657657
parser->substate = 1;
@@ -679,7 +679,7 @@ json_string_automaton(JSON_PARSER* parser, const unsigned char* input, size_t si
679679
* I.e. we have to go back to the previous leading byte
680680
* (including it).
681681
*/
682-
while(((unsigned char)(parser->buf[parser->buf_used-1]) & 0xc0) == 0x80)
682+
while((parser->buf[parser->buf_used-1] & 0xc0) == 0x80)
683683
parser->buf_used--; /* Cancel all the trailing bytes. */
684684
parser->buf_used--; /* Cancel the leading byte. */
685685
if(json_buf_append(parser, fffd, fffd_size) < 0)

‎src/json/centijson_value.c

Lines changed: 9 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -268,42 +268,36 @@ json_value_is_compatible(const JSON_VALUE* v, JSON_VALUE_TYPE type)
268268
return (type == JSON_VALUE_INT64 || type == JSON_VALUE_FLOAT || type == JSON_VALUE_DOUBLE) ||
269269
(type == JSON_VALUE_UINT32 && json_value_int32(v) >= 0) ||
270270
(type == JSON_VALUE_UINT64 && json_value_int32(v) >= 0);
271-
break;
272271

273272
case JSON_VALUE_UINT32:
274273
return (type == JSON_VALUE_INT64 || type == JSON_VALUE_UINT64 || type == JSON_VALUE_FLOAT || type == JSON_VALUE_DOUBLE) ||
275274
(type == JSON_VALUE_INT32 && json_value_uint32(v) <= INT32_MAX);
276-
break;
277275

278276
case JSON_VALUE_INT64:
279277
return (type == JSON_VALUE_FLOAT || type == JSON_VALUE_DOUBLE) ||
280278
(type == JSON_VALUE_INT32 && json_value_int64(v) >= INT32_MIN && json_value_int64(v) <= INT32_MAX) ||
281279
(type == JSON_VALUE_UINT32 && json_value_int64(v) >= 0 && json_value_int64(v) <= UINT32_MAX) ||
282280
(type == JSON_VALUE_UINT64 && json_value_int64(v) >= 0);
283-
break;
284281

285282
case JSON_VALUE_UINT64:
286283
return (type == JSON_VALUE_FLOAT || type == JSON_VALUE_DOUBLE) ||
287284
(type == JSON_VALUE_INT32 && json_value_uint64(v) <= INT32_MAX) ||
288285
(type == JSON_VALUE_UINT32 && json_value_uint64(v) <= UINT32_MAX) ||
289286
(type == JSON_VALUE_INT64 && json_value_uint64(v) <= INT64_MAX);
290-
break;
291287

292288
case JSON_VALUE_FLOAT:
293289
return (type == JSON_VALUE_DOUBLE) ||
294290
(type == JSON_VALUE_INT32 && json_value_float(v) == (float)json_value_int32(v)) ||
295291
(type == JSON_VALUE_UINT32 && json_value_float(v) == (float)json_value_uint32(v)) ||
296292
(type == JSON_VALUE_INT64 && json_value_float(v) == (float)json_value_int64(v)) ||
297293
(type == JSON_VALUE_UINT64 && json_value_float(v) == (float)json_value_uint64(v));
298-
break;
299294

300295
case JSON_VALUE_DOUBLE:
301296
return (type == JSON_VALUE_FLOAT) ||
302297
(type == JSON_VALUE_INT32 && json_value_double(v) == (double)json_value_int32(v)) ||
303298
(type == JSON_VALUE_UINT32 && json_value_double(v) == (double)json_value_uint32(v)) ||
304299
(type == JSON_VALUE_INT64 && json_value_double(v) == (double)json_value_int64(v)) ||
305300
(type == JSON_VALUE_UINT64 && json_value_double(v) == (double)json_value_uint64(v));
306-
break;
307301

308302
default:
309303
break;
@@ -695,7 +689,7 @@ json_value_int32(const JSON_VALUE* v)
695689
} ret;
696690

697691
switch(json_value_type(v)) {
698-
case JSON_VALUE_INT32: memcpy(&ret.i32, payload, sizeof(int32_t)); return (int32_t) ret.i32;
692+
case JSON_VALUE_INT32: memcpy(&ret.i32, payload, sizeof(int32_t)); return ret.i32;
699693
case JSON_VALUE_UINT32: memcpy(&ret.u32, payload, sizeof(uint32_t)); return (int32_t) ret.u32;
700694
case JSON_VALUE_INT64: memcpy(&ret.i64, payload, sizeof(int64_t)); return (int32_t) ret.i64;
701695
case JSON_VALUE_UINT64: memcpy(&ret.u64, payload, sizeof(uint64_t)); return (int32_t) ret.u64;
@@ -720,7 +714,7 @@ json_value_uint32(const JSON_VALUE* v)
720714

721715
switch(json_value_type(v)) {
722716
case JSON_VALUE_INT32: memcpy(&ret.i32, payload, sizeof(int32_t)); return (uint32_t) ret.i32;
723-
case JSON_VALUE_UINT32: memcpy(&ret.u32, payload, sizeof(uint32_t)); return (uint32_t) ret.u32;
717+
case JSON_VALUE_UINT32: memcpy(&ret.u32, payload, sizeof(uint32_t)); return ret.u32;
724718
case JSON_VALUE_INT64: memcpy(&ret.i64, payload, sizeof(int64_t)); return (uint32_t) ret.i64;
725719
case JSON_VALUE_UINT64: memcpy(&ret.u64, payload, sizeof(uint64_t)); return (uint32_t) ret.u64;
726720
case JSON_VALUE_FLOAT: memcpy(&ret.f, payload, sizeof(float)); return ROUNDF(uint32_t, ret.f);
@@ -745,7 +739,7 @@ json_value_int64(const JSON_VALUE* v)
745739
switch(json_value_type(v)) {
746740
case JSON_VALUE_INT32: memcpy(&ret.i32, payload, sizeof(int32_t)); return (int64_t) ret.i32;
747741
case JSON_VALUE_UINT32: memcpy(&ret.u32, payload, sizeof(uint32_t)); return (int64_t) ret.u32;
748-
case JSON_VALUE_INT64: memcpy(&ret.i64, payload, sizeof(int64_t)); return (int64_t) ret.i64;
742+
case JSON_VALUE_INT64: memcpy(&ret.i64, payload, sizeof(int64_t)); return ret.i64;
749743
case JSON_VALUE_UINT64: memcpy(&ret.u64, payload, sizeof(uint64_t)); return (int64_t) ret.u64;
750744
case JSON_VALUE_FLOAT: memcpy(&ret.f, payload, sizeof(float)); return ROUNDF(int64_t, ret.f);
751745
case JSON_VALUE_DOUBLE: memcpy(&ret.d, payload, sizeof(double)); return ROUNDD(int64_t, ret.d);
@@ -770,7 +764,7 @@ json_value_uint64(const JSON_VALUE* v)
770764
case JSON_VALUE_INT32: memcpy(&ret.i32, payload, sizeof(int32_t)); return (uint64_t) ret.i32;
771765
case JSON_VALUE_UINT32: memcpy(&ret.u32, payload, sizeof(uint32_t)); return (uint64_t) ret.u32;
772766
case JSON_VALUE_INT64: memcpy(&ret.i64, payload, sizeof(int64_t)); return (uint64_t) ret.i64;
773-
case JSON_VALUE_UINT64: memcpy(&ret.u64, payload, sizeof(uint64_t)); return (uint64_t) ret.u64;
767+
case JSON_VALUE_UINT64: memcpy(&ret.u64, payload, sizeof(uint64_t)); return ret.u64;
774768
case JSON_VALUE_FLOAT: memcpy(&ret.f, payload, sizeof(float)); return ROUNDF(uint64_t, ret.f);
775769
case JSON_VALUE_DOUBLE: memcpy(&ret.d, payload, sizeof(double)); return ROUNDD(uint64_t, ret.d);
776770
default: return UINT64_MAX;
@@ -1367,7 +1361,7 @@ json_value_dict_get_or_add_(
13671361
#endif
13681362
JSON_VALUE* v, const unsigned char* key, size_t key_len)
13691363
{
1370-
DICT* d = json_value_dict_payload((JSON_VALUE*) v);
1364+
DICT* d = json_value_dict_payload(v);
13711365
RBTREE* node = (d != NULL) ? d->root : NULL;
13721366
#ifdef WOLFSENTRY_NO_ALLOCA
13731367
RBTREE *path[RBTREE_MAX_HEIGHT];
@@ -1551,7 +1545,7 @@ json_value_dict_remove_(
15511545
#endif
15521546
JSON_VALUE* v, const unsigned char* key, size_t key_len)
15531547
{
1554-
DICT* d = json_value_dict_payload((JSON_VALUE*) v);
1548+
DICT* d = json_value_dict_payload(v);
15551549
RBTREE* node = (d != NULL) ? d->root : NULL;
15561550
RBTREE* single_child;
15571551
#ifdef WOLFSENTRY_NO_ALLOCA
@@ -1775,7 +1769,7 @@ json_value_dict_clean(
17751769
#endif
17761770
JSON_VALUE* v)
17771771
{
1778-
DICT* d = json_value_dict_payload((JSON_VALUE*) v);
1772+
DICT* d = json_value_dict_payload(v);
17791773
RBTREE **stack;
17801774
int stack_size;
17811775
RBTREE* node;
@@ -1819,7 +1813,7 @@ json_value_dict_clean(
18191813
else
18201814
memset(d, 0, OFFSETOF(DICT, order_head));
18211815

1822-
free(stack);
1816+
free((void *)stack);
18231817

18241818
return 0;
18251819
}
@@ -1959,7 +1953,7 @@ json_value_clone(WOLFSENTRY_CONTEXT_ARGS_IN_EX(struct wolfsentry_allocator *allo
19591953
stack_size += json_value_dict_leftmost_path(stack + stack_size, src_dict_node->right);
19601954
}
19611955

1962-
free(stack);
1956+
free((void *)stack);
19631957

19641958
break;
19651959
}

‎src/kv.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -211,7 +211,6 @@ static inline int wolfsentry_kv_value_eq_1(struct wolfsentry_kv_pair *a, struct
211211
default:
212212
return 0;
213213
}
214-
return 0;
215214
}
216215

217216
/* same as wolfsentry_kv_insert unless key already exists. if it does and

‎src/routes.c

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -795,7 +795,7 @@ static wolfsentry_errcode_t wolfsentry_route_init_by_exports(
795795
WOLFSENTRY_ERROR_RETURN(INVALID_ARG);
796796
if ((unsigned)data_addr_offset > MAX_UINT_OF(uint16_t))
797797
WOLFSENTRY_ERROR_RETURN(NUMERIC_ARG_TOO_BIG);
798-
if (new_size < offsetof(struct wolfsentry_route, data) + (size_t)data_addr_offset + WOLFSENTRY_BITS_TO_BYTES(route_exports->remote.addr_len) + WOLFSENTRY_BITS_TO_BYTES(route_exports->local.addr_len))
798+
if (new_size < offsetof(struct wolfsentry_route, data) + data_addr_offset + WOLFSENTRY_BITS_TO_BYTES(route_exports->remote.addr_len) + WOLFSENTRY_BITS_TO_BYTES(route_exports->local.addr_len))
799799
WOLFSENTRY_ERROR_RETURN(BUFFER_TOO_SMALL);
800800
if (! (route_exports->flags & (WOLFSENTRY_ROUTE_FLAG_DIRECTION_IN | WOLFSENTRY_ROUTE_FLAG_DIRECTION_OUT)))
801801
WOLFSENTRY_ERROR_RETURN(INVALID_ARG);
@@ -863,10 +863,10 @@ static wolfsentry_errcode_t wolfsentry_route_init_by_exports(
863863
if (data_addr_offset > 0) {
864864
if (route_exports->private_data != NULL) {
865865
memcpy(new->data, route_exports->private_data, route_exports->private_data_size); /* copy private data. */
866-
if ((size_t)data_addr_offset > route_exports->private_data_size)
866+
if (data_addr_offset > route_exports->private_data_size)
867867
memset((byte *)new->data + route_exports->private_data_size, 0, data_addr_offset - route_exports->private_data_size); /* zero the leftovers. */
868868
} else
869-
memset(new->data, 0, (size_t)data_addr_offset); /* zero private data. */
869+
memset(new->data, 0, data_addr_offset); /* zero private data. */
870870
}
871871

872872
new->meta.purge_after = route_exports->meta.purge_after;
@@ -2108,7 +2108,7 @@ WOLFSENTRY_API wolfsentry_errcode_t wolfsentry_route_get_reference(
21082108
if ((ret = wolfsentry_event_get_reference(WOLFSENTRY_CONTEXT_ARGS_OUT, event_label, event_label_len, &event)) < 0)
21092109
WOLFSENTRY_ERROR_UNLOCK_AND_RERETURN(ret);
21102110
}
2111-
ret = wolfsentry_route_lookup_1(WOLFSENTRY_CONTEXT_ARGS_OUT, table, remote, local, flags, event, exact_p, inexact_matches, (struct wolfsentry_route **)route, NULL /* action_results */);
2111+
ret = wolfsentry_route_lookup_1(WOLFSENTRY_CONTEXT_ARGS_OUT, table, remote, local, flags, event, exact_p, inexact_matches, route, NULL /* action_results */);
21122112
if (event != NULL)
21132113
WOLFSENTRY_WARN_ON_FAILURE(wolfsentry_event_drop_reference(WOLFSENTRY_CONTEXT_ARGS_OUT, event, NULL /* action_results */));
21142114
WOLFSENTRY_UNLOCK_AND_RERETURN_IF_ERROR(ret);
@@ -3921,7 +3921,7 @@ WOLFSENTRY_API wolfsentry_errcode_t wolfsentry_route_format_json(
39213921
ret = wolfsentry_addr_family_ntop(WOLFSENTRY_CONTEXT_ARGS_OUT, r->sa_family, &addr_family, &family_name);
39223922
if (WOLFSENTRY_ERROR_CODE_IS(ret, OK)) {
39233923
size_t family_name_len = strlen(family_name);
3924-
if (family_name_len + 2 > (size_t)*json_out_len)
3924+
if (family_name_len + 2 > *json_out_len)
39253925
ret = WOLFSENTRY_ERROR_ENCODE(BUFFER_TOO_SMALL);
39263926
else {
39273927
write_byte('"');

0 commit comments

Comments
 (0)