From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sat, 21 Sep 2019 15:12:31 +0000 (+0100)
Subject: util: priomsg: Allow passing priomsg_update_p a null pm
X-Git-Tag: v0.5.0~12
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=secnet.git;a=commitdiff_plain;h=7dae56bc17f51e875b436ec63e035be12c4a6fcf

util: priomsg: Allow passing priomsg_update_p a null pm

This makes it more convenient for callers who may not have anything to
update.

No functional change with any existing caller, of why there aren't any
anyway.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
---

diff --git a/util.c b/util.c
index bcc24bd..2411962 100644
--- a/util.c
+++ b/util.c
@@ -413,6 +413,7 @@ void priomsg_reset(struct priomsg *pm)
 }
 bool_t priomsg_update_p(struct priomsg *pm, int prio)
 {
+    if (!pm) return False;
     if (prio <= pm->prio) return False;
     buffer_init(&pm->m, 0);
     pm->prio = prio;
diff --git a/util.h b/util.h
index 506a6e2..eddb06d 100644
--- a/util.h
+++ b/util.h
@@ -75,7 +75,8 @@ void priomsg_destroy(struct priomsg *pm, int32_t maxlen);     /* FZM -> F */
 void priomsg_reset(struct priomsg *pm);                       /* FZM -> Z */
 bool_t priomsg_update_p(struct priomsg *pm, int prio);         /* ZM -> M */
   /* returns true iff message of priority prio ought to be added,
-   * caller should then call truncmsg_add_*. */
+   * caller should then call truncmsg_add_*.
+   * pm may be NULL, in which case it just returns false */
 const char *priomsg_getmessage(const struct priomsg *pm, const char *defmsg);
   /* return value is null-terminated, valid until next call
    * or until defmsg is no longer valid                                ZM */