shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2024-12-25 01:34:28 +03:00
Code

Fix a few return codes in error paths

Browse Source
This commit is contained in:
Zbigniew Jędrzejewski-Szmek 2014-04-03 14:05:01 -04:00
parent ee0e4cca5a
commit ecb08ec6a5
3 changed files with 8 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/network/networkd-netdev.c
View File

@ -461,7 +461,7 @@ static int netdev_load_one(Manager *manager, const char *filename) {
if (errno == ENOENT)
return 0;
else
return errno;
return -errno;
}
netdev = new0(NetDev, 1);

2
src/network/networkd-network.c
View File

@ -41,7 +41,7 @@ static int network_load_one(Manager *manager, const char *filename) {
if (errno == ENOENT)
return 0;
else
return errno;
return -errno;
}
network = new0(Network, 1);

17
src/udev/net/link-config.c
View File

@ -139,7 +139,7 @@ void link_config_ctx_free(link_config_ctx *ctx) {
}
static int load_link(link_config_ctx *ctx, const char *filename) {
link_config *link;
_cleanup_free_ link_config *link = NULL;
_cleanup_fclose_ FILE *file;
int r;
@ -151,14 +151,12 @@ static int load_link(link_config_ctx *ctx, const char *filename) {
if (errno == ENOENT)
return 0;
else
return errno;
return -errno;
}
link = new0(link_config, 1);
if (!link) {
r = log_oom();
goto failure;
}
if (!link)
return log_oom();
link->mac_policy = _MACPOLICY_INVALID;
link->wol = _WOL_INVALID;
@ -168,19 +166,16 @@ static int load_link(link_config_ctx *ctx, const char *filename) {
(void*) link_config_gperf_lookup, false, false, link);
if (r < 0) {
log_warning("Could not parse config file %s: %s", filename, strerror(-r));
goto failure;
return r;
} else
log_debug("Parsed configuration file %s", filename);
link->filename = strdup(filename);
LIST_PREPEND(links, ctx->links, link);
link = NULL;
return 0;
failure:
free(link);
return r;
}
static bool enable_name_policy(void) {