Download raw body.
userland indentation cleanup
Fix indentation to avoid warnings with smatch and other tools.
No functional change.
diff --git bin/csh/func.c bin/csh/func.c
index b9a775b8a52..aa24749cb5c 100644
--- bin/csh/func.c
+++ bin/csh/func.c
@@ -866,8 +866,8 @@ xecho(int sep, Char **v)
(void) fflush(cshout);
if (setintr)
sigprocmask(SIG_BLOCK, &sigset, NULL);
- blkfree(gargv);
- gargv = NULL;
+ blkfree(gargv);
+ gargv = NULL;
}
void
diff --git bin/ed/buf.c bin/ed/buf.c
index 06dc7ebc89c..9e8a77bbcd6 100644
--- bin/ed/buf.c
+++ bin/ed/buf.c
@@ -158,8 +158,8 @@ get_line_node_addr(line_t *lp)
if (n && cp == &buffer_head) {
seterrmsg("invalid address");
return ERR;
- }
- return n;
+ }
+ return n;
}
diff --git bin/ksh/c_ksh.c bin/ksh/c_ksh.c
index cd75f77ad6f..6797fe33032 100644
--- bin/ksh/c_ksh.c
+++ bin/ksh/c_ksh.c
@@ -810,8 +810,8 @@ c_typeset(char **wp)
if ((vp->flag&INT_U))
shprintf("-U ");
shprintf("%s\n", vp->name);
- if (vp->flag&ARRAY)
- break;
+ if (vp->flag&ARRAY)
+ break;
} else {
if (pflag)
shprintf("%s ",
diff --git bin/ksh/edit.c bin/ksh/edit.c
index a06cbe7b4e0..9996b09dde2 100644
--- bin/ksh/edit.c
+++ bin/ksh/edit.c
@@ -451,7 +451,7 @@ x_file_glob(int flags, const char *str, int slen, char ***wordsp)
* which evaluated to an empty string (e.g.,
* "$FOO" when there is no FOO, etc).
*/
- if ((lstat(words[0], &statb) == -1) ||
+ if ((lstat(words[0], &statb) == -1) ||
words[0][0] == '\0') {
x_free_words(nwords, words);
words = NULL;
diff --git bin/pax/buf_subs.c bin/pax/buf_subs.c
index d278b3d4b4c..8634e9d8a0b 100644
--- bin/pax/buf_subs.c
+++ bin/pax/buf_subs.c
@@ -765,7 +765,7 @@ cp_file(ARCHD *arcn, int fd1, int fd2)
* check for holes in the source file. If none, we will use regular
* write instead of file write.
*/
- if (((off_t)(arcn->sb.st_blocks * BLKMULT)) >= arcn->sb.st_size)
+ if (((off_t)(arcn->sb.st_blocks * BLKMULT)) >= arcn->sb.st_size)
++no_hole;
/*
diff --git sbin/fsck_ext2fs/inode.c sbin/fsck_ext2fs/inode.c
index bfe3e5f6797..7b08780e12b 100644
--- sbin/fsck_ext2fs/inode.c
+++ sbin/fsck_ext2fs/inode.c
@@ -92,7 +92,7 @@ inosize(struct ext2fs_dinode *dp)
size |= (u_int64_t)letoh32(dp->e2di_size_hi) << 32;
if (size >= 0x80000000U)
(void)setlarge();
- return size;
+ return size;
}
void
diff --git sbin/growfs/growfs.c sbin/growfs/growfs.c
index 1f71d27ae31..75ebfe93efe 100644
--- sbin/growfs/growfs.c
+++ sbin/growfs/growfs.c
@@ -984,7 +984,7 @@ updcsloc(time_t utime, int fsi, int fso, unsigned int Nflag)
(d % sblock.fs_fpg) / sblock.fs_frag);
acg.cg_cs.cs_nbfree++;
sblock.fs_cstotal.cs_nbfree++;
- if (sblock.fs_contigsumsize > 0) {
+ if (sblock.fs_contigsumsize > 0) {
setbit(cg_clustersfree(&acg),
(d % sblock.fs_fpg) / sblock.fs_frag);
/*
@@ -1896,7 +1896,7 @@ main(int argc, char **argv)
sblock.fs_ncyl = sblock.fs_size * NSPF(&sblock) / sblock.fs_spc;
if (sblock.fs_size * NSPF(&sblock) >
sblock.fs_ncyl * sblock.fs_spc)
- sblock.fs_ncyl++;
+ sblock.fs_ncyl++;
}
sblock.fs_ncg = howmany(sblock.fs_size, sblock.fs_fpg);
if ((ino_t)sblock.fs_ncg * sblock.fs_ipg > UINT_MAX)
diff --git sbin/ifconfig/ifconfig.c sbin/ifconfig/ifconfig.c
index 8310907e9f7..d13afe56254 100644
--- sbin/ifconfig/ifconfig.c
+++ sbin/ifconfig/ifconfig.c
@@ -6313,7 +6313,7 @@ umb_pinop(int op, int is_puk, const char *pin, const char *newpin)
if (newpin) {
if ((mp.newpinlen = char_to_utf16(newpin, (uint16_t *)mp.newpin,
sizeof (mp.newpin))) == -1)
- errx(1, "new PIN too long");
+ errx(1, "new PIN too long");
}
if (ioctl(sock, SIOCSUMBPARAM, (caddr_t)&ifr) == -1)
diff --git sbin/ncheck_ffs/ncheck_ffs.c sbin/ncheck_ffs/ncheck_ffs.c
index 793fb18276b..a0dda1a98cc 100644
--- sbin/ncheck_ffs/ncheck_ffs.c
+++ sbin/ncheck_ffs/ncheck_ffs.c
@@ -462,7 +462,7 @@ searchdir(ufsino_t ino, daddr_t blkno, long size, off_t filesize,
if (dp->d_name[0] == '.') {
if (dp->d_name[1] == '\0' ||
(dp->d_name[1] == '.' && dp->d_name[2] == '\0'))
- continue;
+ continue;
}
if (asprintf(&npath, "%s/%s", path, dp->d_name) == -1)
errx(1, "malloc");
diff --git sbin/ping/ping.c sbin/ping/ping.c
index a3b3d650eb5..ffc7c22344c 100644
--- sbin/ping/ping.c
+++ sbin/ping/ping.c
@@ -378,7 +378,7 @@ main(int argc, char *argv[])
case 'p': /* fill buffer with user pattern */
options |= F_PINGFILLED;
fill((char *)datap, optarg);
- break;
+ break;
case 'q':
options |= F_QUIET;
break;
diff --git usr.bin/calendar/ostern.c usr.bin/calendar/ostern.c
index 536e7b8fb24..79ca5ab2b9d 100644
--- usr.bin/calendar/ostern.c
+++ usr.bin/calendar/ostern.c
@@ -62,7 +62,7 @@ easter(int year) /* 0 ... abcd, NOT since 1900 */
e_q++;
if (e_n == 4)
- e_q += 31;
+ e_q += 31;
#if DEBUG
printf("%d %d %d %d %d %d %d %d %d %d %d %d %d %d %d\n",
diff --git usr.bin/dc/dc.c usr.bin/dc/dc.c
index a8b598c2439..c0b710f27a9 100644
--- usr.bin/dc/dc.c
+++ usr.bin/dc/dc.c
@@ -110,7 +110,7 @@ dc_main(int argc, char *argv[])
* BSD and Solaris dc(1) continue with stdin after processing
* the file given as the argument. We follow GNU dc(1).
*/
- return (0);
+ return (0);
}
src_setstream(&src, stdin);
diff --git usr.bin/dig/dighost.c usr.bin/dig/dighost.c
index 2d2a52c86e2..fad89610716 100644
--- usr.bin/dig/dighost.c
+++ usr.bin/dig/dighost.c
@@ -3643,15 +3643,14 @@ recv_done(isc_task_t *task, isc_event_t *event) {
} else {
if (msg->rcode == dns_rcode_noerror || l->origin == NULL) {
-
- dighost_received(b->used, &sevent->address, query);
+ dighost_received(b->used, &sevent->address, query);
}
if (!query->lookup->ns_search_only)
query->lookup->pending = 0;
if (!query->lookup->ns_search_only ||
query->lookup->trace_root || docancel) {
- dns_message_destroy(&msg);
+ dns_message_destroy(&msg);
cancel_lookup(l);
}
diff --git usr.bin/dig/lib/dns/rdata.c usr.bin/dig/lib/dns/rdata.c
index acd7caa50db..c0d148bf66b 100644
--- usr.bin/dig/lib/dns/rdata.c
+++ usr.bin/dig/lib/dns/rdata.c
@@ -1430,25 +1430,24 @@ byte_btoa(int c, isc_buffer_t *target, struct state *state) {
tr.base[0] = 'z';
isc_buffer_add(target, 1);
} else {
- register int tmp = 0;
- register int32_t tmpword = word;
-
- if (tmpword < 0) {
- /*
- * Because some don't support u_long.
- */
- tmp = 32;
- tmpword -= (int32_t)(85 * 85 * 85 * 85 * 32);
- }
- if (tmpword < 0) {
- tmp = 64;
- tmpword -= (int32_t)(85 * 85 * 85 * 85 * 32);
- }
+ register int tmp = 0;
+ register int32_t tmpword = word;
+
+ if (tmpword < 0) {
+ /*
+ * Because some don't support u_long.
+ */
+ tmp = 32;
+ tmpword -= (int32_t)(85 * 85 * 85 * 85 * 32);
+ }
+ if (tmpword < 0) {
+ tmp = 64;
+ tmpword -= (int32_t)(85 * 85 * 85 * 85 * 32);
+ }
if (tr.length < 5)
return (ISC_R_NOSPACE);
tr.base[0] = atob_digits[(tmpword /
- (int32_t)(85 * 85 * 85 * 85))
- + tmp];
+ (int32_t)(85 * 85 * 85 * 85)) + tmp];
tmpword %= (int32_t)(85 * 85 * 85 * 85);
tr.base[1] = atob_digits[tmpword / (85 * 85 * 85)];
tmpword %= (85 * 85 * 85);
diff --git usr.bin/dig/lib/dns/rdata/generic/tkey_249.c usr.bin/dig/lib/dns/rdata/generic/tkey_249.c
index 97fab1f5f0d..17bf7e4f31f 100644
--- usr.bin/dig/lib/dns/rdata/generic/tkey_249.c
+++ usr.bin/dig/lib/dns/rdata/generic/tkey_249.c
@@ -127,18 +127,18 @@ totext_tkey(ARGS_TOTEXT) {
*/
REQUIRE(n <= sr.length);
if (n != 0U) {
- dr = sr;
- dr.length = n;
- if ((tctx->flags & DNS_STYLEFLAG_MULTILINE) != 0)
- RETERR(isc_str_tobuffer(" (", target));
- RETERR(isc_str_tobuffer(tctx->linebreak, target));
+ dr = sr;
+ dr.length = n;
+ if ((tctx->flags & DNS_STYLEFLAG_MULTILINE) != 0)
+ RETERR(isc_str_tobuffer(" (", target));
+ RETERR(isc_str_tobuffer(tctx->linebreak, target));
if (tctx->width == 0) /* No splitting */
RETERR(isc_base64_totext(&dr, 60, "", target));
else
RETERR(isc_base64_totext(&dr, tctx->width - 2,
- tctx->linebreak, target));
- if ((tctx->flags & DNS_STYLEFLAG_MULTILINE) != 0)
- RETERR(isc_str_tobuffer(" )", target));
+ tctx->linebreak, target));
+ if ((tctx->flags & DNS_STYLEFLAG_MULTILINE) != 0)
+ RETERR(isc_str_tobuffer(" )", target));
}
return (ISC_R_SUCCESS);
}
diff --git usr.bin/dig/lib/dns/tsig.c usr.bin/dig/lib/dns/tsig.c
index 795944c0647..ab2826459d9 100644
--- usr.bin/dig/lib/dns/tsig.c
+++ usr.bin/dig/lib/dns/tsig.c
@@ -295,8 +295,8 @@ dns_tsigkey_create(dns_name_t *name, dns_name_t *algorithm,
DNS_KEYOWNER_ENTITY,
DNS_KEYPROTO_DNSSEC,
&b, &dstkey);
- if (result != ISC_R_SUCCESS)
- return (result);
+ if (result != ISC_R_SUCCESS)
+ return (result);
}
} else if (dns_name_equal(algorithm, DNS_TSIG_HMACSHA224_NAME)) {
if (secret != NULL) {
@@ -308,8 +308,8 @@ dns_tsigkey_create(dns_name_t *name, dns_name_t *algorithm,
DNS_KEYOWNER_ENTITY,
DNS_KEYPROTO_DNSSEC,
&b, &dstkey);
- if (result != ISC_R_SUCCESS)
- return (result);
+ if (result != ISC_R_SUCCESS)
+ return (result);
}
} else if (dns_name_equal(algorithm, DNS_TSIG_HMACSHA256_NAME)) {
if (secret != NULL) {
@@ -321,8 +321,8 @@ dns_tsigkey_create(dns_name_t *name, dns_name_t *algorithm,
DNS_KEYOWNER_ENTITY,
DNS_KEYPROTO_DNSSEC,
&b, &dstkey);
- if (result != ISC_R_SUCCESS)
- return (result);
+ if (result != ISC_R_SUCCESS)
+ return (result);
}
} else if (dns_name_equal(algorithm, DNS_TSIG_HMACSHA384_NAME)) {
if (secret != NULL) {
@@ -334,8 +334,8 @@ dns_tsigkey_create(dns_name_t *name, dns_name_t *algorithm,
DNS_KEYOWNER_ENTITY,
DNS_KEYPROTO_DNSSEC,
&b, &dstkey);
- if (result != ISC_R_SUCCESS)
- return (result);
+ if (result != ISC_R_SUCCESS)
+ return (result);
}
} else if (dns_name_equal(algorithm, DNS_TSIG_HMACSHA512_NAME)) {
if (secret != NULL) {
@@ -347,8 +347,8 @@ dns_tsigkey_create(dns_name_t *name, dns_name_t *algorithm,
DNS_KEYOWNER_ENTITY,
DNS_KEYPROTO_DNSSEC,
&b, &dstkey);
- if (result != ISC_R_SUCCESS)
- return (result);
+ if (result != ISC_R_SUCCESS)
+ return (result);
}
} else if (length > 0)
return (DNS_R_BADALG);
diff --git usr.bin/make/expandchildren.c usr.bin/make/expandchildren.c
index a259c30c189..6cb1dfa9798 100644
--- usr.bin/make/expandchildren.c
+++ usr.bin/make/expandchildren.c
@@ -133,13 +133,13 @@ ExpandVarChildren(LstNode after, GNode *cgn, GNode *pgn)
cp2+=2;
else
cp2++;
- }
+ }
- if (cp2 != start) {
- /* Stuff left over -- add it to the list too. */
- gn = Targ_FindNodei(start, cp2, TARG_CREATE);
- Lst_AtEnd(&members, gn);
- }
+ if (cp2 != start) {
+ /* Stuff left over -- add it to the list too. */
+ gn = Targ_FindNodei(start, cp2, TARG_CREATE);
+ Lst_AtEnd(&members, gn);
+ }
}
/* Add all elements of the members list to the parent node. */
while ((gn = Lst_DeQueue(&members)) != NULL) {
diff --git usr.bin/mg/file.c usr.bin/mg/file.c
index d710935930e..7ab74950f21 100644
--- usr.bin/mg/file.c
+++ usr.bin/mg/file.c
@@ -406,8 +406,8 @@ retry:
dobeep();
ewprintf("Could not allocate %d bytes",
newsize);
- s = FIOERR;
- goto endoffile;
+ s = FIOERR;
+ goto endoffile;
}
bcopy(line, cp, linesize);
free(line);
diff --git usr.bin/rdist/docmd.c usr.bin/rdist/docmd.c
index 5d0279bcf62..49726628547 100644
--- usr.bin/rdist/docmd.c
+++ usr.bin/rdist/docmd.c
@@ -485,31 +485,31 @@ doarrow(struct cmd *cmd, char **filev)
* b) basename of destination in "install" directive is "."
* (e.g. install /tmp/.;)
* c) name on left side of -> directive is a directory on local system.
- *
- * We need 2 destdir flags (destdir and ddir) because single directory
- * source is handled differently. In this case, ddir is 0 (which
- * tells install() not to send DIRTARGET directive to remote rdistd)
- * and destdir is 1 (which tells remfilename() how to build the FILE
- * variables correctly). In every other case, destdir and ddir will
- * have the same value.
+ *
+ * We need 2 destdir flags (destdir and ddir) because single directory
+ * source is handled differently. In this case, ddir is 0 (which
+ * tells install() not to send DIRTARGET directive to remote rdistd)
+ * and destdir is 1 (which tells remfilename() how to build the FILE
+ * variables correctly). In every other case, destdir and ddir will
+ * have the same value.
*/
- ddir = files->n_next != NULL; /* destination is a directory */
+ ddir = files->n_next != NULL; /* destination is a directory */
if (!ddir) {
struct stat s;
- int isadir = 0;
+ int isadir = 0;
if (lstat(files->n_name, &s) == 0)
- isadir = S_ISDIR(s.st_mode);
- if (!isadir && sc->sc_name && *sc->sc_name)
- ddir = !strcmp(xbasename(sc->sc_name),".");
- destdir = isadir | ddir;
- } else
- destdir = ddir;
+ isadir = S_ISDIR(s.st_mode);
+ if (!isadir && sc->sc_name && *sc->sc_name)
+ ddir = !strcmp(xbasename(sc->sc_name),".");
+ destdir = isadir | ddir;
+ } else
+ destdir = ddir;
debugmsg(DM_MISC,
"Debug files->n_next= %p, destdir=%d, ddir=%d",
files->n_next, destdir, ddir);
-
+
if (!sc->sc_name || !*sc->sc_name) {
destdir = 0;
ddir = 0;
diff --git usr.bin/snmp/snmpc.c usr.bin/snmp/snmpc.c
index 3930c919274..5728645d0eb 100644
--- usr.bin/snmp/snmpc.c
+++ usr.bin/snmp/snmpc.c
@@ -233,7 +233,7 @@ main(int argc, char *argv[])
errx(1, "-3K");
}
privkeylevel = USM_KEY_LOCALIZED;
- break;
+ break;
case 'k':
authkey = snmpc_hex2bin(optarg, &authkeylen);
if (authkey == NULL) {
diff --git usr.bin/ssh/sshconnect.c usr.bin/ssh/sshconnect.c
index 850372cba0d..765e7699111 100644
--- usr.bin/ssh/sshconnect.c
+++ usr.bin/ssh/sshconnect.c
@@ -609,7 +609,7 @@ get_hostfile_hostname_ipaddr(char *hostname, struct sockaddr *hostaddr,
if (options.proxy_command == NULL) {
if (getnameinfo(hostaddr, hostaddr->sa_len,
ntop, sizeof(ntop), NULL, 0, NI_NUMERICHOST) != 0)
- fatal_f("getnameinfo failed");
+ fatal_f("getnameinfo failed");
*hostfile_ipaddr = put_host_port(ntop, port);
} else {
*hostfile_ipaddr = xstrdup("<no hostip for proxy "
diff --git usr.bin/systat/pftop.c usr.bin/systat/pftop.c
index d64dec2e35e..9e78c07875f 100644
--- usr.bin/systat/pftop.c
+++ usr.bin/systat/pftop.c
@@ -716,7 +716,7 @@ unmask(struct pf_addr * m)
void
tb_print_addr(struct pf_addr * addr, struct pf_addr * mask, int af)
{
- switch (af) {
+ switch (af) {
case AF_INET: {
tbprintf("%s", inetname(addr->v4));
break;
diff --git usr.bin/telnet/telnet.c usr.bin/telnet/telnet.c
index 05ca9905e6f..96d2e647b08 100644
--- usr.bin/telnet/telnet.c
+++ usr.bin/telnet/telnet.c
@@ -1359,7 +1359,7 @@ env_opt_add(char *ep)
opt_add(c);
}
if ((ep = vp)) {
- opt_add(NEW_ENV_VALUE);
+ opt_add(NEW_ENV_VALUE);
vp = NULL;
} else
break;
diff --git usr.bin/tftp/tftpsubs.c usr.bin/tftp/tftpsubs.c
index 85c2e372849..6635790cf1b 100644
--- usr.bin/tftp/tftpsubs.c
+++ usr.bin/tftp/tftpsubs.c
@@ -165,7 +165,7 @@ read_ahead(FILE *file, int convert, int segment_size)
newline = 1;
}
}
- *p++ = c;
+ *p++ = c;
}
b->counter = (int)(p - dp->th_data);
}
diff --git usr.bin/tmux/cmd-queue.c usr.bin/tmux/cmd-queue.c
index 3ce516803f0..675bb3f502c 100644
--- usr.bin/tmux/cmd-queue.c
+++ usr.bin/tmux/cmd-queue.c
@@ -806,10 +806,10 @@ cmdq_running(struct client *c)
struct cmdq_list *queue = cmdq_get(c);
if (queue->item == NULL)
- return (NULL);
- if (queue->item->flags & CMDQ_WAITING)
- return (NULL);
- return (queue->item);
+ return (NULL);
+ if (queue->item->flags & CMDQ_WAITING)
+ return (NULL);
+ return (queue->item);
}
/* Print a guard line. */
diff --git usr.bin/tmux/window-copy.c usr.bin/tmux/window-copy.c
index 3ae46cdc986..c20cab3234b 100644
--- usr.bin/tmux/window-copy.c
+++ usr.bin/tmux/window-copy.c
@@ -4694,7 +4694,7 @@ window_copy_get_selection(struct window_mode_entry *wme, size_t *len)
if (keys == MODEKEY_EMACS || lastex <= ey_last) {
if (~grid_get_line(data->backing->grid, ey)->flags &
GRID_LINE_WRAPPED || lastex != ey_last)
- off -= 1;
+ off -= 1;
}
*len = off;
return (buf);
diff --git usr.sbin/amd/amd/amq_subr.c usr.sbin/amd/amd/amq_subr.c
index c1fce38b3a2..b132b6f87a2 100644
--- usr.sbin/amd/amd/amq_subr.c
+++ usr.sbin/amd/amd/amq_subr.c
@@ -300,7 +300,7 @@ xdr_amq_mount_stats(XDR *xdrs, amq_mount_stats *objp)
bool_t
xdr_amq_mount_tree_list(XDR *xdrs, amq_mount_tree_list *objp)
{
- if (!xdr_array(xdrs, (char **)&objp->amq_mount_tree_list_val, (u_int *)&objp->amq_mount_tree_list_len, ~0, sizeof(amq_mount_tree_p), xdr_amq_mount_tree_p)) {
+ if (!xdr_array(xdrs, (char **)&objp->amq_mount_tree_list_val, (u_int *)&objp->amq_mount_tree_list_len, ~0, sizeof(amq_mount_tree_p), xdr_amq_mount_tree_p)) {
return (FALSE);
}
return (TRUE);
diff --git usr.sbin/amd/amd/nfs_ops.c usr.sbin/amd/amd/nfs_ops.c
index 7c2e01e6a16..e49122d4f45 100644
--- usr.sbin/amd/amd/nfs_ops.c
+++ usr.sbin/amd/amd/nfs_ops.c
@@ -377,7 +377,7 @@ call_mountd(fh_cache *fp, u_long proc, fwd_fun f, void *wchan)
* to be redone. The quick solution here is to invalidate the MOUNTD
* port.
*/
- fp->fh_sin.sin_port = 0;
+ fp->fh_sin.sin_port = 0;
return error;
}
diff --git usr.sbin/dvmrpd/dvmrpe.c usr.sbin/dvmrpd/dvmrpe.c
index c799e37e841..a5a9951455f 100644
--- usr.sbin/dvmrpd/dvmrpe.c
+++ usr.sbin/dvmrpd/dvmrpe.c
@@ -314,7 +314,7 @@ dvmrpe_dispatch_rde(int fd, short event, void *bula)
ssize_t n;
int shut = 0;
- if (event & EV_READ) {
+ if (event & EV_READ) {
if ((n = imsg_read(ibuf)) == -1 && errno != EAGAIN)
fatal("imsg_read error");
if (n == 0) /* connection closed */
diff --git usr.sbin/dvmrpd/probe.c usr.sbin/dvmrpd/probe.c
index 98b803c8d4c..101a3c9020a 100644
--- usr.sbin/dvmrpd/probe.c
+++ usr.sbin/dvmrpd/probe.c
@@ -115,7 +115,7 @@ recv_probe(struct iface *iface, struct in_addr src, u_int32_t src_ip,
if (nbr_id == iface->addr.s_addr) {
/* seen myself */
if (nbr->state < NBR_STA_2_WAY)
- nbr_fsm(nbr, NBR_EVT_2_WAY_RCVD);
+ nbr_fsm(nbr, NBR_EVT_2_WAY_RCVD);
break;
}
buf += sizeof(nbr_id);
diff --git usr.sbin/ifstated/ifstated.c usr.sbin/ifstated/ifstated.c
index 80e5c48eac6..4e18d99b536 100644
--- usr.sbin/ifstated/ifstated.c
+++ usr.sbin/ifstated/ifstated.c
@@ -548,7 +548,7 @@ adjust_expressions(struct ifsd_expression_list *expressions, int depth)
}
if (expression->parent != NULL) {
if (TAILQ_EMPTY(&nexpressions))
- te = NULL;
+ te = NULL;
TAILQ_FOREACH(te, &nexpressions, eval)
if (expression->parent == te)
break;
diff --git usr.sbin/ldpd/lde.c usr.sbin/ldpd/lde.c
index 1f41a59d6d9..88389bd65a3 100644
--- usr.sbin/ldpd/lde.c
+++ usr.sbin/ldpd/lde.c
@@ -1163,7 +1163,7 @@ lde_nbr_clear(void)
{
struct lde_nbr *ln;
- while ((ln = RB_ROOT(&lde_nbrs)) != NULL)
+ while ((ln = RB_ROOT(&lde_nbrs)) != NULL)
lde_nbr_del(ln);
}
diff --git usr.sbin/lpr/common_source/displayq.c usr.sbin/lpr/common_source/displayq.c
index 4eb544202d3..3e59e65f106 100644
--- usr.sbin/lpr/common_source/displayq.c
+++ usr.sbin/lpr/common_source/displayq.c
@@ -462,9 +462,9 @@ dump(char *nfile, char *file, int copies)
* Print as many files as will fit
* (leaving room for the total size)
*/
- fill = first ? 0 : 2; /* fill space for ``, '' */
- if (((n = strlen(nfile)) + col + fill) >=
- (termwidth - (80 - SIZCOL)) - 4) {
+ fill = first ? 0 : 2; /* fill space for ``, '' */
+ if (((n = strlen(nfile)) + col + fill) >=
+ (termwidth - (80 - SIZCOL)) - 4) {
if (col < (termwidth - (80 - SIZCOL))) {
printf(" ..."), col += 4;
blankfill(termwidth - (80 - SIZCOL));
diff --git usr.sbin/makefs/msdos/msdosfs_fat.c usr.sbin/makefs/msdos/msdosfs_fat.c
index bcf2cc84535..973e95f6622 100644
--- usr.sbin/makefs/msdos/msdosfs_fat.c
+++ usr.sbin/makefs/msdos/msdosfs_fat.c
@@ -1065,7 +1065,7 @@ extendfile(struct denode *dep, u_long count, struct mkfsbuf **bpp, u_long *ncp,
clrbuf(bp);
if (bpp) {
*bpp = bp;
- bpp = NULL;
+ bpp = NULL;
} else {
bdwrite(bp);
}
diff --git usr.sbin/mopd/common/print.c usr.sbin/mopd/common/print.c
index 524dd6e21c3..03733d06176 100644
--- usr.sbin/mopd/common/print.c
+++ usr.sbin/mopd/common/print.c
@@ -135,7 +135,7 @@ mopPrintOneline(FILE *fd, u_char *pkt, int trans)
mopPrintHWA(fd, src); fprintf(fd, " > ");
mopPrintHWA(fd, dst);
if (len < 1600)
- fprintf(fd, " len %4d code %02x ", len, code);
+ fprintf(fd, " len %4d code %02x ", len, code);
else
fprintf(fd, " len %4d code %02x ",
(len % 256)*256 + (len /256), code);
diff --git usr.sbin/mtree/compare.c usr.sbin/mtree/compare.c
index 6ac3ff76508..ed24674e760 100644
--- usr.sbin/mtree/compare.c
+++ usr.sbin/mtree/compare.c
@@ -328,7 +328,7 @@ typeerr: LABEL;
"-" : db_flags,
(*cur_flags == '\0') ?
"-" : cur_flags);
- tab = "\t";
+ tab = "\t";
if (uflag)
if (chflags(p->fts_accpath, s->file_flags))
(void)printf(", not modified: %s)\n",
diff --git usr.sbin/ntpd/control.c usr.sbin/ntpd/control.c
index 6ca4cefea44..a740be37303 100644
--- usr.sbin/ntpd/control.c
+++ usr.sbin/ntpd/control.c
@@ -251,7 +251,7 @@ control_dispatch_msg(struct pollfd *pfd, u_int *ctl_cnt)
build_show_sensor(&c_sensor, s);
imsg_compose(&c->ibuf, IMSG_CTL_SHOW_SENSORS,
0, 0, -1, &c_sensor, sizeof(c_sensor));
- cnt++;
+ cnt++;
}
imsg_compose(&c->ibuf, IMSG_CTL_SHOW_SENSORS_END,
0, 0, -1, &cnt, sizeof(cnt));
@@ -276,7 +276,7 @@ control_dispatch_msg(struct pollfd *pfd, u_int *ctl_cnt)
build_show_sensor(&c_sensor, s);
imsg_compose(&c->ibuf, IMSG_CTL_SHOW_SENSORS,
0, 0, -1, &c_sensor, sizeof(c_sensor));
- cnt++;
+ cnt++;
}
imsg_compose(&c->ibuf, IMSG_CTL_SHOW_SENSORS_END,
0, 0, -1, &cnt, sizeof(cnt));
diff --git usr.sbin/pcidump/pcidump.c usr.sbin/pcidump/pcidump.c
index c7dc589ce89..46b0a69f874 100644
--- usr.sbin/pcidump/pcidump.c
+++ usr.sbin/pcidump/pcidump.c
@@ -337,11 +337,11 @@ probe(int bus, int dev, int func)
if (vendor != NULL) {
for (pkp = pci_known_products; pkp->productname != NULL; pkp++)
- if (pkp->vendor == PCI_VENDOR(id_reg) &&
- pkp->product == PCI_PRODUCT(id_reg)) {
- product = pkp->productname;
- break;
- }
+ if (pkp->vendor == PCI_VENDOR(id_reg) &&
+ pkp->product == PCI_PRODUCT(id_reg)) {
+ product = pkp->productname;
+ break;
+ }
}
printf(" %d:%d:%d: %s %s\n", bus, dev, func,
diff --git usr.sbin/quot/quot.c usr.sbin/quot/quot.c
index 1617ce4f5a9..fc84523a387 100644
--- usr.sbin/quot/quot.c
+++ usr.sbin/quot/quot.c
@@ -103,8 +103,9 @@ get_inode(int fd, struct fs *super, ino_t ino)
if (pread(fd, cgp, super->fs_cgsize,
(off_t)cgtod(super, cg) << super->fs_fshift)
!= super->fs_cgsize)
- if (read(fd, cgp, super->fs_cgsize) != super->fs_cgsize)
- err(1, "read cg");
+ if (read(fd, cgp, super->fs_cgsize) !=
+ super->fs_cgsize)
+ err(1, "read cg");
if (!cg_chkmagic(cgp))
errx(1, "cg has bad magic");
}
diff --git usr.sbin/radiusd/radiusd_standard.c usr.sbin/radiusd/radiusd_standard.c
index f819e3b4723..190a0b67db9 100644
--- usr.sbin/radiusd/radiusd_standard.c
+++ usr.sbin/radiusd/radiusd_standard.c
@@ -272,7 +272,7 @@ module_standard_resdeco(void *ctx, u_int q_id, const u_char *req, size_t reqlen,
TAILQ_FOREACH(attr, &module->remove_resattrs, next) {
if (radres == NULL &&
(radres = radius_convert_packet(res, reslen)) == NULL) {
- syslog(LOG_ERR,
+ syslog(LOG_ERR,
"%s: radius_convert_packet() failed: %m", __func__);
module_stop(module->base);
return;
diff --git usr.sbin/ripd/auth.c usr.sbin/ripd/auth.c
index 10449740647..61097a1c9d3 100644
--- usr.sbin/ripd/auth.c
+++ usr.sbin/ripd/auth.c
@@ -251,7 +251,7 @@ auth_add_trailer(struct ibuf *buf, struct iface *iface)
iface->auth_keyid)) == NULL) {
log_debug("auth_add_trailer: keyid %d not configured, "
"interface %s", iface->auth_keyid, iface->name);
- return (-1);
+ return (-1);
}
memcpy(digest, md->key, MD5_DIGEST_LENGTH);
diff --git usr.sbin/sasyncd/carp.c usr.sbin/sasyncd/carp.c
index ea35db196bb..aa6d4482f74 100644
--- usr.sbin/sasyncd/carp.c
+++ usr.sbin/sasyncd/carp.c
@@ -127,7 +127,7 @@ carp_demote(int demote, int force)
log_msg(1, "carp_demote: unable to get "
"the demote state of group '%s'",
cfgstate.carp_ifgroup);
- goto done;
+ goto done;
}
if (ifgr.ifgr_attrib.ifg_carp_demoted == 0)
diff --git usr.sbin/smtpd/lka_filter.c usr.sbin/smtpd/lka_filter.c
index e53b161969b..f088815c64e 100644
--- usr.sbin/smtpd/lka_filter.c
+++ usr.sbin/smtpd/lka_filter.c
@@ -729,7 +729,7 @@ filter_protocol_internal(struct filter_session *fs, uint64_t *token, uint64_t re
filter->name,
param,
filter->config->rewrite);
- filter_result_rewrite(reqid, filter->config->rewrite);
+ filter_result_rewrite(reqid, filter->config->rewrite);
return;
}
else if (filter->config->disconnect) {
diff --git usr.sbin/smtpd/mda_variables.c usr.sbin/smtpd/mda_variables.c
index 0f2be7722c8..37021cd0498 100644
--- usr.sbin/smtpd/mda_variables.c
+++ usr.sbin/smtpd/mda_variables.c
@@ -74,27 +74,27 @@ mda_expand_token(char *dest, size_t len, const char *token,
return -1;
*lbracket = *rbracket = '\0';
- content = lbracket + 1;
-
- if ((sep = strchr(content, ':')) == NULL)
- endoff = begoff = strtonum(content, -EXPAND_BUFFER,
- EXPAND_BUFFER, &errstr);
- else {
- *sep = '\0';
- if (content != sep)
- begoff = strtonum(content, -EXPAND_BUFFER,
- EXPAND_BUFFER, &errstr);
- if (*(++sep)) {
- if (errstr == NULL)
- endoff = strtonum(sep, -EXPAND_BUFFER,
- EXPAND_BUFFER, &errstr);
- }
- }
- if (errstr)
- return -1;
-
- /* token:mod_1,mod_2,mod_n -> extract modifiers */
- mods = strchr(rbracket + 1, ':');
+ content = lbracket + 1;
+
+ if ((sep = strchr(content, ':')) == NULL)
+ endoff = begoff = strtonum(content, -EXPAND_BUFFER,
+ EXPAND_BUFFER, &errstr);
+ else {
+ *sep = '\0';
+ if (content != sep)
+ begoff = strtonum(content, -EXPAND_BUFFER,
+ EXPAND_BUFFER, &errstr);
+ if (*(++sep)) {
+ if (errstr == NULL)
+ endoff = strtonum(sep, -EXPAND_BUFFER,
+ EXPAND_BUFFER, &errstr);
+ }
+ }
+ if (errstr)
+ return -1;
+
+ /* token:mod_1,mod_2,mod_n -> extract modifiers */
+ mods = strchr(rbracket + 1, ':');
} else {
if ((mods = strchr(rtoken, ':')) != NULL)
*mods++ = '\0';
diff --git usr.sbin/smtpd/mta.c usr.sbin/smtpd/mta.c
index fe433220ac4..846b8d1dae4 100644
--- usr.sbin/smtpd/mta.c
+++ usr.sbin/smtpd/mta.c
@@ -1364,7 +1364,7 @@ mta_connect(struct mta_connector *c)
mta_session(c->relay, route, mx->mxname); /* this never fails synchronously */
mta_relay_ref(c->relay);
- goto again;
+ goto again;
}
static void
diff --git usr.sbin/tcpdump/print-ospf.c usr.sbin/tcpdump/print-ospf.c
index 43068928a56..4e1b44cbf66 100644
--- usr.sbin/tcpdump/print-ospf.c
+++ usr.sbin/tcpdump/print-ospf.c
@@ -343,7 +343,7 @@ ospf_print_lsa(const struct lsa *lsap)
(u_int32_t)ntohl(mcp->mcla_vtype));
break;
}
- ++mcp;
+ ++mcp;
}
}
diff --git usr.sbin/tcpdump/print-slow.c usr.sbin/tcpdump/print-slow.c
index d05117b7f82..be02e1d649a 100644
--- usr.sbin/tcpdump/print-slow.c
+++ usr.sbin/tcpdump/print-slow.c
@@ -261,7 +261,7 @@ slow_print(const u_char *pptr, u_int len)
tlen -= tlv_len;
}
- return;
+ return;
trunc:
- printf("\n\t[|slow]");
+ printf("\n\t[|slow]");
}
diff --git usr.sbin/tcpdump/print-snmp.c usr.sbin/tcpdump/print-snmp.c
index 4458287b590..08be3865e59 100644
--- usr.sbin/tcpdump/print-snmp.c
+++ usr.sbin/tcpdump/print-snmp.c
@@ -662,7 +662,7 @@ asn1_print(struct be *elem)
case BE_NULL:
break;
case BE_OID: {
- int o = 0, first = -1, i = asnlen;
+ int o = 0, first = -1, i = asnlen;
if (!nflag && asnlen > 2) {
struct obj_abrev *a = &obj_abrev_list[0];
userland indentation cleanup