]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
dissect: use structured initialization, it's prettier
authorLennart Poettering <lennart@poettering.net>
Thu, 17 Sep 2020 14:56:09 +0000 (16:56 +0200)
committerLennart Poettering <lennart@poettering.net>
Thu, 17 Sep 2020 16:02:45 +0000 (18:02 +0200)
src/shared/dissect-image.c

index 2c339e38b85866ec786b4eccbc526da741c66d1c..b704268db2423e71e765360b9e8aab6085fdd2d8 100644 (file)
@@ -1321,9 +1321,10 @@ static int decrypt_partition(
                 return r == -EPERM ? -EKEYREJECTED : r;
         }
 
-        d->decrypted[d->n_decrypted].name = TAKE_PTR(name);
-        d->decrypted[d->n_decrypted].device = TAKE_PTR(cd);
-        d->n_decrypted++;
+        d->decrypted[d->n_decrypted++] = (DecryptedPartition) {
+                .name = TAKE_PTR(name),
+                .device = TAKE_PTR(cd),
+        };
 
         m->decrypted_node = TAKE_PTR(node);
 
@@ -1540,9 +1541,10 @@ static int verity_partition(
         /* Everything looks good and we'll be able to mount the device, so deferred remove will be re-enabled at that point. */
         restore_deferred_remove = mfree(restore_deferred_remove);
 
-        d->decrypted[d->n_decrypted].name = TAKE_PTR(name);
-        d->decrypted[d->n_decrypted].device = TAKE_PTR(cd);
-        d->n_decrypted++;
+        d->decrypted[d->n_decrypted++] = (DecryptedPartition) {
+                .name = TAKE_PTR(name),
+                .device = TAKE_PTR(cd),
+        };
 
         m->decrypted_node = TAKE_PTR(node);