picnoir/Systemd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

network-intenal: user _cleanup_ macro in parse_ifname

Browse source
This commit is contained in:
Tom Gundersen 2015-01-10 00:33:46 +01:00
parent 76c37ab6d2
commit 9c39eb5c88
1 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/libsystemd-network/network-internal.c
View file

@ -224,7 +224,7 @@ int config_parse_ifalias(const char *unit,
void *userdata) {
char **s = data;
char *n;
_cleanup_free_ char *n = NULL;
assert(filename);
assert(lvalue);
@ -238,17 +238,15 @@ int config_parse_ifalias(const char *unit,
if (!ascii_is_valid(n) || strlen(n) >= IFALIASZ) {
log_syntax(unit, LOG_ERR, filename, line, EINVAL,
"Interface alias is not ASCII clean or is too long, ignoring assignment: %s", rvalue);
free(n);
return 0;
}
free(*s);
if (*n)
if (*n) {
*s = n;
else {
free(n);
n = NULL;
} else
*s = NULL;
}
return 0;
}