[SECNET PATCH 04/14] util: priomsg: Allow passing priomsg_update_p a null pm
Ian Jackson
ijackson at chiark.greenend.org.uk
Sat Sep 21 17:07:49 BST 2019
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 at chiark.greenend.org.uk>
---
util.c | 1 +
util.h | 3 ++-
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/util.c b/util.c
index d437a1d..6e2fbed 100644
--- a/util.c
+++ b/util.c
@@ -396,6 +396,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 115ec73..8971af7 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 */
--
2.11.0
More information about the sgo-software-discuss
mailing list