From 80c7cc1c8f027fcf5d5f0a2df4b9aef6904ed079 Mon Sep 17 00:00:00 2001
From: "Pedro F. Giffuni" <pfg@FreeBSD.org>
Date: Fri, 15 Apr 2016 22:31:22 +0000
Subject: [PATCH] Cleanup unnecessary semicolons from utilities we all love.

---
 sbin/dump/optr.c                      |  2 +-
 sbin/fsck_ffs/globs.c                 |  2 +-
 sbin/ifconfig/sfp.c                   |  2 +-
 sbin/mount_nfs/mount_nfs.c            |  2 +-
 usr.bin/bsdiff/bsdiff/bsdiff.c        | 50 +++++++++++++--------------
 usr.bin/bsdiff/bspatch/bspatch.c      |  4 +--
 usr.bin/calendar/dates.c              |  2 +-
 usr.bin/calendar/io.c                 |  2 +-
 usr.bin/rpcgen/rpc_cout.c             |  2 +-
 usr.bin/rpcgen/rpc_main.c             |  2 +-
 usr.bin/rpcgen/rpc_parse.c            |  2 +-
 usr.bin/rpcgen/rpc_svcout.c           |  2 +-
 usr.bin/rpcgen/rpc_util.c             |  4 +--
 usr.bin/showmount/showmount.c         |  6 ++--
 usr.bin/sort/bwstring.c               |  2 +-
 usr.bin/sort/coll.c                   |  2 +-
 usr.bin/sort/file.c                   |  2 +-
 usr.bin/truss/syscalls.c              |  2 +-
 usr.bin/xlint/lint1/func.c            |  2 +-
 usr.bin/xstr/xstr.c                   |  2 +-
 usr.sbin/keyserv/keyserv.c            |  2 +-
 usr.sbin/lmcconfig/lmcconfig.c        |  2 +-
 usr.sbin/mountd/mountd.c              |  6 ++--
 usr.sbin/nfscbd/nfscbd.c              |  2 +-
 usr.sbin/nfsd/nfsd.c                  |  2 +-
 usr.sbin/pmcstudy/pmcstudy.c          |  2 +-
 usr.sbin/portsnap/phttpget/phttpget.c |  2 +-
 usr.sbin/ppp/radius.c                 |  2 +-
 28 files changed, 58 insertions(+), 58 deletions(-)

diff --git a/sbin/dump/optr.c b/sbin/dump/optr.c
index 311e2551affc..bffcdc8bb7e8 100644
--- a/sbin/dump/optr.c
+++ b/sbin/dump/optr.c
@@ -403,7 +403,7 @@ lastdump(int arg)	/* w ==> just what to do; W ==> most recent dumps */
 		    dumpme = tnow > (dtwalk->dd_ddate - (tlast->tm_hour * 3600)
 				     - (tlast->tm_min * 60) - tlast->tm_sec
 				     + (dt->fs_freq * 86400));
-		};
+		}
 		if (arg != 'w' || dumpme)
 			(void) printf(
 			    "%c %8s\t(%6s) Last dump: Level %d, Date %s\n",
diff --git a/sbin/fsck_ffs/globs.c b/sbin/fsck_ffs/globs.c
index e910bc9f4e83..af3b72bd7e57 100644
--- a/sbin/fsck_ffs/globs.c
+++ b/sbin/fsck_ffs/globs.c
@@ -118,7 +118,7 @@ fsckinit(void)
 	bzero(totalreadcnt, sizeof(long) * BT_NUMBUFTYPES);
 	bzero(readtime, sizeof(struct timespec) * BT_NUMBUFTYPES);
 	bzero(totalreadtime, sizeof(struct timespec) * BT_NUMBUFTYPES);
-	bzero(&startprog, sizeof(struct timespec));;
+	bzero(&startprog, sizeof(struct timespec));
 	bzero(&sblk, sizeof(struct bufarea));
 	pdirbp = NULL;
 	pbp = NULL;
diff --git a/sbin/ifconfig/sfp.c b/sbin/ifconfig/sfp.c
index d92ee2cb2a32..0fa29a3d150d 100644
--- a/sbin/ifconfig/sfp.c
+++ b/sbin/ifconfig/sfp.c
@@ -911,6 +911,6 @@ sfp_status(int s, struct ifreq *ifr, int verbose)
 		break;
 	default:
 		print_sfp_status(&ii, verbose);
-	};
+	}
 }
 
