util: priomsg: New facility

No callers yet.

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

diff --git a/util.c b/util.c
index d0c3d966de4bcd2feb177dcb32300717e3f7b2b1..bcc24bdc637d828245bb6f8173863e91d6d9b490 100644 (file)
--- a/util.c
+++ b/util.c
@@ -401,6 +401,32 @@ const char *truncmsg_terminate(const struct buffer_if *buf)
     return buf->start;
 }
 
+void priomsg_new(struct priomsg *pm, int32_t maxlen)
+{
+    buffer_new(&pm->m, maxlen);
+    pm->prio = INT_MIN;
+}
+void priomsg_reset(struct priomsg *pm)
+{
+    buffer_init(&pm->m, 0);
+    pm->prio = INT_MIN;
+}
+bool_t priomsg_update_p(struct priomsg *pm, int prio)
+{
+    if (prio <= pm->prio) return False;
+    buffer_init(&pm->m, 0);
+    pm->prio = prio;
+    return True;
+}
+const char *priomsg_getmessage(const struct priomsg *pm, const char *defmsg)
+{
+    if (pm->prio >= INT_MIN)
+       return truncmsg_terminate(&pm->m);
+    else
+       return defmsg;
+}
+
+
 void buffer_new(struct buffer_if *buf, int32_t len)
 {
     buf->free=True;

diff --git a/util.h b/util.h
index d783cd076b10c7a70ecd7b215ba2947d61913d08..506a6e2f6f6619c0d86dc44c86e653be59cbd809 100644 (file)
--- a/util.h
+++ b/util.h
@@ -59,6 +59,27 @@ void truncmsg_add_string(struct buffer_if *buf, cstring_t s);
 void truncmsg_add_packet_string(struct buffer_if*, int32_t, const uint8_t*);
 const char *truncmsg_terminate(const struct buffer_if *buf);
 
+
+struct priomsg {
+    /* U: uninitialised
+     * F: initialised but free (no memory allocated), no leak if discarded
+     * Z: contains no message yet
+     * M: contains some message; you may call truncmsg_add_*
+     */
+    int prio;
+    struct buffer_if m;
+};
+
+void priomsg_new(struct priomsg *pm, int32_t maxlen);          /* UF -> Z */
+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_*. */
+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 */
+
 /*
  * void BUF_ADD_BYTES(append,    struct buffer_if*, const void*, int32_t size);
  * void BUF_ADD_BYTES(prepend,   struct buffer_if*, const void*, int32_t size);