The branch main has been updated by oshogbo:

URL: 
https://cgit.FreeBSD.org/src/commit/?id=444c6615459efe2b015deb1cffc54fcaa3ea1fca

commit 444c6615459efe2b015deb1cffc54fcaa3ea1fca
Author:     Mariusz Zaborski <osho...@freebsd.org>
AuthorDate: 2023-04-21 07:57:38 +0000
Commit:     Mariusz Zaborski <osho...@freebsd.org>
CommitDate: 2023-04-21 08:01:38 +0000

    mpr: don't use hardcoded value in debug branch
    
    Pointed out by: imp
    Sponsored by:   Klara Inc.
---
 sys/dev/mpr/mpr.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/sys/dev/mpr/mpr.c b/sys/dev/mpr/mpr.c
index b9996806f213..dc95c8a6a803 100644
--- a/sys/dev/mpr/mpr.c
+++ b/sys/dev/mpr/mpr.c
@@ -2759,9 +2759,9 @@ mpr_update_events(struct mpr_softc *sc, struct 
mpr_event_handle *handle,
        evtreq->SASBroadcastPrimitiveMasks = 0;
 #ifdef MPR_DEBUG_ALL_EVENTS
        {
-               u_char fullmask[16];
-               memset(fullmask, 0x00, 16);
-               bcopy(fullmask, (uint8_t *)&evtreq->EventMasks, 16);
+               u_char fullmask[sizeof(evtreq->EventMasks)];
+               memset(fullmask, 0x00, sizeof(fullmask));
+               bcopy(fullmask, (uint8_t *)&evtreq->EventMasks, 
sizeof(fullmask));
        }
 #else
        bcopy(sc->event_mask, (uint8_t *)&evtreq->EventMasks, 
sizeof(sc->event_mask));
@@ -2815,9 +2815,9 @@ mpr_reregister_events(struct mpr_softc *sc)
        evtreq->SASBroadcastPrimitiveMasks = 0;
 #ifdef MPR_DEBUG_ALL_EVENTS
        {
-               u_char fullmask[16];
-               memset(fullmask, 0x00, 16);
-               bcopy(fullmask, (uint8_t *)&evtreq->EventMasks, 16);
+               u_char fullmask[sizeof(evtreq->EventMasks)];
+               memset(fullmask, 0x00, sizeof(fullmask));
+               bcopy(fullmask, (uint8_t *)&evtreq->EventMasks, 
sizeof(fullmask));
        }
 #else
        bcopy(sc->event_mask, (uint8_t *)&evtreq->EventMasks, 
sizeof(sc->event_mask));

Reply via email to