whitespace/style fix

This commit is contained in:
Denis Vlasenko
2007-10-11 19:53:10 +00:00
parent 8add068573
commit 11c23d7b99

View File

@ -248,7 +248,7 @@ static const struct aftype unspec_aftype = {
.name = "unspec", .name = "unspec",
.title = "UNSPEC", .title = "UNSPEC",
.af = AF_UNSPEC, .af = AF_UNSPEC,
.alen = 0, .alen = 0,
.print = UNSPEC_print, .print = UNSPEC_print,
.sprint = UNSPEC_sprint, .sprint = UNSPEC_sprint,
}; };
@ -405,24 +405,25 @@ static char *get_name(char *name, char *p)
/* Extract <name> from nul-terminated p where p matches /* Extract <name> from nul-terminated p where p matches
<name>: after leading whitespace. <name>: after leading whitespace.
If match is not made, set name empty and return unchanged p */ If match is not made, set name empty and return unchanged p */
int namestart=0, nameend=0; int namestart = 0, nameend = 0;
while (isspace(p[namestart])) while (isspace(p[namestart]))
namestart++; namestart++;
nameend=namestart; nameend = namestart;
while (p[nameend] && p[nameend]!=':' && !isspace(p[nameend])) while (p[nameend] && p[nameend] != ':' && !isspace(p[nameend]))
nameend++; nameend++;
if (p[nameend]==':') { if (p[nameend] == ':') {
if ((nameend-namestart)<IFNAMSIZ) { if ((nameend - namestart) < IFNAMSIZ) {
memcpy(name,&p[namestart],nameend-namestart); memcpy(name, &p[namestart], nameend - namestart);
name[nameend-namestart]='\0'; name[nameend - namestart] = '\0';
p=&p[nameend]; p = &p[nameend];
} else { } else {
/* Interface name too large */ /* Interface name too large */
name[0]='\0'; name[0] = '\0';
} }
} else { } else {
/* trailing ':' not found - return empty */ /* trailing ':' not found - return empty */
name[0]='\0'; name[0] = '\0';
} }
return p + 1; return p + 1;
} }