From 3d27d435dbe7d39894257894b9dd32bfa607604c Mon Sep 17 00:00:00 2001 From: Denys Vlasenko Date: Thu, 27 Dec 2018 18:03:20 +0100 Subject: [PATCH] randomconfig fixes Signed-off-by: Denys Vlasenko --- archival/libarchive/lzo1x_9x.c | 2 +- libbb/lineedit.c | 18 ++++++++++-------- miscutils/devfsd.c | 2 +- networking/nbd-client.c | 6 ++++++ networking/udhcp/dhcpd.c | 2 +- shell/hush.c | 2 +- 6 files changed, 20 insertions(+), 12 deletions(-) diff --git a/archival/libarchive/lzo1x_9x.c b/archival/libarchive/lzo1x_9x.c index 09ee4ba5c..df26b375f 100644 --- a/archival/libarchive/lzo1x_9x.c +++ b/archival/libarchive/lzo1x_9x.c @@ -487,7 +487,7 @@ static int find_match(lzo1x_999_t *c, lzo_swd_p s, } /* this is a public functions, but there is no prototype in a header file */ -static int lzo1x_999_compress_internal(const uint8_t *in , unsigned in_len, +static int lzo1x_999_compress_internal(const uint8_t *in, unsigned in_len, uint8_t *out, unsigned *out_len, void *wrkmem, unsigned good_length, diff --git a/libbb/lineedit.c b/libbb/lineedit.c index 3ed38e54d..0a888fa70 100644 --- a/libbb/lineedit.c +++ b/libbb/lineedit.c @@ -1373,6 +1373,16 @@ void FAST_FUNC show_history(const line_input_t *st) printf("%4d %s\n", i, st->history[i]); } +void FAST_FUNC free_line_input_t(line_input_t *n) +{ +# if ENABLE_FEATURE_EDITING_SAVEHISTORY + int i = n->cnt_history; + while (i > 0) + free(n->history[--i]); +#endif + free(n); +} + # if ENABLE_FEATURE_EDITING_SAVEHISTORY /* We try to ensure that concurrent additions to the history * do not overwrite each other. @@ -1382,14 +1392,6 @@ void FAST_FUNC show_history(const line_input_t *st) * than configured MAX_HISTORY lines. */ -void FAST_FUNC free_line_input_t(line_input_t *n) -{ - int i = n->cnt_history; - while (i > 0) - free(n->history[--i]); - free(n); -} - /* state->flags is already checked to be nonzero */ static void load_history(line_input_t *st_parm) { diff --git a/miscutils/devfsd.c b/miscutils/devfsd.c index 814714f53..3bf06b965 100644 --- a/miscutils/devfsd.c +++ b/miscutils/devfsd.c @@ -694,7 +694,7 @@ static void process_config_line(const char *line, unsigned long *event_mask) return; process_config_line_err: - msg_logger_and_die(LOG_ERR, bb_msg_bad_config, msg , line); + msg_logger_and_die(LOG_ERR, bb_msg_bad_config, msg, line); } /* End Function process_config_line */ static int do_servicing(int fd, unsigned long event_mask) diff --git a/networking/nbd-client.c b/networking/nbd-client.c index 103756b59..1ce974db1 100644 --- a/networking/nbd-client.c +++ b/networking/nbd-client.c @@ -163,7 +163,9 @@ int nbdclient_main(int argc, char **argv) int sock, nbd; int ro; int proto_new; // 0 for old, 1 for new +#if BB_MMU char *data; +#endif // Make sure BLOCKDEV exists nbd = xopen(device, O_RDWR); @@ -200,7 +202,9 @@ int nbdclient_main(int argc, char **argv) ioctl(nbd, NBD_SET_SIZE_BLOCKS, size_blocks); ioctl(nbd, NBD_CLEAR_SOCK); ro = !!(old_nbd_header.flags & htons(2)); +#if BB_MMU data = old_nbd_header.data; +#endif } else { unsigned namelen; uint16_t handshake_flags; @@ -230,7 +234,9 @@ int nbdclient_main(int argc, char **argv) ioctl(nbd, NBD_SET_FLAGS, ntohs(new_nbd_header.transmission_flags)); ro = !!(new_nbd_header.transmission_flags & htons(2)); +#if BB_MMU data = new_nbd_header.data; +#endif } if (ioctl(nbd, BLKROSET, &ro) < 0) { diff --git a/networking/udhcp/dhcpd.c b/networking/udhcp/dhcpd.c index 477856d11..0c55fa5e4 100644 --- a/networking/udhcp/dhcpd.c +++ b/networking/udhcp/dhcpd.c @@ -378,7 +378,7 @@ struct config_keyword { #define OFS(field) offsetof(struct server_config_t, field) static const struct config_keyword keywords[] = { - /* keyword handler variable address default */ + /* keyword handler variable address default */ {"start" , udhcp_str2nip , OFS(start_ip ), "192.168.0.20"}, {"end" , udhcp_str2nip , OFS(end_ip ), "192.168.0.254"}, {"interface" , read_str , OFS(interface ), "eth0"}, diff --git a/shell/hush.c b/shell/hush.c index 2e4a4bcc6..d80c717e7 100644 --- a/shell/hush.c +++ b/shell/hush.c @@ -5998,7 +5998,7 @@ static const char *first_special_char_in_vararg(const char *cp) #endif static char *encode_then_expand_vararg(const char *str, int handle_squotes, int do_unbackslash) { -#if !BASH_PATTERN_SUBST +#if !BASH_PATTERN_SUBST && ENABLE_HUSH_CASE const int do_unbackslash = 0; #endif char *exp_str;