From 3b9d585e0ce86bc6eed0b4493f3c73d741778f91 Mon Sep 17 00:00:00 2001 From: jsg Date: Sat, 13 Apr 2024 23:44:11 +0000 Subject: [PATCH] correct indentation no functional change, found by smatch warnings ok miod@ bluhm@ --- sys/arch/hppa/dev/astro.c | 6 +++--- sys/arch/macppc/macppc/ofw_machdep.c | 4 ++-- sys/arch/sparc64/dev/pcons.c | 6 +++--- sys/arch/sparc64/sparc64/pmap.c | 8 ++++---- sys/dev/acpi/acpitoshiba.c | 19 +++++++++---------- sys/dev/acpi/acpivout.c | 4 ++-- sys/dev/acpi/dsdt.c | 4 ++-- sys/dev/ic/adw.c | 4 ++-- sys/dev/ic/adwlib.c | 8 ++++---- sys/dev/ic/an.c | 4 ++-- sys/dev/ic/bwi.c | 4 ++-- sys/dev/ic/ncr53c9x.c | 4 ++-- sys/dev/ic/siop.c | 4 ++-- sys/dev/ic/siop_common.c | 4 ++-- sys/dev/isa/ad1848.c | 17 +++++++++-------- sys/dev/mii/brgphy.c | 6 +++--- sys/dev/pci/arc.c | 8 ++++---- sys/dev/pci/auvia.c | 4 ++-- sys/dev/pci/if_em_hw.c | 8 ++++---- sys/dev/pci/if_iwm.c | 4 ++-- sys/dev/pci/if_iwx.c | 10 +++++----- sys/dev/pci/if_ngbe.c | 12 ++++++------ sys/dev/pci/if_qwx_pci.c | 4 ++-- sys/dev/pci/if_rge.c | 4 ++-- sys/dev/pci/if_sis.c | 4 ++-- sys/dev/pci/ixgb_hw.c | 18 +++++++++--------- sys/dev/pci/maestro.c | 4 ++-- sys/dev/pci/pciide.c | 14 +++++++------- sys/dev/usb/if_umb.c | 4 ++-- sys/dev/usb/if_ure.c | 4 ++-- sys/dev/wscons/wsdisplay_compat_usl.c | 7 +++---- sys/isofs/udf/udf_subr.c | 4 ++-- sys/kern/kern_acct.c | 4 ++-- sys/net/pf_osfp.c | 4 ++-- sys/net80211/ieee80211_input.c | 4 ++-- sys/netinet/tcp_input.c | 13 +++++++------ sys/nfs/nfs_vnops.c | 10 +++++----- sys/ufs/ext2fs/ext2fs_bmap.c | 4 ++-- sys/ufs/ext2fs/ext2fs_vnops.c | 4 ++-- sys/ufs/ffs/ffs_balloc.c | 4 ++-- sys/uvm/uvm_addr.c | 4 ++-- sys/uvm/uvm_aobj.c | 4 ++-- 42 files changed, 137 insertions(+), 137 deletions(-) diff --git a/sys/arch/hppa/dev/astro.c b/sys/arch/hppa/dev/astro.c index e3460807294..c61ae0f777e 100644 --- a/sys/arch/hppa/dev/astro.c +++ b/sys/arch/hppa/dev/astro.c @@ -1,4 +1,4 @@ -/* $OpenBSD: astro.c,v 1.18 2022/03/13 08:04:38 mpi Exp $ */ +/* $OpenBSD: astro.c,v 1.19 2024/04/13 23:44:11 jsg Exp $ */ /* * Copyright (c) 2007 Mark Kettenis @@ -407,8 +407,8 @@ iommu_iomap_load_map(struct astro_softc *sc, bus_dmamap_t map, int flags) pa < paend; pa += PAGE_SIZE, va += PAGE_SIZE) { err = iommu_iomap_insert_page(ims, va, pa); if (err) { - printf("iomap insert error: %d for " - "va 0x%lx pa 0x%lx\n", err, va, pa); + printf("iomap insert error: %d for " + "va 0x%lx pa 0x%lx\n", err, va, pa); bus_dmamap_unload(sc->sc_dmat, map); iommu_iomap_clear_pages(ims); } diff --git a/sys/arch/macppc/macppc/ofw_machdep.c b/sys/arch/macppc/macppc/ofw_machdep.c index 7e7dec7ede6..4151f8d5f3d 100644 --- a/sys/arch/macppc/macppc/ofw_machdep.c +++ b/sys/arch/macppc/macppc/ofw_machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ofw_machdep.c,v 1.64 2021/03/11 11:16:59 jsg Exp $ */ +/* $OpenBSD: ofw_machdep.c,v 1.65 2024/04/13 23:44:11 jsg Exp $ */ /* $NetBSD: ofw_machdep.c,v 1.1 1996/09/30 16:34:50 ws Exp $ */ /* @@ -388,7 +388,7 @@ ofw_find_keyboard(void) * use the builtin ADB one for console, the USB one is * certainly a HID device. */ - if (strncmp(iname, "PowerBook", 9) == 0) + if (strncmp(iname, "PowerBook", 9) == 0) ofw_have_kbd = OFW_HAVE_ADBKBD; else ofw_have_kbd = OFW_HAVE_USBKBD; diff --git a/sys/arch/sparc64/dev/pcons.c b/sys/arch/sparc64/dev/pcons.c index f212a3058d7..e37b845125a 100644 --- a/sys/arch/sparc64/dev/pcons.c +++ b/sys/arch/sparc64/dev/pcons.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pcons.c,v 1.27 2022/10/16 01:22:39 jsg Exp $ */ +/* $OpenBSD: pcons.c,v 1.28 2024/04/13 23:44:11 jsg Exp $ */ /* $NetBSD: pcons.c,v 1.7 2001/05/02 10:32:20 scw Exp $ */ /*- @@ -183,8 +183,8 @@ pconsattach(struct device *parent, struct device *self, void *aux) else { if (OF_getprop(OF_instance_to_package(stdin), "compatible", buffer, sizeof(buffer)) != -1 && - strncmp("usb", buffer, 3) == 0) - sc->sc_wsdisplay = 1; + strncmp("usb", buffer, 3) == 0) + sc->sc_wsdisplay = 1; } if (sc->sc_wsdisplay != 0) { diff --git a/sys/arch/sparc64/sparc64/pmap.c b/sys/arch/sparc64/sparc64/pmap.c index b2dbea68520..7a319ef163d 100644 --- a/sys/arch/sparc64/sparc64/pmap.c +++ b/sys/arch/sparc64/sparc64/pmap.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pmap.c,v 1.119 2024/04/11 18:58:44 miod Exp $ */ +/* $OpenBSD: pmap.c,v 1.120 2024/04/13 23:44:11 jsg Exp $ */ /* $NetBSD: pmap.c,v 1.107 2001/08/31 16:47:41 eeh Exp $ */ /* * @@ -510,9 +510,9 @@ pmap_bootstrap(u_long kernelstart, u_long kernelend, u_int maxctx, u_int numcpus /* And the rest of the virtual page. */ if (prom_claim_virt(newkv, szdiff) != newkv) - prom_printf("pmap_bootstrap: could not claim " - "virtual dseg extension " - "at size %lx\r\n", newkv, szdiff); + prom_printf("pmap_bootstrap: could not claim " + "virtual dseg extension " + "at size %lx\r\n", newkv, szdiff); /* Make sure all 4MB are mapped */ prom_map_phys(newkp, szdiff, newkv, -1); diff --git a/sys/dev/acpi/acpitoshiba.c b/sys/dev/acpi/acpitoshiba.c index c8ca3f139b4..a1385c95352 100644 --- a/sys/dev/acpi/acpitoshiba.c +++ b/sys/dev/acpi/acpitoshiba.c @@ -1,4 +1,4 @@ -/* $OpenBSD: acpitoshiba.c,v 1.16 2022/04/06 18:59:27 naddy Exp $ */ +/* $OpenBSD: acpitoshiba.c,v 1.17 2024/04/13 23:44:11 jsg Exp $ */ /*- * Copyright (c) 2003 Hiroyuki Aizu * All rights reserved. @@ -202,19 +202,18 @@ toshiba_update_brightness(void *arg0, int arg1) int toshiba_match(struct device *parent, void *match, void *aux) { - struct acpi_attach_args *aa = aux; - struct cfdata *cf = match; + struct acpi_attach_args *aa = aux; + struct cfdata *cf = match; - if (acpi_matchhids(aa, acpitoshiba_hids, cf->cf_driver->cd_name)) - return (1); + if (acpi_matchhids(aa, acpitoshiba_hids, cf->cf_driver->cd_name)) + return (1); if (aa->aaa_name == NULL || - strcmp(aa->aaa_name, cf->cf_driver->cd_name) != 0 || - aa->aaa_table != NULL) - return (0); - - return (1); + strcmp(aa->aaa_name, cf->cf_driver->cd_name) != 0 || + aa->aaa_table != NULL) + return (0); + return (1); } int diff --git a/sys/dev/acpi/acpivout.c b/sys/dev/acpi/acpivout.c index db383b4500a..53b5816c978 100644 --- a/sys/dev/acpi/acpivout.c +++ b/sys/dev/acpi/acpivout.c @@ -1,4 +1,4 @@ -/* $OpenBSD: acpivout.c,v 1.25 2022/04/06 18:59:27 naddy Exp $ */ +/* $OpenBSD: acpivout.c,v 1.26 2024/04/13 23:44:11 jsg Exp $ */ /* * Copyright (c) 2009 Paul Irofti * @@ -259,7 +259,7 @@ acpivout_get_bcl(struct acpivout_softc *sc) value = aml_val2int(res.v_package[i + 2]); for (j = i; j > 0 && sc->sc_bcl[j - 1] > value; j--) sc->sc_bcl[j] = sc->sc_bcl[j - 1]; - sc->sc_bcl[j] = value; + sc->sc_bcl[j] = value; } err: diff --git a/sys/dev/acpi/dsdt.c b/sys/dev/acpi/dsdt.c index 24ebf445551..654a37c0961 100644 --- a/sys/dev/acpi/dsdt.c +++ b/sys/dev/acpi/dsdt.c @@ -1,4 +1,4 @@ -/* $OpenBSD: dsdt.c,v 1.265 2024/01/08 19:52:29 kettenis Exp $ */ +/* $OpenBSD: dsdt.c,v 1.266 2024/04/13 23:44:11 jsg Exp $ */ /* * Copyright (c) 2005 Jordan Hargrave * @@ -4249,7 +4249,7 @@ aml_parse(struct aml_scope *scope, int ret_type, const char *stype) /* Name: Nt */ rv = opargs[0]; aml_freevalue(rv); - aml_copyvalue(rv, opargs[1]); + aml_copyvalue(rv, opargs[1]); break; case AMLOP_ALIAS: /* Alias: nN */ diff --git a/sys/dev/ic/adw.c b/sys/dev/ic/adw.c index 5b7663970e7..e91d2b24586 100644 --- a/sys/dev/ic/adw.c +++ b/sys/dev/ic/adw.c @@ -1,4 +1,4 @@ -/* $OpenBSD: adw.c,v 1.69 2022/04/16 19:19:58 naddy Exp $ */ +/* $OpenBSD: adw.c,v 1.70 2024/04/13 23:44:11 jsg Exp $ */ /* $NetBSD: adw.c,v 1.23 2000/05/27 18:24:50 dante Exp $ */ /* @@ -449,7 +449,7 @@ adw_attach(ADW_SOFTC *sc) /* * Zero's the freeze_device status */ - bzero(sc->sc_freeze_dev, sizeof(sc->sc_freeze_dev)); + bzero(sc->sc_freeze_dev, sizeof(sc->sc_freeze_dev)); /* * Initialize the adapter diff --git a/sys/dev/ic/adwlib.c b/sys/dev/ic/adwlib.c index 3fe5eb3b075..7cb983372d0 100644 --- a/sys/dev/ic/adwlib.c +++ b/sys/dev/ic/adwlib.c @@ -1,4 +1,4 @@ -/* $OpenBSD: adwlib.c,v 1.29 2022/08/29 06:08:03 jsg Exp $ */ +/* $OpenBSD: adwlib.c,v 1.30 2024/04/13 23:44:11 jsg Exp $ */ /* $NetBSD: adwlib.c,v 1.20 2000/07/04 04:17:03 itojun Exp $ */ /* @@ -315,9 +315,9 @@ AdwInitFromEEPROM(ADW_SOFTC *sc) */ lsw_msb |= (ADW_EEPROM_INTAB >> 8) & 0xFF; - } - eep_config.cfg_lsw &= 0x00FF; - eep_config.cfg_lsw |= lsw_msb << 8; + } + eep_config.cfg_lsw &= 0x00FF; + eep_config.cfg_lsw |= lsw_msb << 8; } break; } diff --git a/sys/dev/ic/an.c b/sys/dev/ic/an.c index a834c72b6ab..29cdc1a485b 100644 --- a/sys/dev/ic/an.c +++ b/sys/dev/ic/an.c @@ -1,4 +1,4 @@ -/* $OpenBSD: an.c,v 1.79 2022/04/21 21:03:02 stsp Exp $ */ +/* $OpenBSD: an.c,v 1.80 2024/04/13 23:44:11 jsg Exp $ */ /* $NetBSD: an.c,v 1.34 2005/06/20 02:49:18 atatat Exp $ */ /* * Copyright (c) 1997, 1998, 1999 @@ -905,7 +905,7 @@ an_ioctl(struct ifnet *ifp, u_long command, caddr_t data) if ((error = suser(curproc)) != 0) break; error = an_set_nwkey(sc, (struct ieee80211_nwkey *)data); - break; + break; case SIOCG80211NWKEY: error = an_get_nwkey(sc, (struct ieee80211_nwkey *)data); break; diff --git a/sys/dev/ic/bwi.c b/sys/dev/ic/bwi.c index b97f31e0204..68b798aee1d 100644 --- a/sys/dev/ic/bwi.c +++ b/sys/dev/ic/bwi.c @@ -1,4 +1,4 @@ -/* $OpenBSD: bwi.c,v 1.134 2023/11/10 15:51:20 bluhm Exp $ */ +/* $OpenBSD: bwi.c,v 1.135 2024/04/13 23:44:11 jsg Exp $ */ /* * Copyright (c) 2007 The DragonFly Project. All rights reserved. @@ -6400,7 +6400,7 @@ bwi_led_attach(struct bwi_softc *sc) if (led->l_act == BWI_LED_ACT_BLINK_SLOW || led->l_act == BWI_LED_ACT_BLINK_POLL || led->l_act == BWI_LED_ACT_BLINK) { - led->l_flags |= BWI_LED_F_BLINK; + led->l_flags |= BWI_LED_F_BLINK; if (led->l_act == BWI_LED_ACT_BLINK_POLL) led->l_flags |= BWI_LED_F_POLLABLE; else if (led->l_act == BWI_LED_ACT_BLINK_SLOW) diff --git a/sys/dev/ic/ncr53c9x.c b/sys/dev/ic/ncr53c9x.c index 59971227a84..dd829c8ec88 100644 --- a/sys/dev/ic/ncr53c9x.c +++ b/sys/dev/ic/ncr53c9x.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ncr53c9x.c,v 1.81 2024/04/03 18:41:38 miod Exp $ */ +/* $OpenBSD: ncr53c9x.c,v 1.82 2024/04/13 23:44:11 jsg Exp $ */ /* $NetBSD: ncr53c9x.c,v 1.56 2000/11/30 14:41:46 thorpej Exp $ */ /* @@ -2456,7 +2456,7 @@ printf("<>"); if (sc->sc_state == NCR_IDLE) { printf("%s: stray interrupt\n", sc->sc_dev.dv_xname); - return (0); + return (0); } break; diff --git a/sys/dev/ic/siop.c b/sys/dev/ic/siop.c index 7b45e654d2a..f78ae70b13f 100644 --- a/sys/dev/ic/siop.c +++ b/sys/dev/ic/siop.c @@ -1,4 +1,4 @@ -/* $OpenBSD: siop.c,v 1.89 2022/04/16 19:19:59 naddy Exp $ */ +/* $OpenBSD: siop.c,v 1.90 2024/04/13 23:44:11 jsg Exp $ */ /* $NetBSD: siop.c,v 1.79 2005/11/18 23:10:32 bouyer Exp $ */ /* @@ -579,7 +579,7 @@ siop_intr(void *v) * unexpected disconnect. Usually the target signals * a fatal condition this way. Attempt to get sense. */ - if (siop_cmd) { + if (siop_cmd) { siop_cmd->cmd_tables->status = siop_htoc32(&sc->sc_c, SCSI_CHECK); goto end; diff --git a/sys/dev/ic/siop_common.c b/sys/dev/ic/siop_common.c index de83744562f..acc29c0fe32 100644 --- a/sys/dev/ic/siop_common.c +++ b/sys/dev/ic/siop_common.c @@ -1,4 +1,4 @@ -/* $OpenBSD: siop_common.c,v 1.44 2022/01/09 05:42:42 jsg Exp $ */ +/* $OpenBSD: siop_common.c,v 1.45 2024/04/13 23:44:11 jsg Exp $ */ /* $NetBSD: siop_common.c,v 1.37 2005/02/27 00:27:02 perry Exp $ */ /* @@ -281,7 +281,7 @@ siop_setuptables(struct siop_common_cmd *siop_cmd) if ((*targ_flags & TARF_DT) && (sc->mode == STEST4_MODE_LVD)) { sc->targets[target]->status = TARST_PPR_NEG; - siop_ppr_msg(siop_cmd, msgoffset, sc->dt_minsync, + siop_ppr_msg(siop_cmd, msgoffset, sc->dt_minsync, sc->maxoff); } else if (*targ_flags & TARF_WIDE) { sc->targets[target]->status = TARST_WIDE_NEG; diff --git a/sys/dev/isa/ad1848.c b/sys/dev/isa/ad1848.c index c322a388226..bf4637a4c4f 100644 --- a/sys/dev/isa/ad1848.c +++ b/sys/dev/isa/ad1848.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ad1848.c,v 1.48 2022/10/28 14:55:46 kn Exp $ */ +/* $OpenBSD: ad1848.c,v 1.49 2024/04/13 23:44:11 jsg Exp $ */ /* $NetBSD: ad1848.c,v 1.45 1998/01/30 02:02:38 augustss Exp $ */ /* @@ -1244,19 +1244,20 @@ ad1848_set_speed(struct ad1848_softc *sc, u_long *argp) if (arg > speed_table[n - 1].speed) selected = n - 1; - for (i = 1 /*really*/ ; selected == -1 && i < n; i++) + for (i = 1 /*really*/ ; selected == -1 && i < n; i++) { if (speed_table[i].speed == arg) selected = i; else if (speed_table[i].speed > arg) { int diff1, diff2; - diff1 = arg - speed_table[i - 1].speed; - diff2 = speed_table[i].speed - arg; + diff1 = arg - speed_table[i - 1].speed; + diff2 = speed_table[i].speed - arg; - if (diff1 < diff2) - selected = i - 1; - else - selected = i; + if (diff1 < diff2) + selected = i - 1; + else + selected = i; + } } if (selected == -1) { diff --git a/sys/dev/mii/brgphy.c b/sys/dev/mii/brgphy.c index fbf7be2d5f3..78f7e1869d7 100644 --- a/sys/dev/mii/brgphy.c +++ b/sys/dev/mii/brgphy.c @@ -1,4 +1,4 @@ -/* $OpenBSD: brgphy.c,v 1.108 2022/04/06 18:59:29 naddy Exp $ */ +/* $OpenBSD: brgphy.c,v 1.109 2024/04/13 23:44:11 jsg Exp $ */ /* * Copyright (c) 2000 @@ -836,7 +836,7 @@ brgphy_reset_bge(struct mii_softc *sc) if (bge_sc->bge_phy_flags & BGE_PHY_BER_BUG) brgphy_ber_bug(sc); else if (bge_sc->bge_phy_flags & BGE_PHY_JITTER_BUG) { - PHY_WRITE(sc, BRGPHY_MII_AUXCTL, 0x0c00); + PHY_WRITE(sc, BRGPHY_MII_AUXCTL, 0x0c00); PHY_WRITE(sc, BRGPHY_MII_DSP_ADDR_REG, 0x000a); if (bge_sc->bge_phy_flags & BGE_PHY_ADJUST_TRIM) { @@ -925,7 +925,7 @@ brgphy_reset_bnx(struct mii_softc *sc) PHY_WRITE(sc, BRGPHY_5708S_PG5_TXACTL3, bnx_sc->bnx_port_hw_cfg & BNX_PORT_HW_CFG_CFG_TXCTL3_MASK); - PHY_WRITE(sc, BRGPHY_5708S_BLOCK_ADDR, + PHY_WRITE(sc, BRGPHY_5708S_BLOCK_ADDR, BRGPHY_5708S_DIG_PG0); } } else if (BNX_CHIP_NUM(bnx_sc) == BNX_CHIP_NUM_5709 && diff --git a/sys/dev/pci/arc.c b/sys/dev/pci/arc.c index 726b2e995bb..718831fc5e7 100644 --- a/sys/dev/pci/arc.c +++ b/sys/dev/pci/arc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: arc.c,v 1.124 2022/09/06 15:22:11 kn Exp $ */ +/* $OpenBSD: arc.c,v 1.125 2024/04/13 23:44:11 jsg Exp $ */ /* * Copyright (c) 2006 David Gwynne @@ -1409,18 +1409,18 @@ arc_enable_all_intr(struct arc_softc *sc) int_mask &= ~(ARC_RA_INTRMASK_POSTQUEUE | ARC_RA_INTRMASK_DOORBELL | ARC_RA_INTRMASK_MSG0); arc_write(sc, ARC_RA_INTRMASK, int_mask); - break; + break; case ARC_HBA_TYPE_C: int_mask = arc_read(sc, ARC_RC_INTR_MASK); int_mask &= ~(ARC_RC_INTR_MASK_POSTQUEUE | ARC_RC_INTR_MASK_DOORBELL | ARC_RC_INTR_MASK_UTILITY_A); arc_write(sc, ARC_RC_INTR_MASK, int_mask); - break; + break; case ARC_HBA_TYPE_D: int_mask = arc_read(sc, ARC_RD_INTR_ENABLE); int_mask |= ARC_RD_INTR_ENABLE_ALL; arc_write(sc, ARC_RD_INTR_ENABLE, int_mask); - break; + break; } } diff --git a/sys/dev/pci/auvia.c b/sys/dev/pci/auvia.c index 40c8776f571..ed1f5964b51 100644 --- a/sys/dev/pci/auvia.c +++ b/sys/dev/pci/auvia.c @@ -1,4 +1,4 @@ -/* $OpenBSD: auvia.c,v 1.66 2022/10/26 20:19:08 kn Exp $ */ +/* $OpenBSD: auvia.c,v 1.67 2024/04/13 23:44:11 jsg Exp $ */ /* $NetBSD: auvia.c,v 1.28 2002/11/04 16:38:49 kent Exp $ */ /*- @@ -611,7 +611,7 @@ auvia_set_params(void *addr, int setmode, int usemode, if (p->channels == 6 && codec->vtbl->set_rate(codec, reg, &p->sample_rate)) - return (EINVAL); + return (EINVAL); } } diff --git a/sys/dev/pci/if_em_hw.c b/sys/dev/pci/if_em_hw.c index 481ea9513b7..54b2e2039df 100644 --- a/sys/dev/pci/if_em_hw.c +++ b/sys/dev/pci/if_em_hw.c @@ -31,7 +31,7 @@ *******************************************************************************/ -/* $OpenBSD: if_em_hw.c,v 1.119 2023/12/03 00:19:25 jsg Exp $ */ +/* $OpenBSD: if_em_hw.c,v 1.120 2024/04/13 23:44:11 jsg Exp $ */ /* * if_em_hw.c Shared functions for accessing and configuring the MAC */ @@ -6432,9 +6432,9 @@ em_init_eeprom_params(struct em_hw *hw) case em_pch2lan: case em_pch_lpt: { - int32_t i = 0; - uint32_t flash_size = - E1000_READ_ICH_FLASH_REG(hw, ICH_FLASH_GFPREG); + int32_t i = 0; + uint32_t flash_size = + E1000_READ_ICH_FLASH_REG(hw, ICH_FLASH_GFPREG); eeprom->type = em_eeprom_ich8; eeprom->use_eerd = FALSE; eeprom->use_eewr = FALSE; diff --git a/sys/dev/pci/if_iwm.c b/sys/dev/pci/if_iwm.c index ce04cea5bb9..f299e477e72 100644 --- a/sys/dev/pci/if_iwm.c +++ b/sys/dev/pci/if_iwm.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_iwm.c,v 1.414 2024/02/16 11:44:52 stsp Exp $ */ +/* $OpenBSD: if_iwm.c,v 1.415 2024/04/13 23:44:11 jsg Exp $ */ /* * Copyright (c) 2014, 2016 genua gmbh @@ -8169,7 +8169,7 @@ iwm_rval2ridx(int rval) break; } - return ridx; + return ridx; } void diff --git a/sys/dev/pci/if_iwx.c b/sys/dev/pci/if_iwx.c index a2ed6b9e626..3a4810b4859 100644 --- a/sys/dev/pci/if_iwx.c +++ b/sys/dev/pci/if_iwx.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_iwx.c,v 1.182 2024/02/26 18:00:09 stsp Exp $ */ +/* $OpenBSD: if_iwx.c,v 1.183 2024/04/13 23:44:11 jsg Exp $ */ /* * Copyright (c) 2014, 2016 genua gmbh @@ -786,7 +786,7 @@ iwx_alloc_fw_monitor(struct iwx_softc *sc, uint8_t max_power) } if (max_power > 26) { - DPRINTF(("%s: External buffer size for monitor is too big %d, " + DPRINTF(("%s: External buffer size for monitor is too big %d, " "check the FW TLV\n", DEVNAME(sc), max_power)); return 0; } @@ -7211,7 +7211,7 @@ iwx_rval2ridx(int rval) break; } - return ridx; + return ridx; } void @@ -9831,7 +9831,7 @@ iwx_rx_pkt(struct iwx_softc *sc, struct iwx_rx_data *data, struct mbuf_list *ml) * For v5 and above, we can check the version, for older * versions we need to check the size. */ - if (iwx_lookup_notif_ver(sc, IWX_LEGACY_GROUP, + if (iwx_lookup_notif_ver(sc, IWX_LEGACY_GROUP, IWX_ALIVE) == 6) { SYNC_RESP_STRUCT(resp6, pkt); if (iwx_rx_packet_payload_len(pkt) != @@ -10880,7 +10880,7 @@ iwx_find_device_cfg(struct iwx_softc *sc) cores = IWX_SUBDEVICE_CORES(sdev_id); for (i = nitems(iwx_dev_info_table) - 1; i >= 0; i--) { - const struct iwx_dev_info *dev_info = &iwx_dev_info_table[i]; + const struct iwx_dev_info *dev_info = &iwx_dev_info_table[i]; if (dev_info->device != (uint16_t)IWX_CFG_ANY && dev_info->device != sc->sc_pid) diff --git a/sys/dev/pci/if_ngbe.c b/sys/dev/pci/if_ngbe.c index ce3503643a5..5483380f6b4 100644 --- a/sys/dev/pci/if_ngbe.c +++ b/sys/dev/pci/if_ngbe.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_ngbe.c,v 1.3 2024/04/12 19:27:43 jan Exp $ */ +/* $OpenBSD: if_ngbe.c,v 1.4 2024/04/13 23:44:11 jsg Exp $ */ /* * Copyright (c) 2015-2017 Beijing WangXun Technology Co., Ltd. @@ -2952,7 +2952,7 @@ ngbe_host_interface_command(struct ngbe_softc *sc, uint32_t *buffer, if (length == 0 || length > NGBE_HI_MAX_BLOCK_BYTE_LENGTH) { printf("%s: buffer length failure\n", DEVNAME(sc)); - return EINVAL; + return EINVAL; } if (hw->mac.ops.acquire_swfw_sync(sc, NGBE_MNG_SWFW_SYNC_SW_MB)) @@ -3706,7 +3706,7 @@ ngbe_reset_hw(struct ngbe_softc *sc) * mng is using it. If link is down or the flag to force full link * reset is set, then perform link reset. */ - if (hw->force_full_reset) { + if (hw->force_full_reset) { rst_delay = (NGBE_READ_REG(hw, NGBE_MIS_RST_ST) & NGBE_MIS_RST_ST_RST_INIT) >> NGBE_MIS_RST_ST_RST_INI_SHIFT; if (hw->reset_type == NGBE_SW_RESET) { @@ -4528,9 +4528,9 @@ ngbe_update_mc_addr_list(struct ngbe_hw *hw, uint8_t *mc_addr_list, if (clear) memset(&hw->mac.mta_shadow, 0, sizeof(hw->mac.mta_shadow)); - /* Update mta_shadow */ - for (i = 0; i < mc_addr_count; i++) - ngbe_set_mta(hw, next(hw, &mc_addr_list, &vmdq)); + /* Update mta_shadow */ + for (i = 0; i < mc_addr_count; i++) + ngbe_set_mta(hw, next(hw, &mc_addr_list, &vmdq)); /* Enable mta */ for (i = 0; i < hw->mac.mcft_size; i++) diff --git a/sys/dev/pci/if_qwx_pci.c b/sys/dev/pci/if_qwx_pci.c index 46c20d84063..6e27e346cb3 100644 --- a/sys/dev/pci/if_qwx_pci.c +++ b/sys/dev/pci/if_qwx_pci.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_qwx_pci.c,v 1.14 2024/02/22 09:15:34 stsp Exp $ */ +/* $OpenBSD: if_qwx_pci.c,v 1.15 2024/04/13 23:44:11 jsg Exp $ */ /* * Copyright 2023 Stefan Sperling @@ -2901,7 +2901,7 @@ qwx_mhi_start(struct qwx_pci_softc *psc) #endif /* Transition to primary runtime. */ - if (MHI_IN_PBL(ee)) { + if (MHI_IN_PBL(ee)) { ret = qwx_mhi_fw_load_handler(psc); if (ret) return ret; diff --git a/sys/dev/pci/if_rge.c b/sys/dev/pci/if_rge.c index 08aecaeca9e..07513add23a 100644 --- a/sys/dev/pci/if_rge.c +++ b/sys/dev/pci/if_rge.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_rge.c,v 1.23 2023/12/22 05:28:14 kevlo Exp $ */ +/* $OpenBSD: if_rge.c,v 1.24 2024/04/13 23:44:11 jsg Exp $ */ /* * Copyright (c) 2019, 2020, 2023 Kevin Lo @@ -1250,7 +1250,7 @@ rge_rxeof(struct rge_queues *q) * If this is part of a multi-fragment packet, * discard all the pieces. */ - if (q->q_rx.rge_head != NULL) { + if (q->q_rx.rge_head != NULL) { m_freem(q->q_rx.rge_head); q->q_rx.rge_head = q->q_rx.rge_tail = NULL; } diff --git a/sys/dev/pci/if_sis.c b/sys/dev/pci/if_sis.c index 7c658f71e7c..22d3a2056a5 100644 --- a/sys/dev/pci/if_sis.c +++ b/sys/dev/pci/if_sis.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_sis.c,v 1.143 2023/11/10 15:51:20 bluhm Exp $ */ +/* $OpenBSD: if_sis.c,v 1.144 2024/04/13 23:44:11 jsg Exp $ */ /* * Copyright (c) 1997, 1998, 1999 * Bill Paul . All rights reserved. @@ -1791,7 +1791,7 @@ sis_init(void *xsc) * This resolves an issue with tons of errors in AcceptPerfectMatch * (non-IFF_PROMISC) mode. */ - if (sc->sis_type == SIS_TYPE_83815 && sc->sis_srr <= NS_SRR_15D) { + if (sc->sis_type == SIS_TYPE_83815 && sc->sis_srr <= NS_SRR_15D) { CSR_WRITE_4(sc, NS_PHY_PAGE, 0x0001); CSR_WRITE_4(sc, NS_PHY_CR, 0x189C); /* set val for c2 */ diff --git a/sys/dev/pci/ixgb_hw.c b/sys/dev/pci/ixgb_hw.c index c65f3574dff..2f9a5ca9b6f 100644 --- a/sys/dev/pci/ixgb_hw.c +++ b/sys/dev/pci/ixgb_hw.c @@ -31,7 +31,7 @@ *******************************************************************************/ -/* $OpenBSD: ixgb_hw.c,v 1.9 2022/01/09 05:42:56 jsg Exp $ */ +/* $OpenBSD: ixgb_hw.c,v 1.10 2024/04/13 23:44:11 jsg Exp $ */ /* ixgb_hw.c * Shared functions for accessing and configuring the adapter @@ -83,14 +83,14 @@ ixgb_mac_reset(struct ixgb_hw *hw) { uint32_t ctrl_reg; - ctrl_reg = IXGB_CTRL0_RST | - IXGB_CTRL0_SDP3_DIR | /* All pins are Output=1 */ - IXGB_CTRL0_SDP2_DIR | - IXGB_CTRL0_SDP1_DIR | - IXGB_CTRL0_SDP0_DIR | - IXGB_CTRL0_SDP3 | /* Initial value 1101 */ - IXGB_CTRL0_SDP2 | - IXGB_CTRL0_SDP0; + ctrl_reg = IXGB_CTRL0_RST | + IXGB_CTRL0_SDP3_DIR | /* All pins are Output=1 */ + IXGB_CTRL0_SDP2_DIR | + IXGB_CTRL0_SDP1_DIR | + IXGB_CTRL0_SDP0_DIR | + IXGB_CTRL0_SDP3 | /* Initial value 1101 */ + IXGB_CTRL0_SDP2 | + IXGB_CTRL0_SDP0; #ifdef HP_ZX1 /* Workaround for 82597EX reset errata */ diff --git a/sys/dev/pci/maestro.c b/sys/dev/pci/maestro.c index bbd0a3b1edf..f75e75ded5e 100644 --- a/sys/dev/pci/maestro.c +++ b/sys/dev/pci/maestro.c @@ -1,4 +1,4 @@ -/* $OpenBSD: maestro.c,v 1.50 2022/10/28 15:09:46 kn Exp $ */ +/* $OpenBSD: maestro.c,v 1.51 2024/04/13 23:44:11 jsg Exp $ */ /* $FreeBSD: /c/ncvs/src/sys/dev/sound/pci/maestro.c,v 1.3 2000/11/21 12:22:11 julian Exp $ */ /* * FreeBSD's ESS Agogo/Maestro driver @@ -900,7 +900,7 @@ maestro_set_speed(struct maestro_channel *ch, u_long *prate) } else { /* compute 16 bits fixed point value of speed/48000, * being careful not to overflow */ - ch->dv = (((ch->speed % 48000) << 16U) + 24000) / 48000 + ch->dv = (((ch->speed % 48000) << 16U) + 24000) / 48000 + ((ch->speed / 48000) << 16U); /* And this is the real rate obtained */ ch->speed = (ch->dv >> 16U) * 48000 + diff --git a/sys/dev/pci/pciide.c b/sys/dev/pci/pciide.c index 53af79c8bb7..4f65dc98ae6 100644 --- a/sys/dev/pci/pciide.c +++ b/sys/dev/pci/pciide.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pciide.c,v 1.363 2022/03/11 18:00:51 mpi Exp $ */ +/* $OpenBSD: pciide.c,v 1.364 2024/04/13 23:44:11 jsg Exp $ */ /* $NetBSD: pciide.c,v 1.127 2001/08/03 01:31:08 tsutsui Exp $ */ /* @@ -2939,8 +2939,8 @@ piix_setup_channel(struct channel_softc *chp) (drvp[1].drive_flags & DRIVE_DMA)) { mode[0] = mode[1] = min(drvp[0].DMA_mode, drvp[1].DMA_mode); - drvp[0].DMA_mode = mode[0]; - drvp[1].DMA_mode = mode[1]; + drvp[0].DMA_mode = mode[0]; + drvp[1].DMA_mode = mode[1]; goto ok; } /* @@ -4127,7 +4127,7 @@ cmd680_channel_map(struct pci_attach_args *pa, struct pciide_softc *sc, printf("%s %s: " "cannot allocate channel queue", sc->sc_wdcdev.sc_dev.dv_xname, cp->name); - return; + return; } /* XXX */ @@ -7972,9 +7972,9 @@ acard_setup_channel(struct channel_softc *chp) acard_act_pio[drvp->PIO_mode], acard_rec_pio[drvp->PIO_mode]); } - pci_conf_write(sc->sc_pc, sc->sc_tag, ATP8x0_CTRL, - pci_conf_read(sc->sc_pc, sc->sc_tag, ATP8x0_CTRL) - | ATP8x0_CTRL_EN(channel)); + pci_conf_write(sc->sc_pc, sc->sc_tag, ATP8x0_CTRL, + pci_conf_read(sc->sc_pc, sc->sc_tag, ATP8x0_CTRL) | + ATP8x0_CTRL_EN(channel)); } } diff --git a/sys/dev/usb/if_umb.c b/sys/dev/usb/if_umb.c index 0d0c2c4716f..fc3a61c8918 100644 --- a/sys/dev/usb/if_umb.c +++ b/sys/dev/usb/if_umb.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_umb.c,v 1.56 2023/10/24 09:13:22 jmatthew Exp $ */ +/* $OpenBSD: if_umb.c,v 1.57 2024/04/13 23:44:11 jsg Exp $ */ /* * Copyright (c) 2016 genua mbH @@ -3135,7 +3135,7 @@ umb_intr(struct usbd_xfer *xfer, void *priv, usbd_status status) if (total_len < UCDC_NOTIFICATION_LENGTH) { DPRINTF("%s: short notification (%d<%d)\n", DEVNAM(sc), total_len, UCDC_NOTIFICATION_LENGTH); - return; + return; } if (sc->sc_intr_msg.bmRequestType != UCDC_NOTIFICATION) { DPRINTF("%s: unexpected notification (type=0x%02x)\n", diff --git a/sys/dev/usb/if_ure.c b/sys/dev/usb/if_ure.c index e26fb580277..3fb897f82ac 100644 --- a/sys/dev/usb/if_ure.c +++ b/sys/dev/usb/if_ure.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_ure.c,v 1.33 2023/09/09 14:23:37 kevlo Exp $ */ +/* $OpenBSD: if_ure.c,v 1.34 2024/04/13 23:44:11 jsg Exp $ */ /*- * Copyright (c) 2015, 2016, 2019 Kevin Lo * Copyright (c) 2020 Jonathon Fletcher @@ -2078,7 +2078,7 @@ ure_rxeof(struct usbd_xfer *xfer, void *priv, usbd_status status) if (rxvlan & URE_RXPKT_VLAN_TAG) { m->m_pkthdr.ether_vtag = swap16(rxvlan & URE_RXPKT_VLAN_DATA); - m->m_flags |= M_VLANTAG; + m->m_flags |= M_VLANTAG; } #endif diff --git a/sys/dev/wscons/wsdisplay_compat_usl.c b/sys/dev/wscons/wsdisplay_compat_usl.c index 7398e8f399d..3802a8358eb 100644 --- a/sys/dev/wscons/wsdisplay_compat_usl.c +++ b/sys/dev/wscons/wsdisplay_compat_usl.c @@ -1,4 +1,4 @@ -/* $OpenBSD: wsdisplay_compat_usl.c,v 1.33 2020/09/03 15:30:17 kettenis Exp $ */ +/* $OpenBSD: wsdisplay_compat_usl.c,v 1.34 2024/04/13 23:44:11 jsg Exp $ */ /* $NetBSD: wsdisplay_compat_usl.c,v 1.12 2000/03/23 07:01:47 thorpej Exp $ */ /* @@ -440,9 +440,8 @@ wsdisplay_usl_ioctl2(struct wsdisplay_softc *sc, struct wsscreen *scr, #define PCVT_SYSBEEPF 1193182 if (d >> 16) { bd.which = WSKBD_BELL_DOPERIOD; - bd.period = d >> 16; /* ms */ - } - else + bd.period = d >> 16; /* ms */ + } else bd.which = 0; if (d & 0xffff) { bd.which |= WSKBD_BELL_DOPITCH; diff --git a/sys/isofs/udf/udf_subr.c b/sys/isofs/udf/udf_subr.c index e7082085ceb..2377e691c1c 100644 --- a/sys/isofs/udf/udf_subr.c +++ b/sys/isofs/udf/udf_subr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: udf_subr.c,v 1.26 2022/09/01 13:45:26 krw Exp $ */ +/* $OpenBSD: udf_subr.c,v 1.27 2024/04/13 23:44:11 jsg Exp $ */ /* * Copyright (c) 2006, Miodrag Vallat @@ -201,7 +201,7 @@ udf_vat_get(struct umount *ump, uint32_t lb) up->u_vatlen = (letoh64(up->u_fentry->inf_len) - 36) >> 2; ump->um_vat = malloc(sizeof(struct unode), M_UDFMOUNT, M_WAITOK); - *ump->um_vat = *up; + *ump->um_vat = *up; ump->um_flags &= ~UDF_MNT_FIND_VAT; ump->um_flags |= UDF_MNT_USES_VAT; diff --git a/sys/kern/kern_acct.c b/sys/kern/kern_acct.c index 590bed70426..1f56705d3fb 100644 --- a/sys/kern/kern_acct.c +++ b/sys/kern/kern_acct.c @@ -1,4 +1,4 @@ -/* $OpenBSD: kern_acct.c,v 1.47 2022/08/14 01:58:27 jsg Exp $ */ +/* $OpenBSD: kern_acct.c,v 1.48 2024/04/13 23:44:11 jsg Exp $ */ /* $NetBSD: kern_acct.c,v 1.42 1996/02/04 02:15:12 christos Exp $ */ /*- @@ -270,7 +270,7 @@ encode_comp_t(u_long s, u_long ns) s += ns / (1000000000 / AHZ); /* Maximize precision. */ while (s > MAXFRACT) { - rnd = s & (1 << (EXPSIZE - 1)); /* Round up? */ + rnd = s & (1 << (EXPSIZE - 1)); /* Round up? */ s >>= EXPSIZE; /* Base 8 exponent == 3 bit shift. */ exp++; } diff --git a/sys/net/pf_osfp.c b/sys/net/pf_osfp.c index c2a406c32b2..cbcf2c2f119 100644 --- a/sys/net/pf_osfp.c +++ b/sys/net/pf_osfp.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pf_osfp.c,v 1.47 2023/10/10 11:25:31 bluhm Exp $ */ +/* $OpenBSD: pf_osfp.c,v 1.48 2024/04/13 23:44:11 jsg Exp $ */ /* * Copyright (c) 2003 Mike Frantzen @@ -382,7 +382,7 @@ pf_osfp_add(struct pf_osfp_ioctl *fpioc) if ((fp = pf_osfp_find_exact(&fpadd))) { struct pf_osfp_entry *tentry; - SLIST_FOREACH(tentry, &fp->fp_oses, fp_entry) { + SLIST_FOREACH(tentry, &fp->fp_oses, fp_entry) { if (PF_OSFP_ENTRY_EQ(tentry, &fpioc->fp_os)) { PF_UNLOCK(); pool_put(&pf_osfp_entry_pl, entry); diff --git a/sys/net80211/ieee80211_input.c b/sys/net80211/ieee80211_input.c index 44f1189405f..cdc40bc3e41 100644 --- a/sys/net80211/ieee80211_input.c +++ b/sys/net80211/ieee80211_input.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ieee80211_input.c,v 1.251 2024/03/15 17:45:36 stsp Exp $ */ +/* $OpenBSD: ieee80211_input.c,v 1.252 2024/04/13 23:44:11 jsg Exp $ */ /* $NetBSD: ieee80211_input.c,v 1.24 2004/05/31 11:12:24 dyoung Exp $ */ /*- @@ -1901,7 +1901,7 @@ ieee80211_recv_probe_resp(struct ieee80211com *ic, struct mbuf *m, * This probe response indicates the AP is still serving us * so don't allow ieee80211_watchdog() to move us into SCAN. */ - if ((ic->ic_flags & IEEE80211_F_BGSCAN) == 0) + if ((ic->ic_flags & IEEE80211_F_BGSCAN) == 0) ic->ic_mgt_timer = 0; } /* diff --git a/sys/netinet/tcp_input.c b/sys/netinet/tcp_input.c index 9320e240105..8a64d59fec3 100644 --- a/sys/netinet/tcp_input.c +++ b/sys/netinet/tcp_input.c @@ -1,4 +1,4 @@ -/* $OpenBSD: tcp_input.c,v 1.403 2024/04/12 16:07:09 bluhm Exp $ */ +/* $OpenBSD: tcp_input.c,v 1.404 2024/04/13 23:44:11 jsg Exp $ */ /* $NetBSD: tcp_input.c,v 1.23 1996/02/13 23:43:44 christos Exp $ */ /* @@ -1078,12 +1078,13 @@ findpcb: * Receive window is amount of space in rcv queue, * but not less than advertised window. */ - { int win; + { + int win; - win = sbspace(so, &so->so_rcv); - if (win < 0) - win = 0; - tp->rcv_wnd = imax(win, (int)(tp->rcv_adv - tp->rcv_nxt)); + win = sbspace(so, &so->so_rcv); + if (win < 0) + win = 0; + tp->rcv_wnd = imax(win, (int)(tp->rcv_adv - tp->rcv_nxt)); } switch (tp->t_state) { diff --git a/sys/nfs/nfs_vnops.c b/sys/nfs/nfs_vnops.c index bda27cd745e..61847abb248 100644 --- a/sys/nfs/nfs_vnops.c +++ b/sys/nfs/nfs_vnops.c @@ -1,4 +1,4 @@ -/* $OpenBSD: nfs_vnops.c,v 1.194 2024/03/25 17:57:07 guenther Exp $ */ +/* $OpenBSD: nfs_vnops.c,v 1.195 2024/04/13 23:44:11 jsg Exp $ */ /* $NetBSD: nfs_vnops.c,v 1.62.4.1 1996/07/08 20:26:52 jtc Exp $ */ /* @@ -336,9 +336,9 @@ nfs_access(void *v) * Check access cache first. If a request has been made for this uid * shortly before, use the cached result. */ - cachevalid = (np->n_accstamp != -1 && - (gettime() - np->n_accstamp) < nfs_attrtimeo(np) && - np->n_accuid == ap->a_cred->cr_uid); + cachevalid = (np->n_accstamp != -1 && + (gettime() - np->n_accstamp) < nfs_attrtimeo(np) && + np->n_accuid == ap->a_cred->cr_uid); if (cachevalid) { if (!np->n_accerror) { @@ -408,7 +408,7 @@ nfs_access(void *v) * If we got the same result as for a previous, different request, OR * it in. Don't update the timestamp in that case. */ - if (!error || error == EACCES) { + if (!error || error == EACCES) { if (cachevalid && np->n_accstamp != -1 && error == np->n_accerror) { if (!error) diff --git a/sys/ufs/ext2fs/ext2fs_bmap.c b/sys/ufs/ext2fs/ext2fs_bmap.c index 4d5c6099532..87944872407 100644 --- a/sys/ufs/ext2fs/ext2fs_bmap.c +++ b/sys/ufs/ext2fs/ext2fs_bmap.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ext2fs_bmap.c,v 1.28 2021/12/12 09:14:59 visa Exp $ */ +/* $OpenBSD: ext2fs_bmap.c,v 1.29 2024/04/13 23:44:11 jsg Exp $ */ /* $NetBSD: ext2fs_bmap.c,v 1.5 2000/03/30 12:41:11 augustss Exp $ */ /* @@ -192,7 +192,7 @@ ext2fs_bmaparray(struct vnode *vp, daddr_t bn, daddr_t *bnp, devvp = VFSTOUFS(vp->v_mount)->um_devvp; #ifdef DIAGNOSTIC - if (num > NIADDR + 1 || num < 1) { + if (num > NIADDR + 1 || num < 1) { printf("ext2fs_bmaparray: num=%d\n", num); panic("ext2fs_bmaparray: num"); } diff --git a/sys/ufs/ext2fs/ext2fs_vnops.c b/sys/ufs/ext2fs/ext2fs_vnops.c index eee8e11f8f1..0097f2380c5 100644 --- a/sys/ufs/ext2fs/ext2fs_vnops.c +++ b/sys/ufs/ext2fs/ext2fs_vnops.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ext2fs_vnops.c,v 1.92 2024/03/25 17:57:07 guenther Exp $ */ +/* $OpenBSD: ext2fs_vnops.c,v 1.93 2024/04/13 23:44:11 jsg Exp $ */ /* $NetBSD: ext2fs_vnops.c,v 1.1 1997/06/11 09:34:09 bouyer Exp $ */ /* @@ -819,7 +819,7 @@ abortit: UIO_SYSSPACE, IO_NODELOCKED, tcnp->cn_cred, NULL, curproc); if (error == 0) { - namlen = dirbuf.dotdot_namlen; + namlen = dirbuf.dotdot_namlen; if (namlen != 2 || dirbuf.dotdot_name[0] != '.' || dirbuf.dotdot_name[1] != '.') { diff --git a/sys/ufs/ffs/ffs_balloc.c b/sys/ufs/ffs/ffs_balloc.c index 47e27348932..807c7f72066 100644 --- a/sys/ufs/ffs/ffs_balloc.c +++ b/sys/ufs/ffs/ffs_balloc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ffs_balloc.c,v 1.46 2024/02/03 18:51:58 beck Exp $ */ +/* $OpenBSD: ffs_balloc.c,v 1.47 2024/04/13 23:44:11 jsg Exp $ */ /* $NetBSD: ffs_balloc.c,v 1.3 1996/02/09 22:22:21 christos Exp $ */ /* @@ -750,7 +750,7 @@ fail: * that we resolve the dependencies in one pass. * Write the cylinder group buffers for these buffers too. */ - for (i = num; i >= unwindidx; i--) { + for (i = num; i >= unwindidx; i--) { if (i == 0) break; diff --git a/sys/uvm/uvm_addr.c b/sys/uvm/uvm_addr.c index 6e3b02d5c09..ac0574a7eaf 100644 --- a/sys/uvm/uvm_addr.c +++ b/sys/uvm/uvm_addr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: uvm_addr.c,v 1.32 2022/11/04 09:36:44 mpi Exp $ */ +/* $OpenBSD: uvm_addr.c,v 1.33 2024/04/13 23:44:11 jsg Exp $ */ /* * Copyright (c) 2011 Ariane van der Steldt @@ -1406,7 +1406,7 @@ uaddr_stack_brk_select(struct vm_map *map, struct uvm_addr_state *uaddr, if (uvm_addr_linsearch(map, uaddr, entry_out, addr_out, 0, sz, align, offset, dir, start, end - sz, before_gap, after_gap) == 0) - return 0; + return 0; } return ENOMEM; diff --git a/sys/uvm/uvm_aobj.c b/sys/uvm/uvm_aobj.c index 89389d5cabe..33e2cb432ab 100644 --- a/sys/uvm/uvm_aobj.c +++ b/sys/uvm/uvm_aobj.c @@ -1,4 +1,4 @@ -/* $OpenBSD: uvm_aobj.c,v 1.109 2024/04/10 15:25:14 mpi Exp $ */ +/* $OpenBSD: uvm_aobj.c,v 1.110 2024/04/13 23:44:11 jsg Exp $ */ /* $NetBSD: uvm_aobj.c,v 1.39 2001/02/18 21:19:08 chs Exp $ */ /* @@ -298,7 +298,7 @@ uao_set_swslot(struct uvm_object *uobj, int pageidx, int slot) /* but a set is not */ printf("uao_set_swslot: uobj = %p\n", uobj); - panic("uao_set_swslot: attempt to set a slot on a NOSWAP object"); + panic("uao_set_swslot: attempt to set a slot on a NOSWAP object"); } /* -- 2.20.1