diff --git a/sbin/mount_nfs/mount_nfs.c b/sbin/mount_nfs/mount_nfs.c
index 810cf59da0c4..149d127a11d9 100644
--- a/sbin/mount_nfs/mount_nfs.c
+++ b/sbin/mount_nfs/mount_nfs.c
@@ -1027,7 +1027,7 @@ xdr_fh(XDR *xdrsp, struct nfhret *np)
 		if (!authfnd && (authcnt > 0 || np->auth != AUTH_SYS))
 			np->stat = EAUTH;
 		return (1);
-	};
+	}
 	return (0);
 }
 
diff --git a/usr.bin/bsdiff/bsdiff/bsdiff.c b/usr.bin/bsdiff/bsdiff/bsdiff.c
index 7e39275a0a46..e0b3ee7d2553 100644
--- a/usr.bin/bsdiff/bsdiff/bsdiff.c
+++ b/usr.bin/bsdiff/bsdiff/bsdiff.c
@@ -57,24 +57,24 @@ static void split(off_t *I,off_t *V,off_t start,off_t len,off_t h)
 				if(V[I[k+i]+h]<x) {
 					x=V[I[k+i]+h];
 					j=0;
-				};
+				}
 				if(V[I[k+i]+h]==x) {
 					tmp=I[k+j];I[k+j]=I[k+i];I[k+i]=tmp;
 					j++;
-				};
-			};
+				}
+			}
 			for(i=0;i<j;i++) V[I[k+i]]=k+j-1;
 			if(j==1) I[k]=-1;
-		};
+		}
 		return;
-	};
+	}
 
 	x=V[I[start+len/2]+h];
 	jj=0;kk=0;
 	for(i=start;i<start+len;i++) {
 		if(V[I[i]+h]<x) jj++;
 		if(V[I[i]+h]==x) kk++;
-	};
+	}
 	jj+=start;kk+=jj;
 
 	i=start;j=0;k=0;
@@ -87,8 +87,8 @@ static void split(off_t *I,off_t *V,off_t start,off_t len,off_t h)
 		} else {
 			tmp=I[i];I[i]=I[kk+k];I[kk+k]=tmp;
 			k++;
-		};
-	};
+		}
+	}
 
 	while(jj+j<kk) {
 		if(V[I[jj+j]+h]==x) {
@@ -96,8 +96,8 @@ static void split(off_t *I,off_t *V,off_t start,off_t len,off_t h)
 		} else {
 			tmp=I[jj+j];I[jj+j]=I[kk+k];I[kk+k]=tmp;
 			k++;
-		};
-	};
+		}
+	}
 
 	if(jj>start) split(I,V,start,jj-start,h);
 
@@ -137,10 +137,10 @@ static void qsufsort(off_t *I,off_t *V,u_char *old,off_t oldsize)
 				split(I,V,i,len,h);
 				i+=len;
 				len=0;
-			};
-		};
+			}
+		}
 		if(len) I[i-len]=-len;
-	};
+	}
 
 	for(i=0;i<oldsize+1;i++) I[V[i]]=i;
 }
@@ -171,7 +171,7 @@ static off_t search(off_t *I,u_char *old,off_t oldsize,
 			*pos=I[en];
 			return y;
 		}
