d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Indentation issues.

Browse Source 
Contract some lines leftover from r298310.

Mea culpa.
This commit is contained in:
Pedro F. Giffuni 2016-04-20 16:19:44 +00:00
parent 422fa64be3
commit 63b6b7a74a
9 changed files with 13 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
sys/ddb/db_variables.c
View File

@ -53,8 +53,7 @@ static struct db_variable db_vars[] = {
{ "db_vnet", NULL, db_var_db_vnet }, { "db_vnet", NULL, db_var_db_vnet },
#endif #endif
}; };
static struct db_variable *db_evars = static struct db_variable *db_evars = db_vars + nitems(db_vars);
db_vars + nitems(db_vars);
static int static int
db_find_variable(struct db_variable **varp) db_find_variable(struct db_variable **varp)

3
sys/geom/part/g_part_bsd.c
View File

@ -140,8 +140,7 @@ bsd_parse_type(const char *type, uint8_t *fstype)
*fstype = (u_int)lt; *fstype = (u_int)lt;
return (0); return (0);
} }
for (i = 0; for (i = 0; i < nitems(bsd_alias_match); i++) {
i < nitems(bsd_alias_match); i++) {
alias = g_part_alias_name(bsd_alias_match[i].alias); alias = g_part_alias_name(bsd_alias_match[i].alias);
if (strcasecmp(type, alias) == 0) { if (strcasecmp(type, alias) == 0) {
*fstype = bsd_alias_match[i].type; *fstype = bsd_alias_match[i].type;

6
sys/geom/part/g_part_ebr.c
View File

@ -188,8 +188,7 @@ ebr_parse_type(const char *type, u_char *dp_typ)
*dp_typ = (u_char)lt; *dp_typ = (u_char)lt;
return (0); return (0);
} }
for (i = 0; for (i = 0; i < nitems(ebr_alias_match); i++) {
i < nitems(ebr_alias_match); i++) {
alias = g_part_alias_name(ebr_alias_match[i].alias); alias = g_part_alias_name(ebr_alias_match[i].alias);
if (strcasecmp(type, alias) == 0) { if (strcasecmp(type, alias) == 0) {
*dp_typ = ebr_alias_match[i].typ; *dp_typ = ebr_alias_match[i].typ;
@ -603,8 +602,7 @@ g_part_ebr_type(struct g_part_table *basetable, struct g_part_entry *baseentry,
int i; int i;
entry = (struct g_part_ebr_entry *)baseentry; entry = (struct g_part_ebr_entry *)baseentry;
for (i = 0; for (i = 0; i < nitems(ebr_alias_match); i++) {
i < nitems(ebr_alias_match); i++) {
if (ebr_alias_match[i].typ == entry->ent.dp_typ) if (ebr_alias_match[i].typ == entry->ent.dp_typ)
return (g_part_alias_name(ebr_alias_match[i].alias)); return (g_part_alias_name(ebr_alias_match[i].alias));
} }

6
sys/geom/part/g_part_ldm.c
View File

@ -453,8 +453,7 @@ ldm_privhdr_check(struct ldm_db *db, struct g_consumer *cp, int is_gpt)
cp2->provider->mediasize / cp2->provider->sectorsize - 1; cp2->provider->mediasize / cp2->provider->sectorsize - 1;
} else } else
last = pp->mediasize / pp->sectorsize - 1; last = pp->mediasize / pp->sectorsize - 1;
for (found = 0, i = is_gpt; for (found = 0, i = is_gpt; i < nitems(ldm_ph_off); i++) {
i < nitems(ldm_ph_off); i++) {
offset = ldm_ph_off[i]; offset = ldm_ph_off[i];
/* /*
* In the GPT case consumer is attached to the LDM metadata * In the GPT case consumer is attached to the LDM metadata
@ -1468,8 +1467,7 @@ g_part_ldm_type(struct g_part_table *basetable, struct g_part_entry *baseentry,
int i; int i;
entry = (struct g_part_ldm_entry *)baseentry; entry = (struct g_part_ldm_entry *)baseentry;
for (i = 0; for (i = 0; i < nitems(ldm_alias_match); i++) {
i < nitems(ldm_alias_match); i++) {
if (ldm_alias_match[i].typ == entry->type) if (ldm_alias_match[i].typ == entry->type)
return (g_part_alias_name(ldm_alias_match[i].alias)); return (g_part_alias_name(ldm_alias_match[i].alias));
} }

6
sys/geom/part/g_part_mbr.c
View File

@ -158,8 +158,7 @@ mbr_parse_type(const char *type, u_char *dp_typ)
*dp_typ = (u_char)lt; *dp_typ = (u_char)lt;
return (0); return (0);
} }
for (i = 0; for (i = 0; i < nitems(mbr_alias_match); i++) {
i < nitems(mbr_alias_match); i++) {
alias = g_part_alias_name(mbr_alias_match[i].alias); alias = g_part_alias_name(mbr_alias_match[i].alias);
if (strcasecmp(type, alias) == 0) { if (strcasecmp(type, alias) == 0) {
*dp_typ = mbr_alias_match[i].typ; *dp_typ = mbr_alias_match[i].typ;
@ -560,8 +559,7 @@ g_part_mbr_type(struct g_part_table *basetable, struct g_part_entry *baseentry,
int i; int i;
entry = (struct g_part_mbr_entry *)baseentry; entry = (struct g_part_mbr_entry *)baseentry;
for (i = 0; for (i = 0; i < nitems(mbr_alias_match); i++) {
i < nitems(mbr_alias_match); i++) {
if (mbr_alias_match[i].typ == entry->ent.dp_typ) if (mbr_alias_match[i].typ == entry->ent.dp_typ)
return (g_part_alias_name(mbr_alias_match[i].alias)); return (g_part_alias_name(mbr_alias_match[i].alias));
} }

3
sys/kern/sysv_msg.c
View File

@ -1518,8 +1518,7 @@ sys_msgsys(td, uap)
if (!prison_allow(td->td_ucred, PR_ALLOW_SYSVIPC)) if (!prison_allow(td->td_ucred, PR_ALLOW_SYSVIPC))
return (ENOSYS); return (ENOSYS);
if (uap->which < 0 || if (uap->which < 0 || uap->which >= nitems(msgcalls))
uap->which >= nitems(msgcalls))
return (EINVAL); return (EINVAL);
error = (*msgcalls[uap->which])(td, &uap->a2); error = (*msgcalls[uap->which])(td, &uap->a2);
return (error); return (error);

3
sys/kern/sysv_sem.c
View File

@ -1400,8 +1400,7 @@ sys_semsys(td, uap)
if (!prison_allow(td->td_ucred, PR_ALLOW_SYSVIPC)) if (!prison_allow(td->td_ucred, PR_ALLOW_SYSVIPC))
return (ENOSYS); return (ENOSYS);
if (uap->which < 0 || if (uap->which < 0 || uap->which >= nitems(semcalls))
uap->which >= nitems(semcalls))
return (EINVAL); return (EINVAL);
error = (*semcalls[uap->which])(td, &uap->a2); error = (*semcalls[uap->which])(td, &uap->a2);
return (error); return (error);

5
sys/netinet/tcp_syncache.c
View File

@ -1896,8 +1896,7 @@ syncookie_generate(struct syncache_head *sch, struct syncache *sc)
/* Map our computed MSS into the 3-bit index. */ /* Map our computed MSS into the 3-bit index. */
mss = min(tcp_mssopt(&sc->sc_inc), max(sc->sc_peer_mss, V_tcp_minmss)); mss = min(tcp_mssopt(&sc->sc_inc), max(sc->sc_peer_mss, V_tcp_minmss));
for (i = nitems(tcp_sc_msstab) - 1; for (i = nitems(tcp_sc_msstab) - 1; tcp_sc_msstab[i] > mss && i > 0;
tcp_sc_msstab[i] > mss && i > 0;
i--) i--)
; ;
cookie.flags.mss_idx = i; cookie.flags.mss_idx = i;
@ -1909,7 +1908,7 @@ syncookie_generate(struct syncache_head *sch, struct syncache *sc)
if (sc->sc_flags & SCF_WINSCALE) { if (sc->sc_flags & SCF_WINSCALE) {
wscale = sc->sc_requested_s_scale; wscale = sc->sc_requested_s_scale;
for (i = nitems(tcp_sc_wstab) - 1; for (i = nitems(tcp_sc_wstab) - 1;
tcp_sc_wstab[i] > wscale && i > 0; tcp_sc_wstab[i] > wscale && i > 0;
i--) i--)
; ;
cookie.flags.wscale_idx = i; cookie.flags.wscale_idx = i;

3
sys/netinet6/in6_proto.c
View File

@ -381,8 +381,7 @@ struct domain inet6domain = {
.dom_family = AF_INET6, .dom_family = AF_INET6,
.dom_name = "internet6", .dom_name = "internet6",
.dom_protosw = (struct protosw *)inet6sw, .dom_protosw = (struct protosw *)inet6sw,
.dom_protoswNPROTOSW = (struct protosw *) .dom_protoswNPROTOSW = (struct protosw *)&inet6sw[nitems(inet6sw)],
&inet6sw[nitems(inet6sw)],
#ifdef RADIX_MPATH #ifdef RADIX_MPATH
.dom_rtattach = rn6_mpath_inithead, .dom_rtattach = rn6_mpath_inithead,
#else #else