matthias
/
iproute2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

lib/ll_addr: whitespace and indent cleanup 

Run old ll_addr through kernel Lindent.

Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
This commit is contained in:
Stephen Hemminger 2018-11-15 14:36:19 -08:00
parent 57ddc275f5
commit 07b20a6197
1 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
lib/ll_addr.c
View File

@ -26,20 +26,20 @@
#include "rt_names.h" #include "rt_names.h"
#include "utils.h" #include "utils.h"
const char *ll_addr_n2a(const unsigned char *addr, int alen, int type,
const char *ll_addr_n2a(const unsigned char *addr, int alen, int type, char *buf, int blen) char *buf, int blen)
{ {
int i; int i;
int l; int l;
if (alen == 4 && if (alen == 4 &&
(type == ARPHRD_TUNNEL || type == ARPHRD_SIT || type == ARPHRD_IPGRE)) { (type == ARPHRD_TUNNEL || type == ARPHRD_SIT
|| type == ARPHRD_IPGRE))
return inet_ntop(AF_INET, addr, buf, blen); return inet_ntop(AF_INET, addr, buf, blen);
}
if (alen == 16 && if (alen == 16 && (type == ARPHRD_TUNNEL6 || type == ARPHRD_IP6GRE))
(type == ARPHRD_TUNNEL6 || type == ARPHRD_IP6GRE)) {
return inet_ntop(AF_INET6, addr, buf, blen); return inet_ntop(AF_INET6, addr, buf, blen);
}
snprintf(buf, blen, "%02x", addr[0]); snprintf(buf, blen, "%02x", addr[0]);
for (i = 1, l = 2; i < alen && l < blen; i++, l += 3) for (i = 1, l = 2; i < alen && l < blen; i++, l += 3)
snprintf(buf + l, blen - l, ":%02x", addr[i]); snprintf(buf + l, blen - l, ":%02x", addr[i]);
@ -62,7 +62,7 @@ int ll_addr_a2n(char *lladdr, int len, const char *arg)
} else { } else {
int i; int i;
for (i=0; i<len; i++) { for (i = 0; i < len; i++) {
int temp; int temp;
char *cp = strchr(arg, ':'); char *cp = strchr(arg, ':');
if (cp) { if (cp) {
@ -70,11 +70,13 @@ int ll_addr_a2n(char *lladdr, int len, const char *arg)
cp++; cp++;
} }
if (sscanf(arg, "%x", &temp) != 1) { if (sscanf(arg, "%x", &temp) != 1) {
fprintf(stderr, "\"%s\" is invalid lladdr.\n", arg); fprintf(stderr, "\"%s\" is invalid lladdr.\n",
arg);
return -1; return -1;
} }
if (temp < 0 || temp > 255) { if (temp < 0 || temp > 255) {
fprintf(stderr, "\"%s\" is invalid lladdr.\n", arg); fprintf(stderr, "\"%s\" is invalid lladdr.\n",
arg);
return -1; return -1;
} }
lladdr[i] = temp; lladdr[i] = temp;
@ -82,6 +84,6 @@ int ll_addr_a2n(char *lladdr, int len, const char *arg)
break; break;
arg = cp; arg = cp;
} }
return i+1; return i + 1;
} }
} }