From: Stephen Hemminger Date: Thu, 1 Jun 2023 17:08:09 +0000 (-0700) Subject: utils: make local cmdline functions static X-Git-Tag: v6.4.0~10 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ebe23249ce1eeedb3610890e4c0c0f52fb8341fe;p=thirdparty%2Fiproute2.git utils: make local cmdline functions static No need to expose these parts of command line parsing. Signed-off-by: Stephen Hemminger --- diff --git a/include/utils.h b/include/utils.h index 0f1b3bef3..0b5d86a26 100644 --- a/include/utils.h +++ b/include/utils.h @@ -139,7 +139,6 @@ int get_addr_rta(inet_prefix *dst, const struct rtattr *rta, int family); int get_addr_ila(__u64 *val, const char *arg); int read_prop(const char *dev, char *prop, long *value); -int get_hex(char c); int get_integer(int *val, const char *arg, int base); int get_unsigned(unsigned *val, const char *arg, int base); int get_time_rtt(unsigned *val, const char *arg, int *raw); @@ -304,8 +303,6 @@ unsigned int print_name_and_link(const char *fmt, #define ntohll(x) ((1==ntohl(1)) ? (x) : ((uint64_t)ntohl((x) & 0xFFFFFFFF) << 32) | ntohl((x) >> 32)) extern int cmdlineno; -ssize_t getcmdline(char **line, size_t *len, FILE *in); -int makeargs(char *line, char *argv[], int maxargs); char *int_to_str(int val, char *buf); int get_guid(__u64 *guid, const char *arg); diff --git a/lib/utils.c b/lib/utils.c index 8dc302bdf..01f3a5f7e 100644 --- a/lib/utils.c +++ b/lib/utils.c @@ -96,7 +96,7 @@ out: return -1; } -int get_hex(char c) +static int get_hex(char c) { if (c >= 'A' && c <= 'F') return c - 'A' + 10; @@ -1289,7 +1289,7 @@ unsigned int print_name_and_link(const char *fmt, int cmdlineno; /* Like glibc getline but handle continuation lines and comments */ -ssize_t getcmdline(char **linep, size_t *lenp, FILE *in) +static ssize_t getcmdline(char **linep, size_t *lenp, FILE *in) { ssize_t cc; char *cp; @@ -1336,7 +1336,7 @@ ssize_t getcmdline(char **linep, size_t *lenp, FILE *in) } /* split command line into argument vector */ -int makeargs(char *line, char *argv[], int maxargs) +static int makeargs(char *line, char *argv[], int maxargs) { static const char ws[] = " \t\r\n"; char *cp = line;