sd-network: rename function arguments for storing return value

diff --git a/src/libsystemd/sd-network/sd-network.c b/src/libsystemd/sd-network/sd-network.c
index 408c0a1f471e9c95c81749e4b185e1f52abf6188..d059cee637357ce8b437a219c1964c2f4a8ff929 100644 (file)
--- a/src/libsystemd/sd-network/sd-network.c
+++ b/src/libsystemd/sd-network/sd-network.c
@@ -37,28 +37,28 @@ static int network_get_string(const char *field, char **ret) {
         return 0;
 }
 
-int sd_network_get_operational_state(char **state) {
-        return network_get_string("OPER_STATE", state);
+int sd_network_get_operational_state(char **ret) {
+        return network_get_string("OPER_STATE", ret);
 }
 
-int sd_network_get_carrier_state(char **state) {
-        return network_get_string("CARRIER_STATE", state);
+int sd_network_get_carrier_state(char **ret) {
+        return network_get_string("CARRIER_STATE", ret);
 }
 
-int sd_network_get_address_state(char **state) {
-        return network_get_string("ADDRESS_STATE", state);
+int sd_network_get_address_state(char **ret) {
+        return network_get_string("ADDRESS_STATE", ret);
 }
 
-int sd_network_get_ipv4_address_state(char **state) {
-        return network_get_string("IPV4_ADDRESS_STATE", state);
+int sd_network_get_ipv4_address_state(char **ret) {
+        return network_get_string("IPV4_ADDRESS_STATE", ret);
 }
 
-int sd_network_get_ipv6_address_state(char **state) {
-        return network_get_string("IPV6_ADDRESS_STATE", state);
+int sd_network_get_ipv6_address_state(char **ret) {
+        return network_get_string("IPV6_ADDRESS_STATE", ret);
 }
 
-int sd_network_get_online_state(char **state) {
-        return network_get_string("ONLINE_STATE", state);
+int sd_network_get_online_state(char **ret) {
+        return network_get_string("ONLINE_STATE", ret);
 }
 
 static int network_get_strv(const char *key, char ***ret) {
@@ -161,23 +161,23 @@ static int network_link_get_strv(int ifindex, const char *key, char ***ret) {
         return r;
 }
 
-int sd_network_link_get_setup_state(int ifindex, char **state) {
-        return network_link_get_string(ifindex, "ADMIN_STATE", state);
+int sd_network_link_get_setup_state(int ifindex, char **ret) {
+        return network_link_get_string(ifindex, "ADMIN_STATE", ret);
 }
 
-int sd_network_link_get_network_file(int ifindex, char **filename) {
-        return network_link_get_string(ifindex, "NETWORK_FILE", filename);
+int sd_network_link_get_network_file(int ifindex, char **ret) {
+        return network_link_get_string(ifindex, "NETWORK_FILE", ret);
 }
 
-int sd_network_link_get_operational_state(int ifindex, char **state) {
-        return network_link_get_string(ifindex, "OPER_STATE", state);
+int sd_network_link_get_operational_state(int ifindex, char **ret) {
+        return network_link_get_string(ifindex, "OPER_STATE", ret);
 }
 
-int sd_network_link_get_required_family_for_online(int ifindex, char **state) {
+int sd_network_link_get_required_family_for_online(int ifindex, char **ret) {
         _cleanup_free_ char *s = NULL;
         int r;
 
-        assert_return(state, -EINVAL);
+        assert_return(ret, -EINVAL);
 
         r = network_link_get_string(ifindex, "REQUIRED_FAMILY_FOR_ONLINE", &s);
         if (r < 0) {
@@ -189,36 +189,36 @@ int sd_network_link_get_required_family_for_online(int ifindex, char **state) {
                         return -ENOMEM;
         }
 
-        *state = TAKE_PTR(s);
+        *ret = TAKE_PTR(s);
         return 0;
 }
 
-int sd_network_link_get_carrier_state(int ifindex, char **state) {
-        return network_link_get_string(ifindex, "CARRIER_STATE", state);
+int sd_network_link_get_carrier_state(int ifindex, char **ret) {
+        return network_link_get_string(ifindex, "CARRIER_STATE", ret);
 }
 
-int sd_network_link_get_address_state(int ifindex, char **state) {
-        return network_link_get_string(ifindex, "ADDRESS_STATE", state);
+int sd_network_link_get_address_state(int ifindex, char **ret) {
+        return network_link_get_string(ifindex, "ADDRESS_STATE", ret);
 }
 
-int sd_network_link_get_ipv4_address_state(int ifindex, char **state) {
-        return network_link_get_string(ifindex, "IPV4_ADDRESS_STATE", state);
+int sd_network_link_get_ipv4_address_state(int ifindex, char **ret) {
+        return network_link_get_string(ifindex, "IPV4_ADDRESS_STATE", ret);
 }
 
-int sd_network_link_get_ipv6_address_state(int ifindex, char **state) {
-        return network_link_get_string(ifindex, "IPV6_ADDRESS_STATE", state);
+int sd_network_link_get_ipv6_address_state(int ifindex, char **ret) {
+        return network_link_get_string(ifindex, "IPV6_ADDRESS_STATE", ret);
 }
 
-int sd_network_link_get_online_state(int ifindex, char **state) {
-        return network_link_get_string(ifindex, "ONLINE_STATE", state);
+int sd_network_link_get_online_state(int ifindex, char **ret) {
+        return network_link_get_string(ifindex, "ONLINE_STATE", ret);
 }
 
-int sd_network_link_get_dhcp6_client_iaid_string(int ifindex, char **iaid) {
-        return network_link_get_string(ifindex, "DHCP6_CLIENT_IAID", iaid);
+int sd_network_link_get_dhcp6_client_iaid_string(int ifindex, char **ret) {
+        return network_link_get_string(ifindex, "DHCP6_CLIENT_IAID", ret);
 }
 
-int sd_network_link_get_dhcp6_client_duid_string(int ifindex, char **duid) {
-        return network_link_get_string(ifindex, "DHCP6_CLIENT_DUID", duid);
+int sd_network_link_get_dhcp6_client_duid_string(int ifindex, char **ret) {
+        return network_link_get_string(ifindex, "DHCP6_CLIENT_DUID", ret);
 }
 
 int sd_network_link_get_required_for_online(int ifindex) {
@@ -236,11 +236,11 @@ int sd_network_link_get_required_for_online(int ifindex) {
         return parse_boolean(s);
 }
 
-int sd_network_link_get_required_operstate_for_online(int ifindex, char **state) {
+int sd_network_link_get_required_operstate_for_online(int ifindex, char **ret) {
         _cleanup_free_ char *s = NULL;
         int r;
 
-        assert_return(state, -EINVAL);
+        assert_return(ret, -EINVAL);
 
         r = network_link_get_string(ifindex, "REQUIRED_OPER_STATE_FOR_ONLINE", &s);
         if (r < 0) {
@@ -253,15 +253,15 @@ int sd_network_link_get_required_operstate_for_online(int ifindex, char **state)
                         return -ENOMEM;
         }
 
-        *state = TAKE_PTR(s);
+        *ret = TAKE_PTR(s);
         return 0;
 }
 
-int sd_network_link_get_activation_policy(int ifindex, char **policy) {
+int sd_network_link_get_activation_policy(int ifindex, char **ret) {
         _cleanup_free_ char *s = NULL;
         int r;
 
-        assert_return(policy, -EINVAL);
+        assert_return(ret, -EINVAL);
 
         r = network_link_get_string(ifindex, "ACTIVATION_POLICY", &s);
         if (r < 0) {
@@ -274,28 +274,28 @@ int sd_network_link_get_activation_policy(int ifindex, char **policy) {
                         return -ENOMEM;
         }
 
-        *policy = TAKE_PTR(s);
+        *ret = TAKE_PTR(s);
         return 0;
 }
 
-int sd_network_link_get_llmnr(int ifindex, char **llmnr) {
-        return network_link_get_string(ifindex, "LLMNR", llmnr);
+int sd_network_link_get_llmnr(int ifindex, char **ret) {
+        return network_link_get_string(ifindex, "LLMNR", ret);
 }
 
-int sd_network_link_get_mdns(int ifindex, char **mdns) {
-        return network_link_get_string(ifindex, "MDNS", mdns);
+int sd_network_link_get_mdns(int ifindex, char **ret) {
+        return network_link_get_string(ifindex, "MDNS", ret);
 }
 
-int sd_network_link_get_dns_over_tls(int ifindex, char **dns_over_tls) {
-        return network_link_get_string(ifindex, "DNS_OVER_TLS", dns_over_tls);
+int sd_network_link_get_dns_over_tls(int ifindex, char **ret) {
+        return network_link_get_string(ifindex, "DNS_OVER_TLS", ret);
 }
 
-int sd_network_link_get_dnssec(int ifindex, char **dnssec) {
-        return network_link_get_string(ifindex, "DNSSEC", dnssec);
+int sd_network_link_get_dnssec(int ifindex, char **ret) {
+        return network_link_get_string(ifindex, "DNSSEC", ret);
 }
 
-int sd_network_link_get_dnssec_negative_trust_anchors(int ifindex, char ***nta) {
-        return network_link_get_strv(ifindex, "DNSSEC_NTA", nta);
+int sd_network_link_get_dnssec_negative_trust_anchors(int ifindex, char ***ret) {
+        return network_link_get_strv(ifindex, "DNSSEC_NTA", ret);
 }
 
 int sd_network_link_get_dns(int ifindex, char ***ret) {
@@ -520,14 +520,13 @@ int sd_network_monitor_get_events(sd_network_monitor *m) {
         return POLLIN;
 }
 
-int sd_network_monitor_get_timeout(sd_network_monitor *m, uint64_t *timeout_usec) {
-
+int sd_network_monitor_get_timeout(sd_network_monitor *m, uint64_t *ret_usec) {
         assert_return(m, -EINVAL);
-        assert_return(timeout_usec, -EINVAL);
+        assert_return(ret_usec, -EINVAL);
 
         /* For now we will only return UINT64_MAX, since we don't
          * need any timeout. However, let's have this API to keep our
          * options open should we later on need it. */
-        *timeout_usec = UINT64_MAX;
+        *ret_usec = UINT64_MAX;
         return 0;
 }

diff --git a/src/systemd/sd-network.h b/src/systemd/sd-network.h
index dfbbc28276a1445ae4c6dd282fb8e65170ec0960..b89e035fd64779d4a9be8743947425f11c62a238 100644 (file)
--- a/src/systemd/sd-network.h
+++ b/src/systemd/sd-network.h
@@ -49,26 +49,26 @@ _SD_BEGIN_DECLARATIONS;
  * Possible return codes:
  *   -ENODATA: networkd is not aware of any links
  */
-int sd_network_get_operational_state(char **state);
-int sd_network_get_carrier_state(char **state);
-int sd_network_get_address_state(char **state);
-int sd_network_get_ipv4_address_state(char **state);
-int sd_network_get_ipv6_address_state(char **state);
-int sd_network_get_online_state(char **state);
+int sd_network_get_operational_state(char **ret);
+int sd_network_get_carrier_state(char **ret);
+int sd_network_get_address_state(char **ret);
+int sd_network_get_ipv4_address_state(char **ret);
+int sd_network_get_ipv6_address_state(char **ret);
+int sd_network_get_online_state(char **ret);
 
 /* Get DNS entries for all links. These are string representations of
  * IP addresses */
-int sd_network_get_dns(char ***dns);
+int sd_network_get_dns(char ***ret);
 
 /* Get NTP entries for all links. These are domain names or string
  * representations of IP addresses */
-int sd_network_get_ntp(char ***ntp);
+int sd_network_get_ntp(char ***ret);
 
 /* Get the search domains for all links. */
-int sd_network_get_search_domains(char ***domains);
+int sd_network_get_search_domains(char ***ret);
 
 /* Get the search domains for all links. */
-int sd_network_get_route_domains(char ***domains);
+int sd_network_get_route_domains(char ***ret);
 
 /* Get setup state from ifindex.
  * Possible states:
@@ -81,7 +81,7 @@ int sd_network_get_route_domains(char ***domains);
  * Possible return codes:
  *   -ENODATA: networkd is not aware of the link
  */
-int sd_network_link_get_setup_state(int ifindex, char **state);
+int sd_network_link_get_setup_state(int ifindex, char **ret);
 
 /* Get operational state from ifindex.
  * Possible states:
@@ -94,14 +94,14 @@ int sd_network_link_get_setup_state(int ifindex, char **state);
  * Possible return codes:
  *   -ENODATA: networkd is not aware of the link
  */
-int sd_network_link_get_operational_state(int ifindex, char **state);
-int sd_network_link_get_required_operstate_for_online(int ifindex, char **state);
-int sd_network_link_get_required_family_for_online(int ifindex, char **state);
-int sd_network_link_get_carrier_state(int ifindex, char **state);
-int sd_network_link_get_address_state(int ifindex, char **state);
-int sd_network_link_get_ipv4_address_state(int ifindex, char **state);
-int sd_network_link_get_ipv6_address_state(int ifindex, char **state);
-int sd_network_link_get_online_state(int ifindex, char **state);
+int sd_network_link_get_operational_state(int ifindex, char **ret);
+int sd_network_link_get_required_operstate_for_online(int ifindex, char **ret);
+int sd_network_link_get_required_family_for_online(int ifindex, char **ret);
+int sd_network_link_get_carrier_state(int ifindex, char **ret);
+int sd_network_link_get_address_state(int ifindex, char **ret);
+int sd_network_link_get_ipv4_address_state(int ifindex, char **ret);
+int sd_network_link_get_ipv6_address_state(int ifindex, char **ret);
+int sd_network_link_get_online_state(int ifindex, char **ret);
 
 /* Indicates whether the network is relevant to being online.
  * Possible return codes:
@@ -114,10 +114,10 @@ int sd_network_link_get_required_for_online(int ifindex);
 /* Get activation policy for ifindex.
  * Possible values are as specified for ActivationPolicy=
  */
-int sd_network_link_get_activation_policy(int ifindex, char **policy);
+int sd_network_link_get_activation_policy(int ifindex, char **ret);
 
 /* Get path to .network file applied to link */
-int sd_network_link_get_network_file(int ifindex, char **filename);
+int sd_network_link_get_network_file(int ifindex, char **ret);
 
 /* Get DNS entries for a given link. These are string representations of
  * IP addresses */
@@ -136,7 +136,7 @@ int sd_network_link_get_sip(int ifindex, char ***ret);
  * Possible return codes:
  *   -ENODATA: networkd is not aware of the link
  */
-int sd_network_link_get_llmnr(int ifindex, char **llmnr);
+int sd_network_link_get_llmnr(int ifindex, char **ret);
 
 /* Indicates whether or not MulticastDNS should be enabled for the
  * link.
@@ -144,7 +144,7 @@ int sd_network_link_get_llmnr(int ifindex, char **llmnr);
  * Possible return codes:
  *   -ENODATA: networkd is not aware of the link
  */
-int sd_network_link_get_mdns(int ifindex, char **mdns);
+int sd_network_link_get_mdns(int ifindex, char **ret);
 
 /* Indicates whether or not DNS-over-TLS should be enabled for the
  * link.
@@ -152,41 +152,41 @@ int sd_network_link_get_mdns(int ifindex, char **mdns);
  * Possible return codes:
  *   -ENODATA: networkd is not aware of the link
  */
-int sd_network_link_get_dns_over_tls(int ifindex, char **dns_over_tls);
+int sd_network_link_get_dns_over_tls(int ifindex, char **ret);
 
 /* Indicates whether or not DNSSEC should be enabled for the link
  * Possible levels of support: yes, no, allow-downgrade
  * Possible return codes:
  *   -ENODATA: networkd is not aware of the link
  */
-int sd_network_link_get_dnssec(int ifindex, char **dnssec);
+int sd_network_link_get_dnssec(int ifindex, char **ret);
 
 /* Returns the list of per-interface DNSSEC negative trust anchors
  * Possible return codes:
  *   -ENODATA: networkd is not aware of the link, or has no such data
  */
-int sd_network_link_get_dnssec_negative_trust_anchors(int ifindex, char ***nta);
+int sd_network_link_get_dnssec_negative_trust_anchors(int ifindex, char ***ret);
 
 /* Get the search DNS domain names for a given link. */
-int sd_network_link_get_search_domains(int ifindex, char ***domains);
+int sd_network_link_get_search_domains(int ifindex, char ***ret);
 
 /* Get the route DNS domain names for a given link. */
-int sd_network_link_get_route_domains(int ifindex, char ***domains);
+int sd_network_link_get_route_domains(int ifindex, char ***ret);
 
 /* Get whether this link shall be used as 'default route' for DNS queries */
 int sd_network_link_get_dns_default_route(int ifindex);
 
 /* Get the carrier interface indexes to which current link is bound to. */
-int sd_network_link_get_carrier_bound_to(int ifindex, int **ifindexes);
+int sd_network_link_get_carrier_bound_to(int ifindex, int **ret);
 
 /* Get the CARRIERS that are bound to current link. */
-int sd_network_link_get_carrier_bound_by(int ifindex, int **ifindexes);
+int sd_network_link_get_carrier_bound_by(int ifindex, int **ret);
 
 /* Get DHCPv6 client IAID for a given link. */
-int sd_network_link_get_dhcp6_client_iaid_string(int ifindex, char **iaid);
+int sd_network_link_get_dhcp6_client_iaid_string(int ifindex, char **ret);
 
 /* Get DHCPv6 client DUID for a given link. */
-int sd_network_link_get_dhcp6_client_duid_string(int ifindex, char **duid);
+int sd_network_link_get_dhcp6_client_duid_string(int ifindex, char **ret);
 
 int sd_network_link_get_stat(int ifindex, struct stat *ret);
 
@@ -209,7 +209,7 @@ int sd_network_monitor_get_fd(sd_network_monitor *m);
 int sd_network_monitor_get_events(sd_network_monitor *m);
 
 /* Get timeout for poll(), as usec value relative to CLOCK_MONOTONIC's epoch */
-int sd_network_monitor_get_timeout(sd_network_monitor *m, uint64_t *timeout_usec);
+int sd_network_monitor_get_timeout(sd_network_monitor *m, uint64_t *ret_usec);
 
 _SD_DEFINE_POINTER_CLEANUP_FUNC(sd_network_monitor, sd_network_monitor_unref);