diff options
| author | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2014-03-14 09:05:56 -0400 |
|---|---|---|
| committer | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2014-03-14 09:31:34 -0400 |
| commit | 315db1a8aed226a51a4cf700172249cfd10ae115 (patch) | |
| tree | 4b118f45a74c715ecdb3281e8a8e3f5ee9337d80 /src | |
| parent | fe970a8a30d611d454cb40025cfc32e29efa34e6 (diff) | |
Do not return -1 (EINVAL) on allocation error
Diffstat (limited to 'src')
| -rw-r--r-- | src/core/socket.c | 8 | ||||
| -rw-r--r-- | src/network/networkd-link.c | 12 |
2 files changed, 9 insertions, 11 deletions
diff --git a/src/core/socket.c b/src/core/socket.c index 8ecc9f9950..b39bec2f26 100644 --- a/src/core/socket.c +++ b/src/core/socket.c @@ -198,16 +198,14 @@ static int socket_instantiate_service(Socket *s) { assert(s->accept); - if (!(prefix = unit_name_to_prefix(UNIT(s)->id))) + prefix = unit_name_to_prefix(UNIT(s)->id); + if (!prefix) return -ENOMEM; - r = asprintf(&name, "%s@%u.service", prefix, s->n_accepted); - - if (r < 0) + if (asprintf(&name, "%s@%u.service", prefix, s->n_accepted) < 0) return -ENOMEM; r = manager_load_unit(UNIT(s)->manager, name, NULL, NULL, &u); - if (r < 0) return r; diff --git a/src/network/networkd-link.c b/src/network/networkd-link.c index 2650f86357..275ad97a63 100644 --- a/src/network/networkd-link.c +++ b/src/network/networkd-link.c @@ -53,10 +53,10 @@ int link_new(Manager *manager, struct udev_device *device, Link **ret) { if (link->ifindex <= 0) return -EINVAL; - r = asprintf(&link->state_file, "/run/systemd/network/links/%u", - (unsigned) link->ifindex); + r = asprintf(&link->state_file, "/run/systemd/network/links/%"PRIu64, + link->ifindex); if (r < 0) - return r; + return -ENOMEM; mac = udev_device_get_sysattr_value(device, "address"); if (mac) { @@ -1381,10 +1381,10 @@ int link_save(Link *link) { if (link->dhcp_lease) { char *lease_file; - r = asprintf(&lease_file, "/run/systemd/network/leases/%u", - (unsigned) link->ifindex); + r = asprintf(&lease_file, "/run/systemd/network/leases/%"PRIu64, + link->ifindex); if (r < 0) - return r; + return -ENOMEM; r = dhcp_lease_save(link->dhcp_lease, lease_file); if (r < 0) |