-	};
+	}
 
 	x=st+(en-st)/2;
 	if(memcmp(old+I[x],new,MIN(oldsize-I[x],newsize))<0) {
@@ -321,24 +321,24 @@ int main(int argc,char *argv[])
 			if((scan+lastoffset<oldsize) &&
 				(old[scan+lastoffset] == new[scan]))
 				oldscore--;
-		};
+		}
 
 		if((len!=oldscore) || (scan==newsize)) {
 			s=0;Sf=0;lenf=0;
 			for(i=0;(lastscan+i<scan)&&(lastpos+i<oldsize);) {
 				if(old[lastpos+i]==new[lastscan+i]) s++;
 				i++;
-				if(s*2-i>Sf*2-lenf) { Sf=s; lenf=i; };
-			};
+				if(s*2-i>Sf*2-lenf) { Sf=s; lenf=i; }
+			}
 
 			lenb=0;
 			if(scan<newsize) {
 				s=0;Sb=0;
 				for(i=1;(scan>=lastscan+i)&&(pos>=i);i++) {
 					if(old[pos-i]==new[scan-i]) s++;
-					if(s*2-i>Sb*2-lenb) { Sb=s; lenb=i; };
-				};
-			};
+					if(s*2-i>Sb*2-lenb) { Sb=s; lenb=i; }
+				}
+			}
 
 			if(lastscan+lenf>scan-lenb) {
 				overlap=(lastscan+lenf)-(scan-lenb);
@@ -348,12 +348,12 @@ int main(int argc,char *argv[])
 					   old[lastpos+lenf-overlap+i]) s++;
 					if(new[scan-lenb+i]==
 					   old[pos-lenb+i]) s--;
-					if(s>Ss) { Ss=s; lens=i+1; };
-				};
+					if(s>Ss) { Ss=s; lens=i+1; }
+				}
 
 				lenf+=lens-overlap;
 				lenb-=lens;
-			};
+			}
 
 			for(i=0;i<lenf;i++)
 				db[dblen+i]=new[lastscan+i]-old[lastpos+i];
@@ -381,8 +381,8 @@ int main(int argc,char *argv[])
 			lastscan=scan-lenb;
 			lastpos=pos-lenb;
 			lastoffset=pos-scan;
-		};
-	};
+		}
+	}
 	BZ2_bzWriteClose(&bz2err, pfbz2, 0, NULL, NULL);
 	if (bz2err != BZ_OK)
 		errx(1, "BZ2_bzWriteClose, bz2err = %d", bz2err);
diff --git a/usr.bin/bsdiff/bspatch/bspatch.c b/usr.bin/bsdiff/bspatch/bspatch.c
index db72e5c70236..eb99e5ba16a0 100644
--- a/usr.bin/bsdiff/bspatch/bspatch.c
+++ b/usr.bin/bsdiff/bspatch/bspatch.c
@@ -161,7 +161,7 @@ int main(int argc,char * argv[])
 			    (cbz2err != BZ_STREAM_END)))
 				errx(1, "Corrupt patch\n");
 			ctrl[i]=offtin(buf);
-		};
+		}
 
 		/* Sanity-check */
 		if(newpos+ctrl[0]>newsize)
@@ -195,7 +195,7 @@ int main(int argc,char * argv[])
 		/* Adjust pointers */
 		newpos+=ctrl[1];
 		oldpos+=ctrl[2];
-	};
+	}
 
 	/* Clean up the bzip2 reads */
 	BZ2_bzReadClose(&cbz2err, cpfbz2);
diff --git a/usr.bin/calendar/dates.c b/usr.bin/calendar/dates.c
index a5f5e9fa0286..86d8a1fee9ff 100644
--- a/usr.bin/calendar/dates.c
+++ b/usr.bin/calendar/dates.c
@@ -381,7 +381,7 @@ walkthrough_dates(struct event **e)
 		d = m->days;
 		*e = d->events;
 		return (1);
