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

ipaddress: minor white space cleanup 

Convert leading spaces to tabs, and put alias in one printf
This commit is contained in:
Stephen Hemminger 2013-03-14 13:47:49 -07:00
parent d947b2384e
commit 1124ffb721
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ip/ipaddress.c
View File

@ -96,8 +96,8 @@ static void print_link_flags(FILE *fp, unsigned flags, unsigned mdown)
fprintf(fp, "NO-CARRIER%s", flags ? "," : ""); fprintf(fp, "NO-CARRIER%s", flags ? "," : "");
flags &= ~IFF_RUNNING; flags &= ~IFF_RUNNING;
#define _PF(f) if (flags&IFF_##f) { \ #define _PF(f) if (flags&IFF_##f) { \
flags &= ~IFF_##f ; \ flags &= ~IFF_##f ; \
fprintf(fp, #f "%s", flags ? "," : ""); } fprintf(fp, #f "%s", flags ? "," : ""); }
_PF(LOOPBACK); _PF(LOOPBACK);
_PF(BROADCAST); _PF(BROADCAST);
_PF(POINTOPOINT); _PF(POINTOPOINT);
@ -117,7 +117,7 @@ static void print_link_flags(FILE *fp, unsigned flags, unsigned mdown)
_PF(DORMANT); _PF(DORMANT);
_PF(ECHO); _PF(ECHO);
#undef _PF #undef _PF
if (flags) if (flags)
fprintf(fp, "%x", flags); fprintf(fp, "%x", flags);
if (mdown) if (mdown)
fprintf(fp, ",M-DOWN"); fprintf(fp, ",M-DOWN");
@ -469,8 +469,7 @@ int print_linkinfo(const struct sockaddr_nl *who,
print_linktype(fp, tb[IFLA_LINKINFO]); print_linktype(fp, tb[IFLA_LINKINFO]);
if (do_link && tb[IFLA_IFALIAS]) { if (do_link && tb[IFLA_IFALIAS]) {
fprintf(fp, "%s", _SL_); fprintf(fp, "%s alias %s", _SL_,
fprintf(fp," alias %s",
rta_getattr_str(tb[IFLA_IFALIAS])); rta_getattr_str(tb[IFLA_IFALIAS]));
} }
@ -1425,4 +1424,3 @@ int do_ipaddr(int argc, char **argv)
fprintf(stderr, "Command \"%s\" is unknown, try \"ip addr help\".\n", *argv); fprintf(stderr, "Command \"%s\" is unknown, try \"ip addr help\".\n", *argv);
exit(-1); exit(-1);
} }