Skip to content

Commit 359b295

Browse files
committed
Fix make minimal-build-test. Revert some of the route stdio changes.
1 parent a6f8e3f commit 359b295

File tree

3 files changed

+1
-10
lines changed

3 files changed

+1
-10
lines changed

src/routes.c

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3706,8 +3706,6 @@ WOLFSENTRY_API wolfsentry_errcode_t wolfsentry_route_table_iterate_end(
37063706
WOLFSENTRY_RETURN_OK;
37073707
}
37083708

3709-
#ifndef WOLFSENTRY_NO_STDIO_STREAMS
3710-
37113709
static inline char hexdigit_ntoa(unsigned int d) {
37123710
d &= 0xf;
37133711
if (d < 10)
@@ -3796,7 +3794,6 @@ WOLFSENTRY_API wolfsentry_errcode_t wolfsentry_route_format_address(
37963794
} else
37973795
WOLFSENTRY_ERROR_RETURN(OP_NOT_SUPP_FOR_PROTO);
37983796
}
3799-
#endif
38003797

38013798
#if defined(WOLFSENTRY_PROTOCOL_NAMES) || defined(WOLFSENTRY_JSON_DUMP_UTILS) || !defined(WOLFSENTRY_NO_JSON)
38023799

@@ -4007,7 +4004,6 @@ WOLFSENTRY_API wolfsentry_errcode_t wolfsentry_route_format_json(
40074004
write_string("\"remote\":{");
40084005

40094006
if (have_r_attr(SA_REMOTE_ADDR)) {
4010-
#ifndef WOLFSENTRY_NO_STDIO_STREAMS
40114007
#ifdef WOLFSENTRY_ADDR_BITMASK_MATCHING
40124008
if (r->flags & WOLFSENTRY_ROUTE_FLAG_REMOTE_ADDR_BITMASK) {
40134009
int len_in_out = (int)*json_out_len;
@@ -4054,7 +4050,6 @@ WOLFSENTRY_API wolfsentry_errcode_t wolfsentry_route_format_json(
40544050
WOLFSENTRY_RERETURN_IF_ERROR(ws_itoa(WOLFSENTRY_ROUTE_REMOTE_ADDR_BITS(r), json_out, json_out_len));
40554051
write_byte(',');
40564052
}
4057-
#endif /* !WOLFSENTRY_NO_STDIO_STREAMS */
40584053
}
40594054
if (have_r_attr(SA_REMOTE_PORT)) {
40604055
write_string("\"port\":");
@@ -4077,7 +4072,6 @@ WOLFSENTRY_API wolfsentry_errcode_t wolfsentry_route_format_json(
40774072
write_string("\"local\":{");
40784073

40794074
if (have_r_attr(SA_LOCAL_ADDR)) {
4080-
#ifndef WOLFSENTRY_NO_STDIO_STREAMS
40814075
#ifdef WOLFSENTRY_ADDR_BITMASK_MATCHING
40824076
if (r->flags & WOLFSENTRY_ROUTE_FLAG_LOCAL_ADDR_BITMASK) {
40834077
int len_in_out = (int)*json_out_len;
@@ -4124,7 +4118,6 @@ WOLFSENTRY_API wolfsentry_errcode_t wolfsentry_route_format_json(
41244118
WOLFSENTRY_RERETURN_IF_ERROR(ws_itoa(WOLFSENTRY_ROUTE_LOCAL_ADDR_BITS(r), json_out, json_out_len));
41254119
write_byte(',');
41264120
}
4127-
#endif /* !WOLFSENTRY_NO_STDIO_STREAMS */
41284121
}
41294122

41304123
if (have_r_attr(SA_LOCAL_PORT)) {

src/wolfsentry_util.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4346,7 +4346,7 @@ WOLFSENTRY_API wolfsentry_errcode_t wolfsentry_base64_decode(const char *src, si
43464346
const char *src_end = src + src_len;
43474347
size_t dest_len = 0;
43484348

4349-
if (WOLFSENTRY_BASE64_DECODED_BUFSPC(src, (int)src_len) > (int)*dest_spc)
4349+
if (WOLFSENTRY_BASE64_DECODED_BUFSPC(src, src_len) > *dest_spc)
43504350
WOLFSENTRY_ERROR_RETURN(BUFFER_TOO_SMALL);
43514351

43524352
for (; src < src_end; ++src) {

wolfsentry/wolfsentry.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2489,7 +2489,6 @@ WOLFSENTRY_API wolfsentry_errcode_t wolfsentry_route_set_wildcard(
24892489
struct wolfsentry_route *route,
24902490
wolfsentry_route_flags_t wildcards_to_set);
24912491

2492-
#ifndef WOLFSENTRY_NO_STDIO_STREAMS
24932492
WOLFSENTRY_API wolfsentry_errcode_t wolfsentry_route_format_address(
24942493
WOLFSENTRY_CONTEXT_ARGS_IN,
24952494
wolfsentry_addr_family_t sa_family,
@@ -2498,7 +2497,6 @@ WOLFSENTRY_API wolfsentry_errcode_t wolfsentry_route_format_address(
24982497
char *buf,
24992498
int *buflen);
25002499
/*!< \brief Render a binary address in human-readable form to a buffer */
2501-
#endif
25022500

25032501
#if defined(WOLFSENTRY_PROTOCOL_NAMES) || defined(WOLFSENTRY_JSON_DUMP_UTILS) || !defined(WOLFSENTRY_NO_JSON)
25042502

0 commit comments

Comments
 (0)