tests: send1: fix sendto_channel_opmod (remote) to cover all scenarios

[solanum.git] / include / msgbuf.h

diff --git a/include/msgbuf.h b/include/msgbuf.h
index 3d76d82c4ddcff9c8bbab71020b09a633d05a39d..1bcff5edc6b1ac12cb4d2c39e55b73015f84e91d 100644 (file)
--- a/include/msgbuf.h
+++ b/include/msgbuf.h
@@ -39,7 +39,6 @@ struct MsgBuf {
        const char *target;             /* the target of the message (either NULL, or custom defined) */
        const char *cmd;                /* the cmd/verb of the message (either NULL, or para[0]) */
 
-       size_t parselen;                /* the length of the message */
        size_t n_para;                  /* the number of parameters (always at least 1 if a full message) */
        const char *para[MAXPARA];      /* parameters vector (starting with cmd as para[0]) */
 };
@@ -56,7 +55,7 @@ int msgbuf_parse(struct MsgBuf *msgbuf, char *line);
  * cmd may not be NULL.
  * returns 0 on success, 1 on error.
  */
-int msgbuf_unparse(char *buf, size_t buflen, struct MsgBuf *msgbuf, unsigned int capmask);
+int msgbuf_unparse(char *buf, size_t buflen, const struct MsgBuf *msgbuf, unsigned int capmask);
 
 /*
  * unparse a MsgBuf header plus payload into a buffer.
@@ -64,10 +63,10 @@ int msgbuf_unparse(char *buf, size_t buflen, struct MsgBuf *msgbuf, unsigned int
  * cmd may not be NULL.
  * returns 0 on success, 1 on error.
  */
-int msgbuf_unparse_fmt(char *buf, size_t buflen, struct MsgBuf *head, unsigned int capmask, const char *fmt, ...) AFP(5, 6);
-int msgbuf_vunparse_fmt(char *buf, size_t buflen, struct MsgBuf *head, unsigned int capmask, const char *fmt, va_list va);
+int msgbuf_unparse_fmt(char *buf, size_t buflen, const struct MsgBuf *head, unsigned int capmask, const char *fmt, ...) AFP(5, 6);
+int msgbuf_vunparse_fmt(char *buf, size_t buflen, const struct MsgBuf *head, unsigned int capmask, const char *fmt, va_list va);
 
-void msgbuf_unparse_prefix(char *buf, size_t buflen, struct MsgBuf *msgbuf, unsigned int capmask);
+void msgbuf_unparse_prefix(char *buf, size_t *buflen, const struct MsgBuf *msgbuf, unsigned int capmask);
 
 static inline void
 msgbuf_init(struct MsgBuf *msgbuf)
@@ -86,13 +85,4 @@ msgbuf_append_tag(struct MsgBuf *msgbuf, const char *key, const char *value, uns
        }
 }
 
-static inline void
-msgbuf_append_para(struct MsgBuf *msgbuf, const char *para)
-{
-       if (msgbuf->n_para < MAXPARA) {
-               msgbuf->para[msgbuf->n_para] = para;
-               msgbuf->n_para++;
-       }
-}
-
 #endif