tree-wide: use "cannot" instead of "can not"

This is the usual spelling, and a bit shorter.

diff --git a/src/libsystemd-network/sd-dhcp-client.c b/src/libsystemd-network/sd-dhcp-client.c
index 228af69d8880d18e4bd0862168122cf63aa168e8..33f3469f07862277970185aec02f139a1a29a60c 100644 (file)
--- 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 82df426491e38a7f2e4ce414b8c1ebb0942d688c..8e65cfd40a18a52dd351e64fd1f1f439ce53ba2e 100644 (file)
--- 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 ad050efeca6ee56da6897c8b15e3dd0ed5533a7a..c9fd931718d41845cbd2c875190ef60196ae83a1 100644 (file)
--- 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 ca5b54bdbf01529a9db877ae8f4dbe493a0a9e92..7e722b1a2ea2b7fe46a9277a40983c69df4f51f7 100644 (file)
--- 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 31b7c6b0f4f28f170510bbae92810fc117181e09..1a357ac8e6a4e2113b802fcc72c1ed45d0c798b6 100644 (file)
--- 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 2dc3de3f6a005b649447e03d3ea962654365c0e3..48da83c4978f157146f7eea9282c031cc1b5efed 100644 (file)
--- 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 19a382c1b20c094a4699d52e3c6da25b64253d79..d0a510468e8fc6c96458c3cd42ff92a419ecd54b 100644 (file)
--- 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 bea800171b847a173ffff7650412c271663b99cd..3d7cfd5be5036cb47be35f2f36aeb946bcf91d7f 100644 (file)
--- 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 9644861adc912aab700a6921cc870e75e98c35bc..5e7bebeb166c95d403e181fb8d07c4faeb49e739 100644 (file)
--- 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 bb845889cc098963ecdac8f8c14935dc3afa2b67..6a3ee93ca2b4c813c083e8e5749c97c7577da0d5 100644 (file)
--- 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 5c757d513fb88f0efae34f959819f01e7373bb95..615c4ed3e2f33dfd020e53d0f3727541c93a09a2 100644 (file)
--- 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;