diff options
author | Daniel Mack <github@zonque.org> | 2016-07-18 09:54:06 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-07-18 09:54:06 +0200 |
commit | d909beef0a97d931de92723746a4e3ae9c7f1194 (patch) | |
tree | 4d70c4cdb45829ba01d3c5a4a0afee1e695a71cf | |
parent | ccc2c98e1b0c06861577632440b996ca16cefd53 (diff) | |
parent | fc549b96054d52bbde68a4aa773bf4037700d389 (diff) |
Merge pull request #3746 from keszybz/trivial-fixes
Trivial fixes
-rw-r--r-- | man/systemd-resolved.service.xml | 4 | ||||
-rw-r--r-- | man/systemd.netdev.xml | 2 | ||||
-rw-r--r-- | man/systemd.target.xml | 2 | ||||
-rw-r--r-- | src/basic/strv.c | 3 | ||||
-rw-r--r-- | src/resolve/resolve-tool.c | 10 |
5 files changed, 10 insertions, 11 deletions
diff --git a/man/systemd-resolved.service.xml b/man/systemd-resolved.service.xml index 0df037ba69..141b06e374 100644 --- a/man/systemd-resolved.service.xml +++ b/man/systemd-resolved.service.xml @@ -68,8 +68,8 @@ link-local networking).</para></listitem> <listitem><para>The glibc - <citerefentry><refentrytitle>getaddrinfo</refentrytitle><manvolnum>3</manvolnum></citerefentry> API (as defined - by <ulink url="https://tools.ietf.org/html/rfc3493">RFC3493</ulink>) and its related resolver functions, + <citerefentry><refentrytitle>getaddrinfo</refentrytitle><manvolnum>3</manvolnum></citerefentry> API as defined + by <ulink url="https://tools.ietf.org/html/rfc3493">RFC3493</ulink> and its related resolver functions, including <citerefentry><refentrytitle>gethostbyname</refentrytitle><manvolnum>3</manvolnum></citerefentry>. This API is widely supported, including beyond the Linux platform. In its current form it does not expose DNSSEC validation status information however, and is synchronous only. This API is backed by the glibc Name Service diff --git a/man/systemd.netdev.xml b/man/systemd.netdev.xml index 38aede84cb..a5c6f0fa40 100644 --- a/man/systemd.netdev.xml +++ b/man/systemd.netdev.xml @@ -651,7 +651,7 @@ It is used as mark-configured SAD/SPD entry as part of the lookup key (both in data and control path) in ip xfrm (framework used to implement IPsec protocol). See <ulink url="http://man7.org/linux/man-pages/man8/ip-xfrm.8.html"> - ip-xfrm - transform configuration</ulink> for details. It is only used for VTI/VTI6 + ip-xfrm — transform configuration</ulink> for details. It is only used for VTI/VTI6 tunnels.</para> </listitem> </varlistentry> diff --git a/man/systemd.target.xml b/man/systemd.target.xml index 645d8493c1..2e35e54fc4 100644 --- a/man/systemd.target.xml +++ b/man/systemd.target.xml @@ -88,7 +88,7 @@ configured dependencies of type <varname>Wants=</varname> or <varname>Requires=</varname> with dependencies of type <varname>After=</varname>. Note that <varname>Wants=</varname> or - <varname>Requires=</varname> must be defined in the target unit itself - if + <varname>Requires=</varname> must be defined in the target unit itself — if you for example define <varname>Wants=</varname>some.target in some.service, the implicit ordering will not be added.</para> diff --git a/src/basic/strv.c b/src/basic/strv.c index e0e2d1ebbe..db315ac10a 100644 --- a/src/basic/strv.c +++ b/src/basic/strv.c @@ -803,9 +803,8 @@ char **strv_reverse(char **l) { if (n <= 1) return l; - for (i = 0; i < n / 2; i++) { + for (i = 0; i < n / 2; i++) SWAP_TWO(l[i], l[n-1-i]); - } return l; } diff --git a/src/resolve/resolve-tool.c b/src/resolve/resolve-tool.c index 4e1e916669..6ae3750417 100644 --- a/src/resolve/resolve-tool.c +++ b/src/resolve/resolve-tool.c @@ -1229,8 +1229,8 @@ static int status_ifindex(sd_bus *bus, int ifindex, const char *name, bool *empt yes_no(link_info.dnssec_supported)); STRV_FOREACH(i, link_info.dns) { - printf(" %s %s\n", - i == link_info.dns ? "DNS Server:" : " ", + printf(" %s %s\n", + i == link_info.dns ? "DNS Servers:" : " ", *i); } @@ -1412,8 +1412,8 @@ static int status_global(sd_bus *bus, bool *empty_line) { printf("%sGlobal%s\n", ansi_highlight(), ansi_normal()); STRV_FOREACH(i, global_info.dns) { - printf(" %s %s\n", - i == global_info.dns ? "DNS Server:" : " ", + printf(" %s %s\n", + i == global_info.dns ? "DNS Servers:" : " ", *i); } @@ -1446,7 +1446,7 @@ static int status_all(sd_bus *bus) { _cleanup_(sd_netlink_message_unrefp) sd_netlink_message *req = NULL, *reply = NULL; _cleanup_(sd_netlink_unrefp) sd_netlink *rtnl = NULL; sd_netlink_message *i; - bool empty_line = true; + bool empty_line = false; int r; assert(bus); |