From 68a09de9de2711c721429463b98cc05d91db9b4d Mon Sep 17 00:00:00 2001 From: Philippe Guibert Date: Fri, 3 Feb 2017 08:28:57 +0100 Subject: [PATCH] lib: append prefix_ for mac handling functions This commit is changing the function naming for mac handling functions. Signed-off-by: Philippe Guibert --- lib/prefix.c | 4 ++-- lib/prefix.h | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/prefix.c b/lib/prefix.c index 407b3e510a..b2d3b67586 100644 --- a/lib/prefix.c +++ b/lib/prefix.c @@ -1047,7 +1047,7 @@ static uint8_t convertchartohexa(uint8_t * hexa, int *error) * format accepted: AA:BB:CC:DD:EE:FF * if mac parameter is null, then check only */ -int str2mac(const char *str, char *mac) +int prefix_str2mac(const char *str, char *mac) { unsigned int k = 0, i, j; uint8_t *ptr, *ptr2; @@ -1115,7 +1115,7 @@ int str2mac(const char *str, char *mac) return 1; } -char *mac2str(char *mac, char *buf, int size) +char *prefix_mac2str(const char *mac, char *buf, int size) { char *ptr; diff --git a/lib/prefix.h b/lib/prefix.h index 2a4dd12547..2c2b37dabb 100644 --- a/lib/prefix.h +++ b/lib/prefix.h @@ -289,8 +289,8 @@ extern void masklen2ip6 (const int, struct in6_addr *); extern void str2in6_addr (const char *, struct in6_addr *); extern const char *inet6_ntoa (struct in6_addr); -extern int str2mac(const char *str, char *mac); -extern char *mac2str(char *mac, char *buf, int size); +extern int prefix_str2mac(const char *str, char *mac); +extern char *prefix_mac2str(const char *mac, char *buf, int size); static inline int ipv6_martian (struct in6_addr *addr) { -- 2.39.5