-	};
+	}
 	if (d->nextday != NULL) {
 		d = d->nextday;
 		*e = d->events;
diff --git a/usr.bin/calendar/io.c b/usr.bin/calendar/io.c
index 89863f45d7f0..0a5dd854546f 100644
--- a/usr.bin/calendar/io.c
+++ b/usr.bin/calendar/io.c
@@ -469,7 +469,7 @@ closecal(FILE *fp)
 		if (setuid(getuid()) < 0) {
 			warnx("setuid failed");
 			_exit(1);
-		};
+		}
 		if (setgid(getegid()) < 0) {
 			warnx("setgid failed");
 			_exit(1);
diff --git a/usr.bin/rpcgen/rpc_cout.c b/usr.bin/rpcgen/rpc_cout.c
index 4c36ce6c583d..0c2ce2098b36 100644
--- a/usr.bin/rpcgen/rpc_cout.c
+++ b/usr.bin/rpcgen/rpc_cout.c
@@ -81,7 +81,7 @@ emit(definition *def)
 
 		if (strcmp(def->def.ty.old_type, def->def_name) == 0)
 			return;
-	};
+	}
 	print_header(def);
 	switch (def->def_kind) {
 	case DEF_UNION:
diff --git a/usr.bin/rpcgen/rpc_main.c b/usr.bin/rpcgen/rpc_main.c
index b7b255afa586..64a29adc94f2 100644
--- a/usr.bin/rpcgen/rpc_main.c
+++ b/usr.bin/rpcgen/rpc_main.c
@@ -977,7 +977,7 @@ checkfiles(const char *infile, const char *outfile)
 		{
 			warn("%s", infile);
 			crash();
-		};
+		}
 	if (outfile) {
 		if (stat(outfile, &buf) < 0)
 			return;	/* file does not exist */
diff --git a/usr.bin/rpcgen/rpc_parse.c b/usr.bin/rpcgen/rpc_parse.c
index f7f857a0c9a5..69392b702a35 100644
--- a/usr.bin/rpcgen/rpc_parse.c
+++ b/usr.bin/rpcgen/rpc_parse.c
@@ -329,7 +329,7 @@ def_union(definition *defp)
 				*tailp = cases;
 				tailp = &cases->next;
 				cases = XALLOC(case_list);
-			};
+			}
 
 		get_declaration(&dec, DEF_UNION);
 		cases->case_decl = dec;
diff --git a/usr.bin/rpcgen/rpc_svcout.c b/usr.bin/rpcgen/rpc_svcout.c
index 4b951a337df4..aa5a86ad2ba9 100644
--- a/usr.bin/rpcgen/rpc_svcout.c
+++ b/usr.bin/rpcgen/rpc_svcout.c
@@ -551,7 +551,7 @@ write_program(definition *def, const char *storage)
 			(void) sprintf(_errbuf, "unable to free results");
 			print_err_message("\t\t");
 			f_print(fout, "\n");
-		};
+		}
 		print_return("\t");
 		f_print(fout, "}\n");
 	}
diff --git a/usr.bin/rpcgen/rpc_util.c b/usr.bin/rpcgen/rpc_util.c
index bf0ca5dee91f..14741186d5d7 100644
--- a/usr.bin/rpcgen/rpc_util.c
+++ b/usr.bin/rpcgen/rpc_util.c
@@ -454,7 +454,7 @@ add_type(int len, const char *type)
 	{
 		typ_list_t->next = ptr;
 		typ_list_t = ptr;
-	};
+	}
 }
 
 
@@ -470,7 +470,7 @@ find_type(const char *type)
 			return (ptr);
 		else
 			ptr = ptr->next;
-	};
+	}
 	return (NULL);
 }
 
diff --git a/usr.bin/showmount/showmount.c b/usr.bin/showmount/showmount.c
index 46e58e4ba74a..01c9e261c753 100644
--- a/usr.bin/showmount/showmount.c
+++ b/usr.bin/showmount/showmount.c
@@ -194,7 +194,7 @@ main(int argc, char **argv)
 		default:
 			printf("Hosts on %s:\n", host);
 			break;
-		};
+		}
 		print_dump(mntdump);
 	}
 	if (rpcs & DOEXPORTS) {
@@ -317,7 +317,7 @@ xdr_mntdump(XDR *xdrsp, struct mountlist **mlp)
 						goto next;
 					}
 					break;
-				};
+				}
 				if (val < 0) {
 					otp = &tp->ml_left;
 					tp = tp->ml_left;
@@ -407,7 +407,7 @@ print_dump(struct mountlist *mp)
 	default:
 		printf("%s\n", mp->ml_host);
 		break;
-	};
+	}
 	if (mp->ml_right)
 		print_dump(mp->ml_right);
 }
diff --git a/usr.bin/sort/bwstring.c b/usr.bin/sort/bwstring.c
index fc30b56ae885..3965eaed1c98 100644
--- a/usr.bin/sort/bwstring.c
+++ b/usr.bin/sort/bwstring.c
@@ -297,7 +297,7 @@ bwscsbdup(const unsigned char *str, size_t len)
 						/* NOTREACHED */
 						err(2, "mbrtowc error");
 					cptr += charlen;
