Fix whitespace and long lines.

diff --git a/sys/netinet/ip_ipsp.c b/sys/netinet/ip_ipsp.c
index f1941ac..d986d9c 100644 (file)
--- a/sys/netinet/ip_ipsp.c
+++ b/sys/netinet/ip_ipsp.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: ip_ipsp.c,v 1.251 2021/11/18 11:04:10 sthen Exp $     */
+/*     $OpenBSD: ip_ipsp.c,v 1.252 2021/11/21 02:54:56 bluhm Exp $     */
 /*
  * The authors of this code are John Ioannidis (ji@tla.org),
  * Angelos D. Keromytis (kermit@csd.uch.gr),
@@ -335,8 +335,8 @@ reserve_spi(u_int rdomain, u_int32_t sspi, u_int32_t tspi,
  * is really one of our addresses if we received the packet!
  */
 struct tdb *
-gettdb_dir(u_int rdomain, u_int32_t spi, union sockaddr_union *dst, u_int8_t proto,
-    int reverse)
+gettdb_dir(u_int rdomain, u_int32_t spi, union sockaddr_union *dst,
+    u_int8_t proto, int reverse)
 {
        u_int32_t hashval;
        struct tdb *tdbp;
@@ -1166,7 +1166,7 @@ ipsp_ids_free(struct ipsec_ids *ids)
        if (--ids->id_refcount > 0)
                return;
 
-       /* 
+       /*
         * Add second for the case ipsp_ids_gc() is already running and
         * awaits netlock to be released.
         */

diff --git a/sys/netinet/ipsec_input.c b/sys/netinet/ipsec_input.c
index b1465f4..0ca5cf0 100644 (file)
--- a/sys/netinet/ipsec_input.c
+++ b/sys/netinet/ipsec_input.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: ipsec_input.c,v 1.191 2021/11/11 18:08:18 bluhm Exp $ */
+/*     $OpenBSD: ipsec_input.c,v 1.192 2021/11/21 02:54:56 bluhm Exp $ */
 /*
  * The authors of this code are John Ioannidis (ji@tla.org),
  * Angelos D. Keromytis (kermit@csd.uch.gr) and
@@ -311,8 +311,8 @@ ipsec_common_input(struct mbuf **mp, int skip, int protoff, int af, int sproto,
        }
 
        if (sproto != IPPROTO_IPCOMP) {
-               if ((encif = enc_getif(tdbp->tdb_rdomain_post,
-                   tdbp->tdb_tap)) == NULL) {
+               encif = enc_getif(tdbp->tdb_rdomain_post, tdbp->tdb_tap);
+               if (encif == NULL) {
                        DPRINTF("no enc%u interface for SA %s/%08x/%u",
                            tdbp->tdb_tap,
                            ipsp_address(&dst_address, buf, sizeof(buf)),
@@ -583,7 +583,8 @@ ipsec_common_input_cb(struct mbuf **mp, struct tdb *tdbp, int skip, int protoff)
        tdbp->tdb_idecompbytes += m->m_pkthdr.len;
 
 #if NBPFILTER > 0
-       if ((encif = enc_getif(tdbp->tdb_rdomain_post, tdbp->tdb_tap)) != NULL) {
+       encif = enc_getif(tdbp->tdb_rdomain_post, tdbp->tdb_tap);
+       if (encif != NULL) {
                encif->if_ipackets++;
                encif->if_ibytes += m->m_pkthdr.len;