From: Sami Kerola <kerolasa@iki.fi>
Date: Sun, 28 May 2017 09:37:06 +0000 (+0100)
Subject: misc: remove stray semicolons
X-Git-Tag: v2.31-rc1~299
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f4d37838673f022c8c05c4beb5057bdb683a76ca;p=thirdparty%2Futil-linux.git

misc: remove stray semicolons

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

diff --git a/lib/mbsalign.c b/lib/mbsalign.c
index 731320b074..b0e1004a08 100644
--- 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 65fd5b8b42..5fc5fc4bcf 100644
--- 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 e6e8aebff0..71567e4ce0 100644
--- 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 9caee70e5a..2c5334217e 100644
--- 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 37fdf26680..0bee0278c6 100644
--- 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 ce1ed7e220..ba6c31920d 100644
--- 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 9883cbf29a..26751a4853 100644
--- 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 6c5c2e2f93..80fa0d3569 100644
--- 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 44f9d5879d..db85062a76 100644
--- 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 c036b4de89..1144ef87a5 100644
--- 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)