-				};
+				}
 			}
 
 			ret->len = chars;
diff --git a/usr.bin/sort/coll.c b/usr.bin/sort/coll.c
index 0b7eb571b8f5..7b4ad1067810 100644
--- a/usr.bin/sort/coll.c
+++ b/usr.bin/sort/coll.c
@@ -688,7 +688,7 @@ static void setsuffix(wchar_t c, unsigned char *si)
 		break;
 	default:
 		*si = 0;
-	};
+	}
 }
 
 /*
diff --git a/usr.bin/sort/file.c b/usr.bin/sort/file.c
index 0a0088947dee..47d59af5b1dd 100644
--- a/usr.bin/sort/file.c
+++ b/usr.bin/sort/file.c
@@ -1258,7 +1258,7 @@ sort_list_to_file(struct sort_list *list, const char *outfile)
 			break;
 		default:
 			errx(2, "%s", getstr(10));
-		};
+		}
 	}
 
 	if (sort_opts_vals.sort_method == SORT_DEFAULT)
diff --git a/usr.bin/truss/syscalls.c b/usr.bin/truss/syscalls.c
index 9f291f051927..3bf7b9d69ede 100644
--- a/usr.bin/truss/syscalls.c
+++ b/usr.bin/truss/syscalls.c
@@ -1197,7 +1197,7 @@ print_arg(struct syscall_args *sc, unsigned long *args, long *retval,
 					break;
 				len--;
 				truncated = 1;
-			};
+			}
 			fprintf(fp, "\"%s\"%s", tmp3, truncated ?
 			    "..." : "");
 			free(tmp3);
diff --git a/usr.bin/xlint/lint1/func.c b/usr.bin/xlint/lint1/func.c
index 893121e56d8d..e5a0490c5a3a 100644
--- a/usr.bin/xlint/lint1/func.c
+++ b/usr.bin/xlint/lint1/func.c
@@ -517,7 +517,7 @@ label(int typ, sym_t *sym, tnode_t *tn)
 			ci->c_default = 1;
 		}
 		break;
-	};
+	}
 	reached = 1;
 }
 
diff --git a/usr.bin/xstr/xstr.c b/usr.bin/xstr/xstr.c
index 670e09ebafc7..4aad8e66e74a 100644
--- a/usr.bin/xstr/xstr.c
+++ b/usr.bin/xstr/xstr.c
@@ -139,7 +139,7 @@ main(int argc, char *argv[])
 			argc--, argv++;
 		else
 			readstd = 0;
-	};
+	}
 	flushsh();
 	if (cflg == 0)
 		xsdotc();
diff --git a/usr.sbin/keyserv/keyserv.c b/usr.sbin/keyserv/keyserv.c
index 79bf90d0f1df..8acbaf699d9c 100644
--- a/usr.sbin/keyserv/keyserv.c
+++ b/usr.sbin/keyserv/keyserv.c
@@ -440,7 +440,7 @@ key_net_put_2_svc_prog(uid, arg)
 			arg->st_netname, (int)sizeof (arg->st_pub_key),
 			arg->st_pub_key, (int)sizeof (arg->st_priv_key),
 			arg->st_priv_key);
-	};
+	}
 
 	status = pk_netput(uid, arg);
 
diff --git a/usr.sbin/lmcconfig/lmcconfig.c b/usr.sbin/lmcconfig/lmcconfig.c
index f720e634f8ff..eb80dbe31495 100644
--- a/usr.sbin/lmcconfig/lmcconfig.c
+++ b/usr.sbin/lmcconfig/lmcconfig.c
@@ -1528,7 +1528,7 @@ print_test_pattern(int patt)
     case 11:
       printf("framed X^23+X^18+1\n");
       break;
-    case 12:;
+    case 12:
       printf("framed X^11+X^9+1 w/7ZS\n");
       break;
     case 13:
diff --git a/usr.sbin/mountd/mountd.c b/usr.sbin/mountd/mountd.c
index d6da2bc9c24c..a9464f68fe48 100644
--- a/usr.sbin/mountd/mountd.c
+++ b/usr.sbin/mountd/mountd.c
@@ -434,7 +434,7 @@ main(int argc, char **argv)
 			break;
 		default:
 			usage();
-		};
+		}
 
 	if (modfind("nfsd") < 0) {
 		/* Not present in kernel, try loading it */
