summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2022-06-07 15:15:17 +0200
committerZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2022-06-09 13:25:17 +0200
commit8b98cfb7dd090b1f5c927012eff3471938f14ac4 (patch)
treed24ad9d166577a77162d674ab4f648b166b2bef8 /src
parentResolve conflicts between #23616 and the recent NFT additions (diff)
downloadsystemd-8b98cfb7dd090b1f5c927012eff3471938f14ac4.tar.xz
systemd-8b98cfb7dd090b1f5c927012eff3471938f14ac4.zip
various: indentation
Diffstat (limited to 'src')
-rw-r--r--src/core/dynamic-user.c17
-rw-r--r--src/shared/libfido2-util.c5
2 files changed, 11 insertions, 11 deletions
diff --git a/src/core/dynamic-user.c b/src/core/dynamic-user.c
index 04d8e7c5e3..18b36e74bf 100644
--- a/src/core/dynamic-user.c
+++ b/src/core/dynamic-user.c
@@ -328,8 +328,8 @@ static int dynamic_user_pop(DynamicUser *d, uid_t *ret_uid, int *ret_lock_fd) {
assert(ret_uid);
assert(ret_lock_fd);
- /* Read the UID and lock fd that is stored in the storage AF_UNIX socket. This should be called with the lock
- * on the socket taken. */
+ /* Read the UID and lock fd that is stored in the storage AF_UNIX socket. This should be called with
+ * the lock on the socket taken. */
k = receive_one_fd_iov(d->storage_socket[0], &iov, 1, MSG_DONTWAIT, &lock_fd);
if (k < 0)
@@ -531,7 +531,8 @@ int dynamic_user_current(DynamicUser *d, uid_t *ret) {
assert(d);
- /* Get the currently assigned UID for the user, if there's any. This simply pops the data from the storage socket, and pushes it back in right-away. */
+ /* Get the currently assigned UID for the user, if there's any. This simply pops the data from the
+ * storage socket, and pushes it back in right-away. */
r = lockfp(d->storage_socket[0], &storage_socket0_lock);
if (r < 0)
@@ -555,9 +556,9 @@ static DynamicUser* dynamic_user_unref(DynamicUser *d) {
if (!d)
return NULL;
- /* Note that this doesn't actually release any resources itself. If a dynamic user should be fully destroyed
- * and its UID released, use dynamic_user_destroy() instead. NB: the dynamic user table may contain entries
- * with no references, which is commonly the case right before a daemon reload. */
+ /* Note that this doesn't actually release any resources itself. If a dynamic user should be fully
+ * destroyed and its UID released, use dynamic_user_destroy() instead. NB: the dynamic user table may
+ * contain entries with no references, which is commonly the case right before a daemon reload. */
assert(d->n_ref > 0);
d->n_ref--;
@@ -571,8 +572,8 @@ static int dynamic_user_close(DynamicUser *d) {
uid_t uid;
int r;
- /* Release the user ID, by releasing the lock on it, and emptying the storage socket. After this the user is
- * unrealized again, much like it was after it the DynamicUser object was first allocated. */
+ /* Release the user ID, by releasing the lock on it, and emptying the storage socket. After this the
+ * user is unrealized again, much like it was after it the DynamicUser object was first allocated. */
r = lockfp(d->storage_socket[0], &storage_socket0_lock);
if (r < 0)
diff --git a/src/shared/libfido2-util.c b/src/shared/libfido2-util.c
index 796dc4079e..525849ee19 100644
--- a/src/shared/libfido2-util.c
+++ b/src/shared/libfido2-util.c
@@ -133,9 +133,8 @@ static int verify_features(
assert(path);
if (!sym_fido_dev_is_fido2(d))
- return log_full_errno(log_level,
- SYNTHETIC_ERRNO(ENODEV),
- "Specified device %s is not a FIDO2 device.", path);
+ return log_full_errno(log_level, SYNTHETIC_ERRNO(ENODEV),
+ "Specified device %s is not a FIDO2 device.", path);
di = sym_fido_cbor_info_new();
if (!di)