tree-wide: drop space between variable and an increment/decrement

diff --git a/src/basic/env-util.c b/src/basic/env-util.c
index 7ac47732ba823e825493df44f58edf93fc051fcc..23a128bfd136b02ffc3630c20f10ed63f3c7e4fc 100644 (file)
--- a/src/basic/env-util.c
+++ b/src/basic/env-util.c
@@ -683,7 +683,7 @@ int replace_env_full(
         pu = ret_unset_variables ? &unset_variables : NULL;
         pb = ret_bad_variables ? &bad_variables : NULL;
 
-        for (e = format, i = 0; *e && i < n; e ++, i ++)
+        for (e = format, i = 0; *e && i < n; e++, i++)
                 switch (state) {
 
                 case WORD:

diff --git a/src/basic/path-util.h b/src/basic/path-util.h
index 6d943e967f27d044a26cfb5d39c69640e33dcc4d..39b6714525e95d20170a32ae2c15760dcb752d25 100644 (file)
--- a/src/basic/path-util.h
+++ b/src/basic/path-util.h
@@ -156,7 +156,7 @@ int fsck_exists_for_fstype(const char *fstype);
                 char *_p, *_n;                                          \
                 size_t _l;                                              \
                 while (_path[0] == '/' && _path[1] == '/')              \
-                        _path ++;                                       \
+                        _path++;                                        \
                 if (isempty(_root))                                     \
                         _ret = _path;                                   \
                 else {                                                  \

diff --git a/src/basic/socket-util.c b/src/basic/socket-util.c
index 4f28d16b5e4b275ae2e66775195e7cbe1f2d1d37..86472c88474f6de43ab1e9037b3991bbca6d8a68 100644 (file)
--- a/src/basic/socket-util.c
+++ b/src/basic/socket-util.c
@@ -547,7 +547,7 @@ int sockaddr_pretty(
                         } else {
                                 if (path[path_len - 1] == '\0')
                                         /* We expect a terminating NUL and don't print it */
-                                        path_len --;
+                                        path_len--;
 
                                 p = cescape_length(path, path_len);
                         }

diff --git a/src/boot/bootctl.c b/src/boot/bootctl.c
index 4614ca17801c2fcdb1724cfe91cb4d8dfa75603b..f608e8cc8e0a917dc31e90b388c1e25cf9e7d995 100644 (file)
--- a/src/boot/bootctl.c
+++ b/src/boot/bootctl.c
@@ -324,7 +324,7 @@ static int parse_argv(int argc, char *argv[]) {
                         break;
 
                 case 'R':
-                        arg_print_root_device ++;
+                        arg_print_root_device++;
                         break;
 
                 case ARG_NO_VARIABLES:

diff --git a/src/core/dbus-job.c b/src/core/dbus-job.c
index c88d8c2dd5fc3eec11be3581095302df5c120b2e..56ad88570f11cda3e2a5bfb251ecbb7fa472ce65 100644 (file)
--- a/src/core/dbus-job.c
+++ b/src/core/dbus-job.c
@@ -87,7 +87,7 @@ int bus_job_method_get_waiting_jobs(sd_bus_message *message, void *userdata, sd_
         if (r < 0)
                 return r;
 
-        for (int i = 0; i < n; i ++) {
+        for (int i = 0; i < n; i++) {
                 _cleanup_free_ char *unit_path = NULL, *job_path = NULL;
 
                 job_path = job_dbus_path(list[i]);

diff --git a/src/core/namespace.c b/src/core/namespace.c
index 50d7b05aa094f9cd9ab1c8601ffc50ae2b00bcf7..df6d0b4485c76ea52402a8bce7d6f6fa8a5efcf0 100644 (file)
--- a/src/core/namespace.c
+++ b/src/core/namespace.c
@@ -1469,7 +1469,7 @@ static int follow_symlink(
 
         mount_entry_consume_prefix(m, TAKE_PTR(target));
 
-        m->n_followed ++;
+        m->n_followed++;
 
         return 0;
 }
@@ -2625,7 +2625,7 @@ int bind_mount_add(BindMount **b, size_t *n, const BindMount *item) {
 
         *b = c;
 
-        c[(*n) ++] = (BindMount) {
+        c[(*n)++] = (BindMount) {
                 .source = TAKE_PTR(s),
                 .destination = TAKE_PTR(d),
                 .read_only = item->read_only,
@@ -2694,7 +2694,7 @@ int mount_image_add(MountImage **m, size_t *n, const MountImage *item) {
 
         *m = c;
 
-        c[(*n) ++] = (MountImage) {
+        c[(*n)++] = (MountImage) {
                 .source = TAKE_PTR(s),
                 .destination = TAKE_PTR(d),
                 .mount_options = TAKE_PTR(options),
@@ -2745,7 +2745,7 @@ int temporary_filesystem_add(
 
         *t = c;
 
-        c[(*n) ++] = (TemporaryFileSystem) {
+        c[(*n)++] = (TemporaryFileSystem) {
                 .path = TAKE_PTR(p),
                 .options = TAKE_PTR(o),
         };

diff --git a/src/core/path.c b/src/core/path.c
index 471d159d81de0e1a05af16eee033524d3abb2f57..f6b5683467a13bac47c6aadee67ea3c247334657 100644 (file)
--- a/src/core/path.c
+++ b/src/core/path.c
@@ -90,7 +90,7 @@ int path_spec_watch(PathSpec *s, sd_event_io_handler_t handler) {
                 /* If this is a symlink watch both the symlink inode and where it points to. If the inode is
                  * not a symlink both calls will install the same watch, which is redundant and doesn't
                  * hurt. */
-                for (int follow_symlink = 0; follow_symlink < 2; follow_symlink ++) {
+                for (int follow_symlink = 0; follow_symlink < 2; follow_symlink++) {
                         uint32_t f = flags;
 
                         SET_FLAG(f, IN_DONT_FOLLOW, !follow_symlink);

diff --git a/src/core/service.c b/src/core/service.c
index 7bd4e99b11fb64f97cb873debcb41204e09dc0d7..c6251079c6142cb03d416f5be07d171f97ec7dea 100644 (file)
--- a/src/core/service.c
+++ b/src/core/service.c
@@ -2529,7 +2529,7 @@ static void service_enter_restart(Service *s) {
         /* Count the jobs we enqueue for restarting. This counter is maintained as long as the unit isn't
          * fully stopped, i.e. as long as it remains up or remains in auto-start states. The user can reset
          * the counter explicitly however via the usual "systemctl reset-failure" logic. */
-        s->n_restarts ++;
+        s->n_restarts++;
         s->flush_n_restarts = false;
 
         s->notify_access_override = _NOTIFY_ACCESS_INVALID;

diff --git a/src/core/unit.c b/src/core/unit.c
index 0772a67001c5932b01f9b102bd5f9d0660c925ce..c5d84837912663a7eb5cd54dd335be6f56f14dd4 100644 (file)
--- a/src/core/unit.c
+++ b/src/core/unit.c
@@ -2314,7 +2314,7 @@ void unit_start_on_failure(
                         log_unit_warning_errno(
                                         u, r, "Failed to enqueue %s job, ignoring: %s",
                                         dependency_name, bus_error_message(&error, r));
-                n_jobs ++;
+                n_jobs++;
         }
 
         if (n_jobs >= 0)

diff --git a/src/cryptenroll/cryptenroll-tpm2.c b/src/cryptenroll/cryptenroll-tpm2.c
index 653ad4452a1810ecad59609f47ede1f86fe1f690..0268d8f7721d83bdf02e6573f263fa5dd7fd858f 100644 (file)
--- a/src/cryptenroll/cryptenroll-tpm2.c
+++ b/src/cryptenroll/cryptenroll-tpm2.c
@@ -25,7 +25,7 @@ static int search_policy_hash(
         if (hash_size == 0)
                 return 0;
 
-        for (int token = 0; token < sym_crypt_token_max(CRYPT_LUKS2); token ++) {
+        for (int token = 0; token < sym_crypt_token_max(CRYPT_LUKS2); token++) {
                 _cleanup_(json_variant_unrefp) JsonVariant *v = NULL;
                 _cleanup_free_ void *thash = NULL;
                 size_t thash_size = 0;

diff --git a/src/cryptenroll/cryptenroll.c b/src/cryptenroll/cryptenroll.c
index 5a7f7c3bff71c762d359655bfafb239af61efd80..687b908f060c97f65e108544c322430fa6e69d8c 100644 (file)
--- a/src/cryptenroll/cryptenroll.c
+++ b/src/cryptenroll/cryptenroll.c
@@ -571,7 +571,7 @@ static int check_for_homed(struct crypt_device *cd) {
         /* Politely refuse operating on homed volumes. The enrolled tokens for the user record and the LUKS2
          * volume should not get out of sync. */
 
-        for (int token = 0; token < crypt_token_max(CRYPT_LUKS2); token ++) {
+        for (int token = 0; token < crypt_token_max(CRYPT_LUKS2); token++) {
                 r = cryptsetup_get_token_as_json(cd, token, "systemd-homed", NULL);
                 if (IN_SET(r, -ENOENT, -EINVAL, -EMEDIUMTYPE))
                         continue;

diff --git a/src/delta/delta.c b/src/delta/delta.c
index 3337b7f081ae728a0c22e927d9b5251fcc0ee724..3433250549bbf5ccd4e446c12421b1082d1563c0 100644 (file)
--- a/src/delta/delta.c
+++ b/src/delta/delta.c
@@ -314,7 +314,7 @@ static int enumerate_dir(
                         dirs[n_dirs] = strdup(de->d_name);
                         if (!dirs[n_dirs])
                                 return -ENOMEM;
-                        n_dirs ++;
+                        n_dirs++;
                 }
 
                 if (!dirent_is_file(de))
@@ -326,7 +326,7 @@ static int enumerate_dir(
                 files[n_files] = strdup(de->d_name);
                 if (!files[n_files])
                         return -ENOMEM;
-                n_files ++;
+                n_files++;
         }
 
         strv_sort(dirs);

diff --git a/src/firstboot/firstboot.c b/src/firstboot/firstboot.c
index 5dd7bdb1e7ac0caa5e71dd80fc7ed42966a8b479..0e92c56e802c63986351abb485cad0a67083b046 100644 (file)
--- a/src/firstboot/firstboot.c
+++ b/src/firstboot/firstboot.c
@@ -166,7 +166,7 @@ static int show_menu(char **x, unsigned n_columns, unsigned width, unsigned perc
 
         for (i = 0; i < per_column; i++) {
 
-                for (j = 0; j < n_columns; j ++) {
+                for (j = 0; j < n_columns; j++) {
                         _cleanup_free_ char *e = NULL;
 
                         if (j * per_column + i >= n)

diff --git a/src/home/user-record-sign.c b/src/home/user-record-sign.c
index dd099a0a6f79a8aad97fc02af3601d9ab5ef1b3e..25618d0343ae0c109bc0c6439a3db0ef68680ebe 100644 (file)
--- a/src/home/user-record-sign.c
+++ b/src/home/user-record-sign.c
@@ -136,11 +136,11 @@ int user_record_verify(UserRecord *ur, EVP_PKEY *public_key) {
                         return -EIO;
 
                 if (EVP_DigestVerify(md_ctx, signature, signature_size, (uint8_t*) text, strlen(text)) <= 0) {
-                        n_bad ++;
+                        n_bad++;
                         continue;
                 }
 
-                n_good ++;
+                n_good++;
         }
 
         return n_good > 0 ? (n_bad == 0 ? USER_RECORD_SIGNED_EXCLUSIVE : USER_RECORD_SIGNED) :

diff --git a/src/import/qcow2-util.c b/src/import/qcow2-util.c
index c70656bc0e0359568a1438f328ab889269bbb4fc..fc34f306031ee287c5a7dfe90434fb0eb7342ccb 100644 (file)
--- a/src/import/qcow2-util.c
+++ b/src/import/qcow2-util.c
@@ -273,7 +273,7 @@ int qcow2_convert(int qcow2_fd, int raw_fd) {
         if ((uint64_t) l != sz)
                 return -EIO;
 
-        for (i = 0; i < HEADER_L1_SIZE(&header); i ++) {
+        for (i = 0; i < HEADER_L1_SIZE(&header); i++) {
                 uint64_t l2_begin, j;
 
                 r = normalize_offset(&header, l1_table[i], &l2_begin, NULL, NULL);

diff --git a/src/journal/journald-context.c b/src/journal/journald-context.c
index 78401f9857c0e174527b5652f83fe07c29cebfc5..b44f70006b5e22b86c6f4c787ae24e601cfca7c2 100644 (file)
--- a/src/journal/journald-context.c
+++ b/src/journal/journald-context.c
@@ -612,7 +612,7 @@ static void client_context_try_shrink_to(Server *s, size_t limit) {
                         if (pid_is_unwaited(c->pid) == 0)
                                 client_context_free(s, c);
                         else
-                                idx ++;
+                                idx++;
                 }
 
                 s->last_cache_pid_flush = t;

diff --git a/src/libsystemd-network/dhcp-option.c b/src/libsystemd-network/dhcp-option.c
index 5e216c5139c728dfa85e5d8209af5d005b5c0101..4025dd36325e2f8b02be52c1878654c09a50404d 100644 (file)
--- a/src/libsystemd-network/dhcp-option.c
+++ b/src/libsystemd-network/dhcp-option.c
@@ -283,7 +283,7 @@ static int parse_options(const uint8_t options[], size_t buflen, uint8_t *overlo
         int r;
 
         while (offset < buflen) {
-                code = options[offset ++];
+                code = options[offset++];
 
                 switch (code) {
                 case SD_DHCP_OPTION_PAD:
@@ -296,7 +296,7 @@ static int parse_options(const uint8_t options[], size_t buflen, uint8_t *overlo
                 if (buflen < offset + 1)
                         return -ENOBUFS;
 
-                len = options[offset ++];
+                len = options[offset++];
 
                 if (buflen < offset + len)
                         return -EINVAL;

diff --git a/src/libsystemd/sd-bus/bus-creds.c b/src/libsystemd/sd-bus/bus-creds.c
index c6d8caaf6d71b4a189bf0101cac0cd180f5d745a..33ae2a00f6859c329d850d7ef067955109b39880 100644 (file)
--- a/src/libsystemd/sd-bus/bus-creds.c
+++ b/src/libsystemd/sd-bus/bus-creds.c
@@ -731,7 +731,7 @@ static int parse_caps(sd_bus_creds *c, unsigned offset, const char *p) {
                         return -ENOMEM;
         }
 
-        for (i = 0; i < sz; i ++) {
+        for (i = 0; i < sz; i++) {
                 uint32_t v = 0;
 
                 for (j = 0; j < 8; ++j) {

diff --git a/src/libsystemd/sd-daemon/sd-daemon.c b/src/libsystemd/sd-daemon/sd-daemon.c
index 6a60cde4bbc8f42efcc5685b68aba48f05e95317..0eb0797e08fed9711c8ac236131e08348cc02e8e 100644 (file)
--- a/src/libsystemd/sd-daemon/sd-daemon.c
+++ b/src/libsystemd/sd-daemon/sd-daemon.c
@@ -76,7 +76,7 @@ _public_ int sd_listen_fds(int unset_environment) {
                 goto finish;
         }
 
-        for (int fd = SD_LISTEN_FDS_START; fd < SD_LISTEN_FDS_START + n; fd ++) {
+        for (int fd = SD_LISTEN_FDS_START; fd < SD_LISTEN_FDS_START + n; fd++) {
                 r = fd_cloexec(fd, true);
                 if (r < 0)
                         goto finish;

diff --git a/src/libsystemd/sd-device/sd-device.c b/src/libsystemd/sd-device/sd-device.c
index 1847ca4de05000373beb559cce96ab4beda7395d..071e72707eaecab3b6aa0f3143d1ac98a61186a2 100644 (file)
--- a/src/libsystemd/sd-device/sd-device.c
+++ b/src/libsystemd/sd-device/sd-device.c
@@ -2488,7 +2488,7 @@ _public_ int sd_device_set_sysattr_value(sd_device *device, const char *sysattr,
 
         /* drop trailing newlines */
         while (len > 0 && strchr(NEWLINE, _value[len - 1]))
-                len --;
+                len--;
 
         /* value length is limited to 4k */
         if (len > 4096)

diff --git a/src/libsystemd/sd-event/sd-event.c b/src/libsystemd/sd-event/sd-event.c
index 288798a0dccefcb7ce225096987ae41f1b89b283..b556fdb5348386f9a73f9d06fea433ba11a57b66 100644 (file)
--- a/src/libsystemd/sd-event/sd-event.c
+++ b/src/libsystemd/sd-event/sd-event.c
@@ -1165,10 +1165,10 @@ static int source_set_pending(sd_event_source *s, bool b) {
                 assert(s->inotify.inode_data->inotify_data);
 
                 if (b)
-                        s->inotify.inode_data->inotify_data->n_pending ++;
+                        s->inotify.inode_data->inotify_data->n_pending++;
                 else {
                         assert(s->inotify.inode_data->inotify_data->n_pending > 0);
-                        s->inotify.inode_data->inotify_data->n_pending --;
+                        s->inotify.inode_data->inotify_data->n_pending--;
                 }
         }
 
@@ -4000,7 +4000,7 @@ static int process_inotify(sd_event *e) {
                 if (r < 0)
                         return r;
                 if (r > 0)
-                        done ++;
+                        done++;
         }
 
         return done;

diff --git a/src/machine/machinectl.c b/src/machine/machinectl.c
index 3eadb5f4e7721167960f4768dcd7611330e044c6..c762e76fc6316b52a732655ac3976493ad7c4c93 100644 (file)
--- a/src/machine/machinectl.c
+++ b/src/machine/machinectl.c
@@ -2740,7 +2740,7 @@ static int parse_argv(int argc, char *argv[]) {
                                 /* If we already found the "shell" verb on the command line, and now found the next
                                  * non-option argument, then this is the machine name and we should stop processing
                                  * further arguments.  */
-                                optind --; /* don't process this argument, go one step back */
+                                optind--; /* don't process this argument, go one step back */
                                 goto done;
                         }
                         if (streq(optarg, "shell"))

diff --git a/src/network/networkd-dhcp-server.c b/src/network/networkd-dhcp-server.c
index 607fe0053c3c3299fd3d662d32d5464374d74efc..a486fd892752e272723f37174109b0c17c7513cd 100644 (file)
--- a/src/network/networkd-dhcp-server.c
+++ b/src/network/networkd-dhcp-server.c
@@ -423,7 +423,7 @@ static int dhcp4_server_configure(Link *link) {
                 return log_link_warning_errno(link, r, "Failed to %s Rapid Commit support for DHCPv4 server instance: %m",
                                               enable_disable(link->network->dhcp_server_rapid_commit));
 
-        for (sd_dhcp_lease_server_type_t type = 0; type < _SD_DHCP_LEASE_SERVER_TYPE_MAX; type ++) {
+        for (sd_dhcp_lease_server_type_t type = 0; type < _SD_DHCP_LEASE_SERVER_TYPE_MAX; type++) {
 
                 if (!link->network->dhcp_server_emit[type].emit)
                         continue;

diff --git a/src/nspawn/nspawn-bind-user.c b/src/nspawn/nspawn-bind-user.c
index 0a8653033d0689c2968a9f192f3d72733d9a8a23..810ddbb45af2b4d27408d1e5655ad37f549eae78 100644 (file)
--- a/src/nspawn/nspawn-bind-user.c
+++ b/src/nspawn/nspawn-bind-user.c
@@ -153,7 +153,7 @@ static int find_free_uid(const char *directory, uid_t max_uid, uid_t *current_ui
         assert(directory);
         assert(current_uid);
 
-        for (;; (*current_uid) ++) {
+        for (;; (*current_uid)++) {
                 if (*current_uid > MAP_UID_MAX || *current_uid > max_uid)
                         return log_error_errno(
                                         SYNTHETIC_ERRNO(EBUSY),

diff --git a/src/nspawn/nspawn-oci.c b/src/nspawn/nspawn-oci.c
index 8f1ac7ccaddfae49d9b358da8b8be30b3482ff3a..e3b6f895d171dcef7e4d3429fd4441440d8838fb 100644 (file)
--- a/src/nspawn/nspawn-oci.c
+++ b/src/nspawn/nspawn-oci.c
@@ -2082,7 +2082,7 @@ static int oci_hooks_array(const char *name, JsonVariant *v, JsonDispatchFlags f
                         return r;
                 }
 
-                (*n_array) ++;
+                (*n_array)++;
         }
 
         return 0;

diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c
index fb9df3d053f7f1fe08e7207e94f1886b79ca52d9..4d3783e00a943e44b3fa214be2d656270d0efa5e 100644 (file)
--- a/src/nspawn/nspawn.c
+++ b/src/nspawn/nspawn.c
@@ -4455,7 +4455,7 @@ static int merge_settings(Settings *settings, const char *path) {
 #endif
         }
 
-        for (rl = 0; rl < _RLIMIT_MAX; rl ++) {
+        for (rl = 0; rl < _RLIMIT_MAX; rl++) {
                 if ((arg_settings_mask & (SETTING_RLIMIT_FIRST << rl)))
                         continue;
 

diff --git a/src/resolve/resolved-dns-transaction.c b/src/resolve/resolved-dns-transaction.c
index fe88e502e7c11c3ad24264ff47ace13279113a36..c1d0603a187631772030254ef807369c7e30ed15 100644 (file)
--- a/src/resolve/resolved-dns-transaction.c
+++ b/src/resolve/resolved-dns-transaction.c
@@ -489,7 +489,7 @@ static int dns_transaction_pick_server(DnsTransaction *t) {
         dns_server_unref(t->server);
         t->server = dns_server_ref(server);
 
-        t->n_picked_servers ++;
+        t->n_picked_servers++;
 
         log_debug("Using DNS server %s for transaction %u.", strna(dns_server_string_full(t->server)), t->id);
 

diff --git a/src/shared/bitmap.c b/src/shared/bitmap.c
index 6cf08b898f0b70f971759b4ed6be320a475aebb7..9aa766139bb05c232f13233c19e42f423353cfea 100644 (file)
--- a/src/shared/bitmap.c
+++ b/src/shared/bitmap.c
@@ -163,9 +163,9 @@ bool bitmap_iterate(const Bitmap *b, Iterator *i, unsigned *n) {
         rem = BITMAP_NUM_TO_REM(i->idx);
         bitmask = UINT64_C(1) << rem;
 
-        for (; offset < b->n_bitmaps; offset ++) {
+        for (; offset < b->n_bitmaps; offset++) {
                 if (b->bitmaps[offset]) {
-                        for (; bitmask; bitmask <<= 1, rem ++) {
+                        for (; bitmask; bitmask <<= 1, rem++) {
                                 if (b->bitmaps[offset] & bitmask) {
                                         *n = BITMAP_OFFSET_TO_NUM(offset, rem);
                                         i->idx = *n + 1;

diff --git a/src/shared/compare-operator.c b/src/shared/compare-operator.c
index 0da28fc5c68b60c63a642202a5311acdc2bd4425..233e9c6b006896860316ed9b707d540434b2783b 100644 (file)
--- a/src/shared/compare-operator.c
+++ b/src/shared/compare-operator.c
@@ -40,7 +40,7 @@ CompareOperator parse_compare_operator(const char **s, CompareOperatorParseFlags
                   * parse_compare_operator() are use on the same string? */
                 return _COMPARE_OPERATOR_INVALID;
 
-        for (size_t i = 0; i < ELEMENTSOF(table); i ++) {
+        for (size_t i = 0; i < ELEMENTSOF(table); i++) {
                 const char *e;
 
                 if (table[i].need_mask != 0 && !FLAGS_SET(flags, table[i].need_mask))

diff --git a/src/shared/cryptsetup-fido2.c b/src/shared/cryptsetup-fido2.c
index 285b82a7e2b21a0343cbf0e0c96bb89f526c2329..6e559e17f4ad13189b8415234cd534371a5b4ee8 100644 (file)
--- a/src/shared/cryptsetup-fido2.c
+++ b/src/shared/cryptsetup-fido2.c
@@ -150,7 +150,7 @@ int acquire_fido2_key_auto(
 
         /* Loads FIDO2 metadata from LUKS2 JSON token headers. */
 
-        for (int token = 0; token < sym_crypt_token_max(CRYPT_LUKS2); token ++) {
+        for (int token = 0; token < sym_crypt_token_max(CRYPT_LUKS2); token++) {
                 _cleanup_(json_variant_unrefp) JsonVariant *v = NULL;
                 JsonVariant *w;
                 _cleanup_free_ void *salt = NULL;

diff --git a/src/shared/dissect-image.c b/src/shared/dissect-image.c
index 98690367a15386d47af1924bd3aed06b789d04ed..6b0e5fe24847b701eba7dbdd001a011d9f065c71 100644 (file)
--- a/src/shared/dissect-image.c
+++ b/src/shared/dissect-image.c
@@ -3396,7 +3396,7 @@ int dissected_image_acquire_metadata(DissectedImage *m, DissectImageFlags extra_
 
         assert(m);
 
-        for (; n_meta_initialized < _META_MAX; n_meta_initialized ++) {
+        for (; n_meta_initialized < _META_MAX; n_meta_initialized++) {
                 assert(paths[n_meta_initialized]);
 
                 if (pipe2(fds + 2*n_meta_initialized, O_CLOEXEC) < 0) {

diff --git a/src/shared/fdset.c b/src/shared/fdset.c
index e5b8e92e8002289431a9f783fd4e2cf9cd27953d..b408a38c3710e96c7013de4d8639fbc49461cfca 100644 (file)
--- a/src/shared/fdset.c
+++ b/src/shared/fdset.c
@@ -246,7 +246,7 @@ int fdset_new_listen_fds(FDSet **ret, bool unset) {
                 return -ENOMEM;
 
         n = sd_listen_fds(unset);
-        for (fd = SD_LISTEN_FDS_START; fd < SD_LISTEN_FDS_START + n; fd ++) {
+        for (fd = SD_LISTEN_FDS_START; fd < SD_LISTEN_FDS_START + n; fd++) {
                 r = fdset_put(s, fd);
                 if (r < 0)
                         return r;

diff --git a/src/shared/format-table.c b/src/shared/format-table.c
index 41471dade038964162787da96a81af7f5d118c83..66704f4660ebcd9fdce02d885a01c95c0648ba3a 100644 (file)
--- a/src/shared/format-table.c
+++ b/src/shared/format-table.c
@@ -2632,7 +2632,7 @@ int table_print(Table *t, FILE *f) {
                         }
 
                         fputc('\n', f);
-                        n_subline ++;
+                        n_subline++;
                 } while (more_sublines);
         }
 

diff --git a/src/shared/fstab-util.c b/src/shared/fstab-util.c
index 55e76b6e16bc6d8f78aa6f1e40405290b2c2d9a2..ef3dae5b6242fe1b01957846c0823d0f9f6ebea5 100644 (file)
--- a/src/shared/fstab-util.c
+++ b/src/shared/fstab-util.c
@@ -226,9 +226,9 @@ int fstab_filter_options(
                                 if (IN_SET(*end, ',', '\0'))
                                         break;
                                 assert(*end == '\\');
-                                end ++;                 /* Skip the backslash */
+                                end++;                 /* Skip the backslash */
                                 if (*end != '\0')
-                                        end ++;         /* Skip the escaped char, but watch out for a trailing comma */
+                                        end++;         /* Skip the escaped char, but watch out for a trailing comma */
                         }
 
                         NULSTR_FOREACH(name, names) {

diff --git a/src/shared/hwdb-util.c b/src/shared/hwdb-util.c
index 648bfc502655ee8df566de33ccc52edb3dea1627..d96902c7f26fe737eb1f38f6340c55dcad9c5384 100644 (file)
--- a/src/shared/hwdb-util.c
+++ b/src/shared/hwdb-util.c
@@ -484,7 +484,7 @@ static int import_file(struct trie *trie, const char *filename, uint16_t file_pr
                 if (r == 0)
                         break;
 
-                line_number ++;
+                line_number++;
 
                 /* comment line */
                 if (line[0] == '#')

diff --git a/src/shared/install.c b/src/shared/install.c
index 265407f080e1e158ed9318c419b584081c42d12c..ad30e9b49c1f6d7a068bc47b94aa517356e5f3c9 100644 (file)
--- a/src/shared/install.c
+++ b/src/shared/install.c
@@ -1810,7 +1810,7 @@ int unit_file_verify_alias(
                 _cleanup_free_ char *dir = NULL;
                 char *p;
 
-                path_alias ++; /* skip over slash */
+                path_alias++; /* skip over slash */
 
                 r = path_extract_directory(dst, &dir);
                 if (r < 0)

diff --git a/src/shared/json.c b/src/shared/json.c
index 06c9e850ea3173e6e94f72513226724a5c639862..af2fc9aa70c10dc2f0d72e2d50488f47cc454ed7 100644 (file)
--- a/src/shared/json.c
+++ b/src/shared/json.c
@@ -559,7 +559,7 @@ static int _json_variant_array_put_element(JsonVariant *array, JsonVariant *elem
                 return -ELNRNG;
         if (d >= array->depth)
                 array->depth = d + 1;
-        array->n_elements ++;
+        array->n_elements++;
 
         *w = (JsonVariant) {
                 .is_embedded = true,
@@ -2310,7 +2310,7 @@ static int json_variant_copy(JsonVariant **nv, JsonVariant *v) {
                 source = json_variant_string(v);
                 k = strnlen(source, INLINE_STRING_MAX + 1);
                 if (k <= INLINE_STRING_MAX) {
-                        k ++;
+                        k++;
                         break;
                 }
 
@@ -2594,7 +2594,7 @@ static int json_parse_string(const char **p, char **ret) {
                                 return -ENOMEM;
 
                         s[n++] = ch;
-                        c ++;
+                        c++;
                         continue;
                 }
 
@@ -4574,7 +4574,7 @@ int json_dispatch_full(
                                 }
                         }
 
-                        done ++;
+                        done++;
 
                 } else { /* Didn't find a matching entry! ☹️ */
 
@@ -4589,7 +4589,7 @@ int json_dispatch_full(
 
                                         return r;
                                 } else
-                                        done ++;
+                                        done++;
 
                         } else  {
                                 json_log(value, flags, 0, "Unexpected object field '%s'.", json_variant_string(key));

diff --git a/src/shared/loopback-setup.c b/src/shared/loopback-setup.c
index a02baf8399d9af835bcf7133d74d25e83c2f5899..84d723487a37536b2e417a2c129b6d618e47a5ed 100644 (file)
--- a/src/shared/loopback-setup.c
+++ b/src/shared/loopback-setup.c
@@ -60,7 +60,7 @@ static int start_loopback(sd_netlink *rtnl, struct state *s) {
         if (r < 0)
                 return r;
 
-        s->n_messages ++;
+        s->n_messages++;
         return 0;
 }
 
@@ -95,7 +95,7 @@ static int add_ipv4_address(sd_netlink *rtnl, struct state *s) {
         if (r < 0)
                 return r;
 
-        s->n_messages ++;
+        s->n_messages++;
         return 0;
 }
 
@@ -136,7 +136,7 @@ static int add_ipv6_address(sd_netlink *rtnl, struct state *s) {
         if (r < 0)
                 return r;
 
-        s->n_messages ++;
+        s->n_messages++;
         return 0;
 }
 

diff --git a/src/shared/mount-setup.c b/src/shared/mount-setup.c
index 1226ca121e16609b6d7edfbd83313b5079dee3e4..d9de2789a582317ee32681e10f6df72da2eedfa5 100644 (file)
--- a/src/shared/mount-setup.c
+++ b/src/shared/mount-setup.c
@@ -135,7 +135,7 @@ bool mount_point_is_api(const char *path) {
         /* Checks if this mount point is considered "API", and hence
          * should be ignored */
 
-        for (size_t i = 0; i < ELEMENTSOF(mount_table); i ++)
+        for (size_t i = 0; i < ELEMENTSOF(mount_table); i++)
                 if (path_equal(path, mount_table[i].where))
                         return true;
 

diff --git a/src/shared/rm-rf.c b/src/shared/rm-rf.c
index 4664215e906204123587d7b3b63e0b0f78aa5861..767db48cc0d7a4c4e1c348129d6493c7e01c71f9 100644 (file)
--- a/src/shared/rm-rf.c
+++ b/src/shared/rm-rf.c
@@ -326,7 +326,7 @@ static int rm_rf_children_impl(
                         dirname = mfree(dirname);
 
                         /* And now let's back out one level up */
-                        n_todo --;
+                        n_todo--;
                         d = TAKE_PTR(todos[n_todo].dir);
                         dirname = TAKE_PTR(todos[n_todo].dirname);
                         old_mode = todos[n_todo].old_mode;

diff --git a/src/shared/varlink-idl.c b/src/shared/varlink-idl.c
index 655324c6c37101a148751ded438198782eb29481..858b493d2f60c0dbb580a06a9ee02bb8b0064ab2 100644 (file)
--- a/src/shared/varlink-idl.c
+++ b/src/shared/varlink-idl.c
@@ -401,7 +401,7 @@ static int varlink_interface_realloc(VarlinkInterface **interface, size_t n_symb
 
         assert(interface);
 
-        n_symbols ++; /* Space for trailing NULL end marker symbol */
+        n_symbols++; /* Space for trailing NULL end marker symbol */
 
         /* Overflow check */
         if (n_symbols > (SIZE_MAX - offsetof(VarlinkInterface, symbols)) / sizeof(VarlinkSymbol*))
@@ -420,7 +420,7 @@ static int varlink_symbol_realloc(VarlinkSymbol **symbol, size_t n_fields) {
 
         assert(symbol);
 
-        n_fields ++; /* Space for trailing end marker field */
+        n_fields++; /* Space for trailing end marker field */
 
         /* Overflow check */
         if (n_fields > (SIZE_MAX - offsetof(VarlinkSymbol, fields)) / sizeof(VarlinkField))

diff --git a/src/shutdown/detach-dm.c b/src/shutdown/detach-dm.c
index 8b8f72d678b1ac26fbbccdaad5140f7dcdeb14b6..f6f672c75ad5f2e99a64cd749c4f67d617cf2e9c 100644 (file)
--- a/src/shutdown/detach-dm.c
+++ b/src/shutdown/detach-dm.c
@@ -132,7 +132,7 @@ static int dm_points_list_detach(DeviceMapper **head, bool *changed, bool last_t
                 if ((major(rootdev) != 0 && rootdev == m->devnum) ||
                     (major(usrdev) != 0 && usrdev == m->devnum)) {
                         log_debug("Not detaching DM %s that backs the OS itself, skipping.", m->path);
-                        n_failed ++;
+                        n_failed++;
                         continue;
                 }
 

diff --git a/src/shutdown/detach-md.c b/src/shutdown/detach-md.c
index cf3130d4a7064d2bd9728da9a3f17bf6df510b78..ac46670f04f4432f34bb52390fa7aab42a6677cb 100644 (file)
--- a/src/shutdown/detach-md.c
+++ b/src/shutdown/detach-md.c
@@ -153,7 +153,7 @@ static int md_points_list_detach(RaidDevice **head, bool *changed, bool last_try
                 if ((major(rootdev) != 0 && rootdev == m->devnum) ||
                     (major(usrdev) != 0 && usrdev == m->devnum)) {
                         log_debug("Not detaching MD %s that backs the OS itself, skipping.", m->path);
-                        n_failed ++;
+                        n_failed++;
                         continue;
                 }
 

diff --git a/src/sysext/sysext.c b/src/sysext/sysext.c
index 33cb8c19635239839c6dad12e704c1ecf6b0b091..fe11fe0f07c980362c92cc7c5153554ebaba81e9 100644 (file)
--- a/src/sysext/sysext.c
+++ b/src/sysext/sysext.c
@@ -854,7 +854,7 @@ static int merge_subprocess(
                 if (r < 0)
                         return log_oom();
 
-                n_extensions ++;
+                n_extensions++;
         }
 
         /* Nothing left? Then shortcut things */

diff --git a/src/sysv-generator/sysv-generator.c b/src/sysv-generator/sysv-generator.c
index 4485e2e3680ec9cc1eda27ec20576209b7f07bb6..5689a60d785ad87513bb7c5501373e678cc00335 100644 (file)
--- a/src/sysv-generator/sysv-generator.c
+++ b/src/sysv-generator/sysv-generator.c
@@ -807,7 +807,7 @@ static int set_dependencies_from_rcnd(const LookupPaths *lp, Hashmap *all_servic
                 return r;
 
         STRV_FOREACH(p, sysvrcnd_path)
-                for (unsigned i = 0; i < ELEMENTSOF(rcnd_table); i ++) {
+                for (unsigned i = 0; i < ELEMENTSOF(rcnd_table); i++) {
                         _cleanup_closedir_ DIR *d = NULL;
                         _cleanup_free_ char *path = NULL;
 

diff --git a/src/test/test-bus-util.c b/src/test/test-bus-util.c
index 2f52bca59aef944e32293cebc65253bf9f1e91ce..2cf44d6e5abf0184e629375b23d6a5979904efd3 100644 (file)
--- a/src/test/test-bus-util.c
+++ b/src/test/test-bus-util.c
@@ -11,7 +11,7 @@ static int callback(sd_bus_message *m, void *userdata, sd_bus_error *ret_error)
 static void destroy_callback(void *userdata) {
         int *n_called = userdata;
 
-        (*n_called) ++;
+        (*n_called)++;
 }
 
 TEST(destroy_callback) {

diff --git a/src/test/test-capability.c b/src/test/test-capability.c
index e8a056973751c5beeb747ec5ab8cebcc3e2a3863..9df5f5ba07084d1b8c3a6efc35c8d60279da8d43 100644 (file)
--- a/src/test/test-capability.c
+++ b/src/test/test-capability.c
@@ -54,7 +54,7 @@ static void test_last_cap_probe(void) {
         unsigned long p = (unsigned long)CAP_LAST_CAP;
 
         if (prctl(PR_CAPBSET_READ, p) < 0) {
-                for (p--; p > 0; p --)
+                for (p--; p > 0; p--)
                         if (prctl(PR_CAPBSET_READ, p) >= 0)
                                 break;
         } else {

diff --git a/src/test/test-mempool.c b/src/test/test-mempool.c
index d3bc173fd4539f13a0035263fde7397aa66efaf7..1f071dba05af69db7ea4714bc9c9f85201a29b7c 100644 (file)
--- a/src/test/test-mempool.c
+++ b/src/test/test-mempool.c
@@ -35,7 +35,7 @@ TEST(mempool_trim) {
                 assert_se(!a[x] || a[x]->value == x);
 
                 if (a[x])
-                        n_freed ++;
+                        n_freed++;
 
                 a[x] = mempool_free_tile(&test_mempool, a[x]);
         }
@@ -46,7 +46,7 @@ TEST(mempool_trim) {
         for (size_t i = 2; i < NN; i += 3) {
                 assert_se(!a[i] || a[i]->value == i);
                 if (a[i])
-                        n_freed ++;
+                        n_freed++;
                 a[i] = mempool_free_tile(&test_mempool, a[i]);
         }
 
@@ -66,7 +66,7 @@ TEST(mempool_trim) {
         for (size_t i = 0; i < NN; i += 1) {
                 assert_se(!a[i] || a[i]->value == i);
                 if (a[i])
-                        n_freed ++;
+                        n_freed++;
                 a[i] = mempool_free_tile(&test_mempool, a[i]);
         }
 
@@ -77,7 +77,7 @@ TEST(mempool_trim) {
         for (size_t i = 0; i < NN; i += 1) {
                 assert_se(!b[i] || b[i]->value == ~(uint64_t) i);
                 if (b[i])
-                        n_freed ++;
+                        n_freed++;
                 b[i] = mempool_free_tile(&test_mempool, b[i]);
         }