@@ -1241,7 +1241,7 @@ xdr_fhs(XDR *xdrsp, caddr_t cp)
 				return (0);
 			return (xdr_long(xdrsp, &auth));
 		}
-	};
+	}
 	return (0);
 }
 
@@ -2540,7 +2540,7 @@ do_mount(struct exportlist *ep, struct grouplist *grp, int exflags,
 				*cp = savedc;
 			ret = 1;
 			goto error_exit;
-		};
+		}
 
 		/*
 		 * For V4:, use the nfssvc() syscall, instead of mount().
diff --git a/usr.sbin/nfscbd/nfscbd.c b/usr.sbin/nfscbd/nfscbd.c
index c9153b432f1e..4bcfd6ea95da 100644
--- a/usr.sbin/nfscbd/nfscbd.c
+++ b/usr.sbin/nfscbd/nfscbd.c
@@ -177,7 +177,7 @@ main(int argc, char *argv[])
 		default:
 		case '?':
 			usage();
-		};
+		}
 	argv += optind;
 	argc -= optind;
 
diff --git a/usr.sbin/nfsd/nfsd.c b/usr.sbin/nfsd/nfsd.c
index f58ed30023ae..349ba8e60929 100644
--- a/usr.sbin/nfsd/nfsd.c
+++ b/usr.sbin/nfsd/nfsd.c
@@ -214,7 +214,7 @@ main(int argc, char **argv)
 		default:
 		case '?':
 			usage();
-		};
+		}
 	if (!tcpflag && !udpflag)
 		udpflag = 1;
 	argv += optind;
diff --git a/usr.sbin/pmcstudy/pmcstudy.c b/usr.sbin/pmcstudy/pmcstudy.c
index 16c9f5148334..e94addfb5700 100644
--- a/usr.sbin/pmcstudy/pmcstudy.c
+++ b/usr.sbin/pmcstudy/pmcstudy.c
@@ -2873,7 +2873,7 @@ main(int argc, char **argv)
 			printf("-A -- Run all canned tests\n");
 			return(0);
 			break;
-		};
+		}
 	}
 	if ((run_all == 0) && (name == NULL) && (filename == NULL) &&
 	    (test_mode == 0) && (master_exp == NULL)) {
diff --git a/usr.sbin/portsnap/phttpget/phttpget.c b/usr.sbin/portsnap/phttpget/phttpget.c
index 1bf6d9d5b153..33e969a63ed3 100644
--- a/usr.sbin/portsnap/phttpget/phttpget.c
+++ b/usr.sbin/portsnap/phttpget/phttpget.c
@@ -598,7 +598,7 @@ main(int argc, char *argv[])
 			fd = open(fname, O_CREAT | O_TRUNC | O_WRONLY, 0644);
 			if (fd == -1)
 				errx(1, "open(%s)", fname);
-		};
+		}
 
 		/* Read the message and send data to fd if appropriate */
 		if (chunked) {
diff --git a/usr.sbin/ppp/radius.c b/usr.sbin/ppp/radius.c
index f79814125eef..12b0c0f9a6e7 100644
--- a/usr.sbin/ppp/radius.c
+++ b/usr.sbin/ppp/radius.c
@@ -1150,7 +1150,7 @@ radius_Account(struct radius *r, struct radacct *ac, struct datalink *dl,
     snprintf(ac->multi_session_id, sizeof ac->multi_session_id, "%s",
              dl->bundle->ncp.mp.active ?
              dl->bundle->ncp.mp.server.socket.sun_path : "");
-  };
+  }
 
   if (rad_put_string(r->cx.rad, RAD_USER_NAME, ac->user_name) != 0 ||
       rad_put_int(r->cx.rad, RAD_SERVICE_TYPE, RAD_FRAMED) != 0 ||