diff options
author | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2023-07-01 23:33:20 +0200 |
---|---|---|
committer | Luca Boccassi <luca.boccassi@gmail.com> | 2023-07-02 12:10:12 +0200 |
commit | da890466433279d2a6714e3571fc8d7dc4369e4d (patch) | |
tree | f494ead2b43466772758711ebb9c9b9841b053e3 /src/nspawn | |
parent | NEWS: reword/fix/extend the entries for v254 (diff) | |
download | systemd-da890466433279d2a6714e3571fc8d7dc4369e4d.tar.xz systemd-da890466433279d2a6714e3571fc8d7dc4369e4d.zip |
tree-wide: "<n>bit" → "<n>-bit"
In some places, "<n> bits" is used when more appropriate.
Diffstat (limited to 'src/nspawn')
-rw-r--r-- | src/nspawn/nspawn-network.c | 4 | ||||
-rw-r--r-- | src/nspawn/nspawn-patch-uid.c | 6 | ||||
-rw-r--r-- | src/nspawn/nspawn.c | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/src/nspawn/nspawn-network.c b/src/nspawn/nspawn-network.c index c2ba00c438..89b50026db 100644 --- a/src/nspawn/nspawn-network.c +++ b/src/nspawn/nspawn-network.c @@ -211,10 +211,10 @@ static int shorten_ifname(char *ifname) { if (naming_scheme_has(NAMING_NSPAWN_LONG_HASH)) { uint64_t h; - /* Calculate 64bit hash value */ + /* Calculate 64-bit hash value */ h = siphash24(ifname, strlen(ifname), SHORTEN_IFNAME_HASH_KEY.bytes); - /* Set the final four bytes (i.e. 32bit) to the lower 24bit of the hash, encoded in url-safe base64 */ + /* Set the final four bytes (i.e. 32-bit) to the lower 24bit of the hash, encoded in url-safe base64 */ memcpy(new_ifname, ifname, IFNAMSIZ - 5); new_ifname[IFNAMSIZ - 5] = urlsafe_base64char(h >> 18); new_ifname[IFNAMSIZ - 4] = urlsafe_base64char(h >> 12); diff --git a/src/nspawn/nspawn-patch-uid.c b/src/nspawn/nspawn-patch-uid.c index 21a1707312..66663adc2b 100644 --- a/src/nspawn/nspawn-patch-uid.c +++ b/src/nspawn/nspawn-patch-uid.c @@ -408,7 +408,7 @@ static int fd_patch_uid_internal(int fd, bool donate_fd, uid_t shift, uid_t rang /* Recursively adjusts the UID/GIDs of all files of a directory tree. This is used to automatically fix up an * OS tree to the used user namespace UID range. Note that this automatic adjustment only works for UID ranges - * following the concept that the upper 16bit of a UID identify the container, and the lower 16bit are the actual + * following the concept that the upper 16-bit of a UID identify the container, and the lower 16-bit are the actual * UID within the container. */ if ((shift & 0xFFFF) != 0) { @@ -423,7 +423,7 @@ static int fd_patch_uid_internal(int fd, bool donate_fd, uid_t shift, uid_t rang } if (range != 0x10000) { - /* We only support containers with 16bit UID ranges for the patching logic */ + /* We only support containers with 16-bit UID ranges for the patching logic */ r = -EOPNOTSUPP; goto finish; } @@ -440,7 +440,7 @@ static int fd_patch_uid_internal(int fd, bool donate_fd, uid_t shift, uid_t rang } /* Try to detect if the range is already right. Of course, this a pretty drastic optimization, as we assume - * that if the top-level dir has the right upper 16bit assigned, then everything below will have too... */ + * that if the top-level dir has the right upper 16-bit assigned, then everything below will have too... */ if (((uint32_t) (st.st_uid ^ shift) >> 16) == 0) return 0; diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c index 4fdb5e9fd7..e170958fc5 100644 --- a/src/nspawn/nspawn.c +++ b/src/nspawn/nspawn.c @@ -1393,7 +1393,7 @@ static int parse_argv(int argc, char *argv[]) { if (r < 0) return log_error_errno(r, "Failed to parse root hash: %s", optarg); if (l < sizeof(sd_id128_t)) - return log_error_errno(SYNTHETIC_ERRNO(EINVAL), "Root hash must be at least 128bit long: %s", optarg); + return log_error_errno(SYNTHETIC_ERRNO(EINVAL), "Root hash must be at least 128-bit long: %s", optarg); free_and_replace(arg_verity_settings.root_hash, k); arg_verity_settings.root_hash_size = l; |