svn commit: r298354 - in head/sys: ddb geom/part kern netinet netinet6
Pedro F. Giffuni
pfg at FreeBSD.org
Wed Apr 20 16:19:46 UTC 2016
Author: pfg
Date: Wed Apr 20 16:19:44 2016
New Revision: 298354
URL: https://svnweb.freebsd.org/changeset/base/298354
Log:
Indentation issues.
Contract some lines leftover from r298310.
Mea culpa.
Modified:
head/sys/ddb/db_variables.c
head/sys/geom/part/g_part_bsd.c
head/sys/geom/part/g_part_ebr.c
head/sys/geom/part/g_part_ldm.c
head/sys/geom/part/g_part_mbr.c
head/sys/kern/sysv_msg.c
head/sys/kern/sysv_sem.c
head/sys/netinet/tcp_syncache.c
head/sys/netinet6/in6_proto.c
Modified: head/sys/ddb/db_variables.c
==============================================================================
--- head/sys/ddb/db_variables.c Wed Apr 20 16:03:53 2016 (r298353)
+++ head/sys/ddb/db_variables.c Wed Apr 20 16:19:44 2016 (r298354)
@@ -53,8 +53,7 @@ static struct db_variable db_vars[] = {
{ "db_vnet", NULL, db_var_db_vnet },
#endif
};
-static struct db_variable *db_evars =
- db_vars + nitems(db_vars);
+static struct db_variable *db_evars = db_vars + nitems(db_vars);
static int
db_find_variable(struct db_variable **varp)
Modified: head/sys/geom/part/g_part_bsd.c
==============================================================================
--- head/sys/geom/part/g_part_bsd.c Wed Apr 20 16:03:53 2016 (r298353)
+++ head/sys/geom/part/g_part_bsd.c Wed Apr 20 16:19:44 2016 (r298354)
@@ -140,8 +140,7 @@ bsd_parse_type(const char *type, uint8_t
*fstype = (u_int)lt;
return (0);
}
- for (i = 0;
- i < nitems(bsd_alias_match); i++) {
+ for (i = 0; i < nitems(bsd_alias_match); i++) {
alias = g_part_alias_name(bsd_alias_match[i].alias);
if (strcasecmp(type, alias) == 0) {
*fstype = bsd_alias_match[i].type;
Modified: head/sys/geom/part/g_part_ebr.c
==============================================================================
--- head/sys/geom/part/g_part_ebr.c Wed Apr 20 16:03:53 2016 (r298353)
+++ head/sys/geom/part/g_part_ebr.c Wed Apr 20 16:19:44 2016 (r298354)
@@ -188,8 +188,7 @@ ebr_parse_type(const char *type, u_char
*dp_typ = (u_char)lt;
return (0);
}
- for (i = 0;
- i < nitems(ebr_alias_match); i++) {
+ for (i = 0; i < nitems(ebr_alias_match); i++) {
alias = g_part_alias_name(ebr_alias_match[i].alias);
if (strcasecmp(type, alias) == 0) {
*dp_typ = ebr_alias_match[i].typ;
@@ -603,8 +602,7 @@ g_part_ebr_type(struct g_part_table *bas
int i;
entry = (struct g_part_ebr_entry *)baseentry;
- for (i = 0;
- i < nitems(ebr_alias_match); i++) {
+ for (i = 0; i < nitems(ebr_alias_match); i++) {
if (ebr_alias_match[i].typ == entry->ent.dp_typ)
return (g_part_alias_name(ebr_alias_match[i].alias));
}
Modified: head/sys/geom/part/g_part_ldm.c
==============================================================================
--- head/sys/geom/part/g_part_ldm.c Wed Apr 20 16:03:53 2016 (r298353)
+++ head/sys/geom/part/g_part_ldm.c Wed Apr 20 16:19:44 2016 (r298354)
@@ -453,8 +453,7 @@ ldm_privhdr_check(struct ldm_db *db, str
cp2->provider->mediasize / cp2->provider->sectorsize - 1;
} else
last = pp->mediasize / pp->sectorsize - 1;
- for (found = 0, i = is_gpt;
- i < nitems(ldm_ph_off); i++) {
+ for (found = 0, i = is_gpt; i < nitems(ldm_ph_off); i++) {
offset = ldm_ph_off[i];
/*
* In the GPT case consumer is attached to the LDM metadata
@@ -1468,8 +1467,7 @@ g_part_ldm_type(struct g_part_table *bas
int i;
entry = (struct g_part_ldm_entry *)baseentry;
- for (i = 0;
- i < nitems(ldm_alias_match); i++) {
+ for (i = 0; i < nitems(ldm_alias_match); i++) {
if (ldm_alias_match[i].typ == entry->type)
return (g_part_alias_name(ldm_alias_match[i].alias));
}
Modified: head/sys/geom/part/g_part_mbr.c
==============================================================================
--- head/sys/geom/part/g_part_mbr.c Wed Apr 20 16:03:53 2016 (r298353)
+++ head/sys/geom/part/g_part_mbr.c Wed Apr 20 16:19:44 2016 (r298354)
@@ -158,8 +158,7 @@ mbr_parse_type(const char *type, u_char
*dp_typ = (u_char)lt;
return (0);
}
- for (i = 0;
- i < nitems(mbr_alias_match); i++) {
+ for (i = 0; i < nitems(mbr_alias_match); i++) {
alias = g_part_alias_name(mbr_alias_match[i].alias);
if (strcasecmp(type, alias) == 0) {
*dp_typ = mbr_alias_match[i].typ;
@@ -560,8 +559,7 @@ g_part_mbr_type(struct g_part_table *bas
int i;
entry = (struct g_part_mbr_entry *)baseentry;
- for (i = 0;
- i < nitems(mbr_alias_match); i++) {
+ for (i = 0; i < nitems(mbr_alias_match); i++) {
if (mbr_alias_match[i].typ == entry->ent.dp_typ)
return (g_part_alias_name(mbr_alias_match[i].alias));
}
Modified: head/sys/kern/sysv_msg.c
==============================================================================
--- head/sys/kern/sysv_msg.c Wed Apr 20 16:03:53 2016 (r298353)
+++ head/sys/kern/sysv_msg.c Wed Apr 20 16:19:44 2016 (r298354)
@@ -1518,8 +1518,7 @@ sys_msgsys(td, uap)
if (!prison_allow(td->td_ucred, PR_ALLOW_SYSVIPC))
return (ENOSYS);
- if (uap->which < 0 ||
- uap->which >= nitems(msgcalls))
+ if (uap->which < 0 || uap->which >= nitems(msgcalls))
return (EINVAL);
error = (*msgcalls[uap->which])(td, &uap->a2);
return (error);
Modified: head/sys/kern/sysv_sem.c
==============================================================================
--- head/sys/kern/sysv_sem.c Wed Apr 20 16:03:53 2016 (r298353)
+++ head/sys/kern/sysv_sem.c Wed Apr 20 16:19:44 2016 (r298354)
@@ -1400,8 +1400,7 @@ sys_semsys(td, uap)
if (!prison_allow(td->td_ucred, PR_ALLOW_SYSVIPC))
return (ENOSYS);
- if (uap->which < 0 ||
- uap->which >= nitems(semcalls))
+ if (uap->which < 0 || uap->which >= nitems(semcalls))
return (EINVAL);
error = (*semcalls[uap->which])(td, &uap->a2);
return (error);
Modified: head/sys/netinet/tcp_syncache.c
==============================================================================
--- head/sys/netinet/tcp_syncache.c Wed Apr 20 16:03:53 2016 (r298353)
+++ head/sys/netinet/tcp_syncache.c Wed Apr 20 16:19:44 2016 (r298354)
@@ -1896,8 +1896,7 @@ syncookie_generate(struct syncache_head
/* Map our computed MSS into the 3-bit index. */
mss = min(tcp_mssopt(&sc->sc_inc), max(sc->sc_peer_mss, V_tcp_minmss));
- for (i = nitems(tcp_sc_msstab) - 1;
- tcp_sc_msstab[i] > mss && i > 0;
+ for (i = nitems(tcp_sc_msstab) - 1; tcp_sc_msstab[i] > mss && i > 0;
i--)
;
cookie.flags.mss_idx = i;
@@ -1909,7 +1908,7 @@ syncookie_generate(struct syncache_head
if (sc->sc_flags & SCF_WINSCALE) {
wscale = sc->sc_requested_s_scale;
for (i = nitems(tcp_sc_wstab) - 1;
- tcp_sc_wstab[i] > wscale && i > 0;
+ tcp_sc_wstab[i] > wscale && i > 0;
i--)
;
cookie.flags.wscale_idx = i;
Modified: head/sys/netinet6/in6_proto.c
==============================================================================
--- head/sys/netinet6/in6_proto.c Wed Apr 20 16:03:53 2016 (r298353)
+++ head/sys/netinet6/in6_proto.c Wed Apr 20 16:19:44 2016 (r298354)
@@ -381,8 +381,7 @@ struct domain inet6domain = {
.dom_family = AF_INET6,
.dom_name = "internet6",
.dom_protosw = (struct protosw *)inet6sw,
- .dom_protoswNPROTOSW = (struct protosw *)
- &inet6sw[nitems(inet6sw)],
+ .dom_protoswNPROTOSW = (struct protosw *)&inet6sw[nitems(inet6sw)],
#ifdef RADIX_MPATH
.dom_rtattach = rn6_mpath_inithead,
#else
More information about the svn-src-head
mailing list