Use unsigned integers for bit fields. Also fix white spaces.

diff --git a/usr.sbin/npppd/l2tp/l2tp.h b/usr.sbin/npppd/l2tp/l2tp.h
index 8cb1777..b1b925c 100644 (file)
--- a/usr.sbin/npppd/l2tp/l2tp.h
+++ b/usr.sbin/npppd/l2tp/l2tp.h
@@ -1,4 +1,4 @@
-/*     $OpenBSD: l2tp.h,v 1.14 2021/03/29 03:54:39 yasuoka Exp $       */
+/*     $OpenBSD: l2tp.h,v 1.15 2024/02/26 08:29:37 yasuoka Exp $       */
 
 /*-
  * Copyright (c) 2009 Internet Initiative Japan Inc.
@@ -30,7 +30,7 @@
 /*@file
  * header file for the L2TP module
  */
-/* $Id: l2tp.h,v 1.14 2021/03/29 03:54:39 yasuoka Exp $ */
+/* $Id: l2tp.h,v 1.15 2024/02/26 08:29:37 yasuoka Exp $ */
 
 /************************************************************************
  * Protocol Constants
@@ -405,7 +405,7 @@ typedef struct _l2tp_ctrl {
        /** number of calls established */
        int     ncalls;
 
-       int /** use sequence number in L2TP Data Message? */
+       unsigned int /** use sequence number in L2TP Data Message? */
            data_use_seq:1,
            /** waiting to acknowledge HELLO? */
            hello_wait_ack:1;

diff --git a/usr.sbin/npppd/npppd/npppd_iface.h b/usr.sbin/npppd/npppd/npppd_iface.h
index 04f86dd..8ebf7d7 100644 (file)
--- a/usr.sbin/npppd/npppd/npppd_iface.h
+++ b/usr.sbin/npppd/npppd/npppd_iface.h
@@ -1,4 +1,4 @@
-/*     $OpenBSD: npppd_iface.h,v 1.7 2015/12/05 16:10:31 yasuoka Exp $ */
+/*     $OpenBSD: npppd_iface.h,v 1.8 2024/02/26 08:29:37 yasuoka Exp $ */
 
 /*-
  * Copyright (c) 2009 Internet Initiative Japan Inc.
@@ -29,31 +29,31 @@
 #define NPPPD_IFACE_H 1
 
 typedef struct _npppd_iface {
-       /** base of npppd structure */
+       /** base of npppd structure */
        void    *npppd;
-       /** interface name */
+       /** interface name */
        char    ifname[IFNAMSIZ];
-       /** file descriptor for device file */
+       /** file descriptor for device file */
        int     devf;
 
-       /** assigned IPv4 address */
+       /** assigned IPv4 address */
        struct in_addr  ip4addr;
-       /** for event(3)  */
+       /** for event(3)  */
        struct event    ev;
 
        struct ipcpconf *ipcpconf;
 
-       int     /**
-                * whether set IP address as npppd_iface's work or not.
-                * <p>if 0, npppd_iface only refers IP address already set.</p>
-                */
-               set_ip4addr:1,
+       unsigned int    /**
+                * whether set IP address as npppd_iface's work or not.
+                * <p>if 0, npppd_iface only refers IP address already set.</p>
+                */
+               set_ip4addr:1,
                /** set if using pppx(4) rather than tun(4) */
                using_pppx:1,
                /** is initialized */
-               initialized:1,
+               initialized:1,
                /** is started */
-               started:1;
+               started:1;
 } npppd_iface;
 
 /** whether interface IP address is usable or not */

diff --git a/usr.sbin/npppd/npppd/npppd_local.h b/usr.sbin/npppd/npppd/npppd_local.h
index 0633175..37205b6 100644 (file)
--- a/usr.sbin/npppd/npppd/npppd_local.h
+++ b/usr.sbin/npppd/npppd/npppd_local.h
@@ -1,4 +1,4 @@
-/*     $OpenBSD: npppd_local.h,v 1.17 2017/08/12 11:20:34 goda Exp $ */
+/*     $OpenBSD: npppd_local.h,v 1.18 2024/02/26 08:29:37 yasuoka Exp $ */
 
 /*-
  * Copyright (c) 2009 Internet Initiative Japan Inc.
@@ -85,7 +85,7 @@ struct _npppd_pool {
        struct sockaddr_npppd *addrs;
        /** list of addresses dynamically allocated */
        slist           dyna_addrs;
-       int             /** whether initialized or not */
+       unsigned int    /** whether initialized or not */
                        initialized:1,
                        /** whether in use or not */
                        running:1;

diff --git a/usr.sbin/npppd/pptp/pptp.h b/usr.sbin/npppd/pptp/pptp.h
index e8df825..275da34 100644 (file)
--- a/usr.sbin/npppd/pptp/pptp.h
+++ b/usr.sbin/npppd/pptp/pptp.h
@@ -1,4 +1,4 @@
-/*     $OpenBSD: pptp.h,v 1.11 2021/03/29 03:54:40 yasuoka Exp $       */
+/*     $OpenBSD: pptp.h,v 1.12 2024/02/26 08:29:37 yasuoka Exp $       */
 
 /*-
  * Copyright (c) 2009 Internet Initiative Japan Inc.
@@ -288,7 +288,7 @@ typedef struct _pptp_ctrl {
        time_t  last_rcv_ctrl;  /* timestamp of latest ctrl message received */
        uint32_t        echo_seq; /* identifier of Echo Request */
 
-       int16_t         /* flags : processing I/O events */
+       uint16_t        /* flags : processing I/O events */
                        on_io_event:1,
                        reserved:15;
 } pptp_ctrl;