diff options
| author | Sebastien Bacher <seb128@ubuntu.com> | 2021-01-11 17:41:24 +0100 |
|---|---|---|
| committer | Sebastien Bacher <seb128@ubuntu.com> | 2021-01-11 17:41:24 +0100 |
| commit | a82e048a943092315a32d745c99e0f5635e29134 (patch) | |
| tree | e2daea99a161768c9b956bfea9117289deaf31be /src/systemd/nm-sd-utils-dhcp.c | |
| parent | b51f06ff71a2060925bf3c0f04c44bd12480e670 (diff) | |
| parent | 65f86e8f56267192d42f2b629fc6b0c99fb9cd0c (diff) | |
Merge branch 'upstream/latest' of https://salsa.debian.org/utopia-team/network-manager into upstream/latest
Diffstat (limited to 'src/systemd/nm-sd-utils-dhcp.c')
| -rw-r--r-- | src/systemd/nm-sd-utils-dhcp.c | 41 |
1 files changed, 21 insertions, 20 deletions
diff --git a/src/systemd/nm-sd-utils-dhcp.c b/src/systemd/nm-sd-utils-dhcp.c index 4cfe054c..01be2308 100644 --- a/src/systemd/nm-sd-utils-dhcp.c +++ b/src/systemd/nm-sd-utils-dhcp.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: LGPL-2.1+ +/* SPDX-License-Identifier: LGPL-2.1+ */ /* * Copyright (C) 2019 Red Hat, Inc. */ @@ -11,30 +11,31 @@ #include "src/libsystemd-network/dhcp-lease-internal.h" int -nm_sd_dhcp_lease_get_private_options (sd_dhcp_lease *lease, nm_sd_dhcp_option **out_options) +nm_sd_dhcp_lease_get_private_options(sd_dhcp_lease *lease, nm_sd_dhcp_option **out_options) { - struct sd_dhcp_raw_option *raw_option; - int cnt = 0; + struct sd_dhcp_raw_option *raw_option; + int cnt = 0; - g_return_val_if_fail (lease, -EINVAL); - g_return_val_if_fail (out_options, -EINVAL); - g_return_val_if_fail (*out_options == NULL, -EINVAL); + g_return_val_if_fail(lease, -EINVAL); + g_return_val_if_fail(out_options, -EINVAL); + g_return_val_if_fail(*out_options == NULL, -EINVAL); - if (lease->private_options == NULL) - return -ENODATA; + if (lease->private_options == NULL) + return -ENODATA; - LIST_FOREACH (options, raw_option, lease->private_options) - cnt++; + LIST_FOREACH(options, raw_option, lease->private_options) + cnt++; - *out_options = g_new (nm_sd_dhcp_option, cnt); - cnt = 0; + *out_options = g_new(nm_sd_dhcp_option, cnt); + cnt = 0; - LIST_FOREACH (options, raw_option, lease->private_options) { - (*out_options)[cnt].code = raw_option->tag; - (*out_options)[cnt].data = raw_option->data; - (*out_options)[cnt].data_len = raw_option->length; - cnt++; - } + LIST_FOREACH(options, raw_option, lease->private_options) + { + (*out_options)[cnt].code = raw_option->tag; + (*out_options)[cnt].data = raw_option->data; + (*out_options)[cnt].data_len = raw_option->length; + cnt++; + } - return cnt; + return cnt; } |