summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2018-02-08 10:34:52 +0100
committerZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2018-02-08 10:34:52 +0100
commit87ac8d998f357b3f7d91af049ef335757f5ada15 (patch)
tree296df646b5c1ae9ece187c41afa00d4d476697da
parentnetworkd: vxlan require Remote= to be a non multicast address (#8117) (diff)
downloadsystemd-87ac8d998f357b3f7d91af049ef335757f5ada15.tar.xz
systemd-87ac8d998f357b3f7d91af049ef335757f5ada15.zip
tree-wide: use "cannot" instead of "can not"
This is the usual spelling, and a bit shorter.
-rw-r--r--src/libsystemd-network/sd-dhcp-client.c12
-rw-r--r--src/libudev/libudev-device.c4
-rw-r--r--src/network/netdev/vxlan.c4
-rw-r--r--src/network/networkd-address.c2
-rw-r--r--src/network/networkd-ipv6-proxy-ndp.c2
-rw-r--r--src/network/networkd-network.c8
-rw-r--r--src/timedate/timedatectl.c2
-rw-r--r--src/timesync/timesyncd.c2
-rw-r--r--src/udev/cdrom_id/cdrom_id.c4
-rw-r--r--src/udev/udev-node.c2
-rw-r--r--src/udev/udevd.c2
11 files changed, 22 insertions, 22 deletions
diff --git a/src/libsystemd-network/sd-dhcp-client.c b/src/libsystemd-network/sd-dhcp-client.c
index 228af69d88..33f3469f07 100644
--- a/src/libsystemd-network/sd-dhcp-client.c
+++ b/src/libsystemd-network/sd-dhcp-client.c
@@ -1260,9 +1260,9 @@ static int client_handle_offer(sd_dhcp_client *client, DHCPMessage *offer, size_
if (!lease->have_subnet_mask) {
r = dhcp_lease_set_default_subnet_mask(lease);
if (r < 0) {
- log_dhcp_client(client, "received lease lacks subnet "
- "mask, and a fallback one can not be "
- "generated, ignoring");
+ log_dhcp_client(client,
+ "received lease lacks subnet mask, "
+ "and a fallback one cannot be generated, ignoring");
return -ENOMSG;
}
}
@@ -1331,9 +1331,9 @@ static int client_handle_ack(sd_dhcp_client *client, DHCPMessage *ack, size_t le
if (lease->subnet_mask == INADDR_ANY) {
r = dhcp_lease_set_default_subnet_mask(lease);
if (r < 0) {
- log_dhcp_client(client, "received lease lacks subnet "
- "mask, and a fallback one can not be "
- "generated, ignoring");
+ log_dhcp_client(client,
+ "received lease lacks subnet mask, "
+ "and a fallback one cannot be generated, ignoring");
return -ENOMSG;
}
}
diff --git a/src/libudev/libudev-device.c b/src/libudev/libudev-device.c
index 82df426491..8e65cfd40a 100644
--- a/src/libudev/libudev-device.c
+++ b/src/libudev/libudev-device.c
@@ -143,7 +143,7 @@ _public_ const char *udev_device_get_driver(struct udev_device *udev_device)
*
* Retrieve the devtype string of the udev device.
*
- * Returns: the devtype name of the udev device, or #NULL if it can not be determined
+ * Returns: the devtype name of the udev device, or #NULL if it cannot be determined
**/
_public_ const char *udev_device_get_devtype(struct udev_device *udev_device)
{
@@ -168,7 +168,7 @@ _public_ const char *udev_device_get_devtype(struct udev_device *udev_device)
* Retrieve the subsystem string of the udev device. The string does not
* contain any "/".
*
- * Returns: the subsystem name of the udev device, or #NULL if it can not be determined
+ * Returns: the subsystem name of the udev device, or #NULL if it cannot be determined
**/
_public_ const char *udev_device_get_subsystem(struct udev_device *udev_device)
{
diff --git a/src/network/netdev/vxlan.c b/src/network/netdev/vxlan.c
index ad050efeca..c9fd931718 100644
--- a/src/network/netdev/vxlan.c
+++ b/src/network/netdev/vxlan.c
@@ -200,14 +200,14 @@ int config_parse_vxlan_address(const char *unit,
if (streq(lvalue, "Group")) {
if (r <= 0) {
- log_syntax(unit, LOG_ERR, filename, line, 0, "vxlan invalid multicast '%s' address, ignoring assignment: %s", lvalue, rvalue);
+ log_syntax(unit, LOG_ERR, filename, line, 0, "vxlan %s invalid multicast address, ignoring assignment: %s", lvalue, rvalue);
return 0;
}
v->remote_family = f;
} else {
if (r > 0) {
- log_syntax(unit, LOG_ERR, filename, line, 0, "vxlan %s can not be multicast address, ignoring assignment: %s", lvalue, rvalue);
+ log_syntax(unit, LOG_ERR, filename, line, 0, "vxlan %s cannot be a multicast address, ignoring assignment: %s", lvalue, rvalue);
return 0;
}
diff --git a/src/network/networkd-address.c b/src/network/networkd-address.c
index ca5b54bdbf..7e722b1a2e 100644
--- a/src/network/networkd-address.c
+++ b/src/network/networkd-address.c
@@ -776,7 +776,7 @@ int config_parse_address(const char *unit,
if (!e && f == AF_INET) {
r = in4_addr_default_prefixlen(&buffer.in, &n->prefixlen);
if (r < 0) {
- log_syntax(unit, LOG_ERR, filename, line, r, "Prefix length not specified, and a default one can not be deduced for '%s', ignoring assignment", address);
+ log_syntax(unit, LOG_ERR, filename, line, r, "Prefix length not specified, and a default one cannot be deduced for '%s', ignoring assignment", address);
return 0;
}
}
diff --git a/src/network/networkd-ipv6-proxy-ndp.c b/src/network/networkd-ipv6-proxy-ndp.c
index 31b7c6b0f4..1a357ac8e6 100644
--- a/src/network/networkd-ipv6-proxy-ndp.c
+++ b/src/network/networkd-ipv6-proxy-ndp.c
@@ -142,7 +142,7 @@ int config_parse_ipv6_proxy_ndp_address(
r = in_addr_is_null(AF_INET6, &buffer);
if (r != 0) {
log_syntax(unit, LOG_ERR, filename, line, r,
- "IPv6 proxy NDP address can not be the ANY address, ignoring: %s", rvalue);
+ "IPv6 proxy NDP address cannot be the ANY address, ignoring: %s", rvalue);
return 0;
}
diff --git a/src/network/networkd-network.c b/src/network/networkd-network.c
index 2dc3de3f6a..48da83c497 100644
--- a/src/network/networkd-network.c
+++ b/src/network/networkd-network.c
@@ -635,13 +635,13 @@ int config_parse_netdev(const char *unit,
case NETDEV_KIND_VCAN:
r = hashmap_put(network->stacked_netdevs, netdev->ifname, netdev);
if (r < 0) {
- log_syntax(unit, LOG_ERR, filename, line, r, "Can not add NetDev '%s' to network: %m", rvalue);
+ log_syntax(unit, LOG_ERR, filename, line, r, "Cannot add NetDev '%s' to network: %m", rvalue);
return 0;
}
break;
default:
- assert_not_reached("Can not parse NetDev");
+ assert_not_reached("Cannot parse NetDev");
}
netdev_ref(netdev);
@@ -894,12 +894,12 @@ int config_parse_ipv6token(
r = in_addr_is_null(AF_INET6, &buffer);
if (r != 0) {
- log_syntax(unit, LOG_ERR, filename, line, r, "IPv6 token can not be the ANY address, ignoring: %s", rvalue);
+ log_syntax(unit, LOG_ERR, filename, line, r, "IPv6 token cannot be the ANY address, ignoring: %s", rvalue);
return 0;
}
if ((buffer.in6.s6_addr32[0] | buffer.in6.s6_addr32[1]) != 0) {
- log_syntax(unit, LOG_ERR, filename, line, 0, "IPv6 token can not be longer than 64 bits, ignoring: %s", rvalue);
+ log_syntax(unit, LOG_ERR, filename, line, 0, "IPv6 token cannot be longer than 64 bits, ignoring: %s", rvalue);
return 0;
}
diff --git a/src/timedate/timedatectl.c b/src/timedate/timedatectl.c
index 19a382c1b2..d0a510468e 100644
--- a/src/timedate/timedatectl.c
+++ b/src/timedate/timedatectl.c
@@ -136,7 +136,7 @@ static void print_status_info(const StatusInfo *i) {
if (i->rtc_local)
printf("\n%s"
"Warning: The system is configured to read the RTC time in the local time zone.\n"
- " This mode can not be fully supported. It will create various problems\n"
+ " This mode cannot be fully supported. It will create various problems\n"
" with time zone changes and daylight saving time adjustments. The RTC\n"
" time is never updated, it relies on external facilities to maintain it.\n"
" If at all possible, use RTC in UTC by calling\n"
diff --git a/src/timesync/timesyncd.c b/src/timesync/timesyncd.c
index bea800171b..3d7cfd5be5 100644
--- a/src/timesync/timesyncd.c
+++ b/src/timesync/timesyncd.c
@@ -147,7 +147,7 @@ int main(int argc, char *argv[]) {
if (clock_is_localtime(NULL) > 0) {
log_info("The system is configured to read the RTC time in the local time zone. "
- "This mode can not be fully supported. All system time to RTC updates are disabled.");
+ "This mode cannot be fully supported. All system time to RTC updates are disabled.");
m->rtc_local_time = true;
}
diff --git a/src/udev/cdrom_id/cdrom_id.c b/src/udev/cdrom_id/cdrom_id.c
index 9644861adc..5e7bebeb16 100644
--- a/src/udev/cdrom_id/cdrom_id.c
+++ b/src/udev/cdrom_id/cdrom_id.c
@@ -566,7 +566,7 @@ static int cd_profiles(struct udev *udev, int fd)
log_debug("GET CONFIGURATION: size of features buffer 0x%04x", len);
if (len > sizeof(features)) {
- log_debug("can not get features in a single query, truncating");
+ log_debug("cannot get features in a single query, truncating");
len = sizeof(features);
} else if (len <= 8)
len = sizeof(features);
@@ -588,7 +588,7 @@ static int cd_profiles(struct udev *udev, int fd)
log_debug("GET CONFIGURATION: size of features buffer 0x%04x", len);
if (len > sizeof(features)) {
- log_debug("can not get features in a single query, truncating");
+ log_debug("cannot get features in a single query, truncating");
len = sizeof(features);
}
diff --git a/src/udev/udev-node.c b/src/udev/udev-node.c
index bb845889cc..6a3ee93ca2 100644
--- a/src/udev/udev-node.c
+++ b/src/udev/udev-node.c
@@ -265,7 +265,7 @@ static int node_permissions_apply(struct udev_device *dev, bool apply,
mode |= S_IFCHR;
if (lstat(devnode, &stats) != 0) {
- err = log_debug_errno(errno, "can not stat() node '%s' (%m)", devnode);
+ err = log_debug_errno(errno, "cannot stat() node '%s' (%m)", devnode);
goto out;
}
diff --git a/src/udev/udevd.c b/src/udev/udevd.c
index 5c757d513f..615c4ed3e2 100644
--- a/src/udev/udevd.c
+++ b/src/udev/udevd.c
@@ -648,7 +648,7 @@ static bool is_devpath_busy(Manager *manager, struct event *event) {
/* check if queue contains events we depend on */
LIST_FOREACH(event, loop_event, manager->events) {
- /* we already found a later event, earlier can not block us, no need to check again */
+ /* we already found a later event, earlier cannot block us, no need to check again */
if (loop_event->seqnum < event->delaying_seqnum)
continue;