misc: remove stray semicolons

Signed-off-by: Sami Kerola <kerolasa@iki.fi>

diff --git a/lib/mbsalign.c b/lib/mbsalign.c
index 731320b0741ef565bb89dfb5f2b17a658e00902f..b0e1004a087c8af09b3095acad74404c45efeb5f 100644 (file)
--- a/lib/mbsalign.c
+++ b/lib/mbsalign.c
@@ -206,7 +206,7 @@ size_t mbs_safe_encode_size(size_t bytes)
 char *mbs_safe_encode(const char *s, size_t *width)
 {
        size_t sz = s ? strlen(s) : 0;
-       char *buf, *ret = NULL;;
+       char *buf, *ret = NULL;
 
        if (!sz)
                return NULL;

diff --git a/libblkid/src/superblocks/adaptec_raid.c b/libblkid/src/superblocks/adaptec_raid.c
index 65fd5b8b42178e717a3ca1bf14d99149b4143d67..5fc5fc4bcfc9ee5e38f24ea9b62a616720184f1d 100644 (file)
--- a/libblkid/src/superblocks/adaptec_raid.c
+++ b/libblkid/src/superblocks/adaptec_raid.c
@@ -91,7 +91,7 @@ static int probe_adraid(blkid_probe pr,
                                        off,
                                        sizeof(struct adaptec_metadata));
        if (!ad)
-               return errno ? -errno : BLKID_PROBE_NONE;;
+               return errno ? -errno : BLKID_PROBE_NONE;
 
        if (ad->smagic != be32_to_cpu(AD_SIGNATURE))
                return BLKID_PROBE_NONE;

diff --git a/libmount/src/btrfs.c b/libmount/src/btrfs.c
index e6e8aebff061474689d2c1126f4996768f1d75e3..71567e4ce0ca36ba6d070a1414e7210b7c0f0f5c 100644 (file)
--- a/libmount/src/btrfs.c
+++ b/libmount/src/btrfs.c
@@ -71,9 +71,9 @@ static inline uint##bits##_t btrfs_##name(const type *s)              \
 
 /* struct btrfs_disk_key */
 BTRFS_SETGET_STACK_FUNCS(disk_key_objectid, struct btrfs_disk_key,
-                        objectid, 64);
+                        objectid, 64)
 
-BTRFS_SETGET_STACK_FUNCS(stack_dir_name_len, struct btrfs_dir_item, name_len, 16);
+BTRFS_SETGET_STACK_FUNCS(stack_dir_name_len, struct btrfs_dir_item, name_len, 16)
 
 /*
   Red Black Trees

diff --git a/libmount/src/context_mount.c b/libmount/src/context_mount.c
index 9caee70e5ace421c22e82389aa3d99fcd3cc3480..2c5334217e51e34900b7fc94337cbb663a62469f 100644 (file)
--- a/libmount/src/context_mount.c
+++ b/libmount/src/context_mount.c
@@ -1042,7 +1042,7 @@ int mnt_context_finalize_mount(struct libmnt_context *cxt)
 
        rc = mnt_context_prepare_update(cxt);
        if (!rc)
-               rc = mnt_context_update_tabs(cxt);;
+               rc = mnt_context_update_tabs(cxt);
        return rc;
 }
 

diff --git a/libmount/src/context_umount.c b/libmount/src/context_umount.c
index 37fdf26680e67296f397832759850c6286efe2c8..0bee0278c6df04d09012811096b6330590a68cd5 100644 (file)
--- a/libmount/src/context_umount.c
+++ b/libmount/src/context_umount.c
@@ -896,7 +896,7 @@ int mnt_context_finalize_umount(struct libmnt_context *cxt)
 
        rc = mnt_context_prepare_update(cxt);
        if (!rc)
-               rc = mnt_context_update_tabs(cxt);;
+               rc = mnt_context_update_tabs(cxt);
        return rc;
 }
 

diff --git a/libsmartcols/src/column.c b/libsmartcols/src/column.c
index ce1ed7e220e07b4c5079eb70fce900d24db09b34..ba6c31920d59f50c38eb92838252297c1fad9936 100644 (file)
--- a/libsmartcols/src/column.c
+++ b/libsmartcols/src/column.c
@@ -304,7 +304,7 @@ size_t scols_wrapnl_chunksize(const struct libscols_column *cl __attribute__((un
                        sz = mbs_safe_width(data);
 
                sum = max(sum, sz);
-               data = p;;
+               data = p;
        }
 
        return sum;

diff --git a/misc-utils/test_uuidd.c b/misc-utils/test_uuidd.c
index 9883cbf29a4faf1b6a43df9b3dd370bb6f364a32..26751a48533675edca049a92fcd2aa67770f5d73 100644 (file)
--- a/misc-utils/test_uuidd.c
+++ b/misc-utils/test_uuidd.c
@@ -143,7 +143,7 @@ static void *create_uuids(thread_t *th)
                object_uuid_create(obj);
                obj->tid = th->tid;
                obj->pid = th->proc->pid;
-               obj->idx = th->index + i;;
+               obj->idx = th->index + i;
        }
        return NULL;
 }

diff --git a/sys-utils/unshare.c b/sys-utils/unshare.c
index 6c5c2e2f93e1daf160f02de6c8f092a7153622ce..80fa0d3569219fea94a1cd8599d863543ec38189 100644 (file)
--- a/sys-utils/unshare.c
+++ b/sys-utils/unshare.c
@@ -308,7 +308,7 @@ int main(int argc, char *argv[])
        int status;
        unsigned long propagation = UNSHARE_PROPAGATION_DEFAULT;
        uid_t real_euid = geteuid();
-       gid_t real_egid = getegid();;
+       gid_t real_egid = getegid();
 
        setlocale(LC_ALL, "");
        bindtextdomain(PACKAGE, LOCALEDIR);

diff --git a/term-utils/wall.c b/term-utils/wall.c
index 44f9d5879db129c43ee932508f3409a7faa16c51..db85062a762488bf46d71b379cc197abf1358914 100644 (file)
--- a/term-utils/wall.c
+++ b/term-utils/wall.c
@@ -309,7 +309,7 @@ static void buf_printf(struct buffer *bs, const char *fmt, ...)
                buf_enlarge(bs, (size_t)rc + 1);
                limit = bs->sz - bs->used;
                va_start(ap, fmt);
-               rc = vsnprintf(bs->data  + bs->used, limit, fmt, ap);;
+               rc = vsnprintf(bs->data  + bs->used, limit, fmt, ap);
                va_end(ap);
        }
 

diff --git a/text-utils/column.c b/text-utils/column.c
index c036b4de89fae1f640a6e8eda4e616f2ff07f7ec..1144ef87a54ce82a233eb471903bd871e792881e 100644 (file)
--- a/text-utils/column.c
+++ b/text-utils/column.c
@@ -485,7 +485,7 @@ static void columnate_fillrows(struct column_control *ctl)
        ctl->maxlength = (ctl->maxlength + TABCHAR_CELLS) & ~(TABCHAR_CELLS - 1);
        numcols = ctl->termwidth / ctl->maxlength;
        endcol = ctl->maxlength;
-       for (chcnt = col = 0, lp = ctl->ents;; ++lp) {
+       for (chcnt = col = 0, lp = ctl->ents; /* nothing */; ++lp) {
                fputws(*lp, stdout);
                chcnt += width(*lp);
                if (!--ctl->nents)