korg/iproute2
0
0
Fork 0
mirror of https://git.kernel.org/pub/scm/network/iproute2/iproute2.git synced 2024-11-15 22:15:13 +08:00
Code Issues Packages Projects Releases Wiki Activity

utils: make hexstring_a2n provide the number of hex digits parsed

Browse Source 
Signed-off-by: Sabrina Dubroca <sd@queasysnail.net>
Acked-by: Phil Sutter <phil@nwl.cc>
This commit is contained in:
Sabrina Dubroca 2016-06-03 16:45:45 +02:00 committed by Stephen Hemminger
parent 90353c3341
commit 89ae502056
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/utils.h
View File

@ -114,8 +114,8 @@ int get_u8(__u8 *val, const char *arg, int base);
int get_s8(__s8 *val, const char *arg, int base);
int get_addr64(__u64 *ap, const char *cp);
char* hexstring_n2a(const __u8 *str, int len, char *buf, int blen);
__u8* hexstring_a2n(const char *str, __u8 *buf, int blen);
char *hexstring_n2a(const __u8 *str, int len, char *buf, int blen);
__u8 *hexstring_a2n(const char *str, __u8 *buf, int blen, unsigned int *len);
#define ADDR64_BUF_SIZE sizeof("xxxx:xxxx:xxxx:xxxx")
int addr64_n2a(__u64 addr, char *buff, size_t len);

8
lib/utils.c
View File

@ -866,9 +866,9 @@ char *hexstring_n2a(const __u8 *str, int len, char *buf, int blen)
return buf;
}
__u8* hexstring_a2n(const char *str, __u8 *buf, int blen)
__u8 *hexstring_a2n(const char *str, __u8 *buf, int blen, unsigned int *len)
{
int cnt = 0;
unsigned int cnt = 0;
char *endptr;
if (strlen(str) % 2)
@ -885,6 +885,10 @@ __u8* hexstring_a2n(const char *str, __u8 *buf, int blen)
buf[cnt++] = tmp;
str += 2;
}
if (len)
*len = cnt;
return buf;
}