We always have sizeof(unsigned short) == sizeof(uint16_t), so parseopt_u16() is exactly equivalent to parseopt_hu().
The former is unused anyway, so just drop it. Signed-off-by: Ahmad Fatoum <[email protected]> --- include/parseopt.h | 1 - lib/parseopt.c | 31 ------------------------------- 2 files changed, 32 deletions(-) diff --git a/include/parseopt.h b/include/parseopt.h index 5a40bdc219fe..a944c3655f77 100644 --- a/include/parseopt.h +++ b/include/parseopt.h @@ -6,7 +6,6 @@ void parseopt_llu_suffix(const char *options, const char *opt, void parseopt_b(const char *options, const char *opt, bool *val); void parseopt_hu(const char *options, const char *opt, unsigned short *val); -void parseopt_u16(const char *options, const char *opt, uint16_t *val); void parseopt_str(const char *options, const char *opt, char **val); #endif /* __PARSEOPT_H__ */ diff --git a/lib/parseopt.c b/lib/parseopt.c index 70983066d952..d0a27d8bf372 100644 --- a/lib/parseopt.c +++ b/lib/parseopt.c @@ -59,37 +59,6 @@ again: *val = v; } -void parseopt_u16(const char *options, const char *opt, uint16_t *val) -{ - const char *start; - size_t optlen = strlen(opt); - ulong v; - char *endp; - -again: - start = strstr(options, opt); - - if (!start) - return; - - if (start > options && start[-1] != ',') { - options = start; - goto again; - } - - if (start[optlen] != '=') { - options = start; - goto again; - } - - v = simple_strtoul(start + optlen + 1, &endp, 0); - if (v > U16_MAX) - return; - - if (*endp == ',' || *endp == '\0') - *val = v; -} - void parseopt_str(const char *options, const char *opt, char **val) { const char *start; -- 2.30.2 _______________________________________________ barebox mailing list [email protected] http://lists.infradead.org/mailman/listinfo/barebox
