Add mutt_buffer_addstr_n()

diff --git a/email/rfc2047.c b/email/rfc2047.c
index 3af6a98559126bd6f1c05187dc20ded7520bfde4..ee385c01df9de7abe622e58e9f26842e4cb9cad4 100644 (file)
--- a/email/rfc2047.c
+++ b/email/rfc2047.c
@@ -700,7 +700,7 @@ void rfc2047_decode(char **pd)
         }
         else
         {
-          mutt_buffer_add(&buf, s, holelen);
+          mutt_buffer_addstr_n(&buf, s, holelen);
         }
       }
       s += holelen;

diff --git a/mutt/buffer.c b/mutt/buffer.c
index 3c1196f1f75bf016be588f1060195a54fd8e786b..451e3fbc99dcdf745f39dfcd9bacaa72dd401310 100644 (file)
--- a/mutt/buffer.c
+++ b/mutt/buffer.c
@@ -106,7 +106,7 @@ struct Buffer *mutt_buffer_from(const char *seed)
 }
 
 /**
- * mutt_buffer_add - Add a string to a Buffer, expanding it if necessary
+ * mutt_buffer_addstr_n - Add a string to a Buffer, expanding it if necessary
  * @param buf Buffer to add to
  * @param s   String to add
  * @param len Length of the string
@@ -116,7 +116,7 @@ struct Buffer *mutt_buffer_from(const char *seed)
  * Always one byte bigger than necessary for the null terminator, and the
  * buffer is always NUL-terminated
  */
-size_t mutt_buffer_add(struct Buffer *buf, const char *s, size_t len)
+size_t mutt_buffer_addstr_n(struct Buffer *buf, const char *s, size_t len)
 {
   if (!buf || !s)
     return 0;
@@ -259,7 +259,7 @@ size_t mutt_buffer_addstr(struct Buffer *buf, const char *s)
 {
   if (!buf || !s)
     return 0;
-  return mutt_buffer_add(buf, s, mutt_str_strlen(s));
+  return mutt_buffer_addstr_n(buf, s, mutt_str_strlen(s));
 }
 
 /**
@@ -274,7 +274,7 @@ size_t mutt_buffer_addch(struct Buffer *buf, char c)
 {
   if (!buf)
     return 0;
-  return mutt_buffer_add(buf, &c, 1);
+  return mutt_buffer_addstr_n(buf, &c, 1);
 }
 
 /**

diff --git a/mutt/buffer.h b/mutt/buffer.h
index 83dc0d440c329de293d369808a5e166d39baab45..1c85e0fd466b42324c79fb4376286165fd0b244f 100644 (file)
--- a/mutt/buffer.h
+++ b/mutt/buffer.h
@@ -43,9 +43,9 @@ struct Buffer
 
 #define MoreArgs(buf) (*buf->dptr && (*buf->dptr != ';') && (*buf->dptr != '#'))
 
-size_t         mutt_buffer_add          (struct Buffer *buf, const char *s, size_t len);
 size_t         mutt_buffer_addch        (struct Buffer *buf, char c);
 size_t         mutt_buffer_addstr       (struct Buffer *buf, const char *s);
+size_t         mutt_buffer_addstr_n     (struct Buffer *buf, const char *s, size_t len);
 int            mutt_buffer_add_printf   (struct Buffer *buf, const char *fmt, ...);
 struct Buffer *mutt_buffer_alloc        (size_t size);
 void           mutt_buffer_fix_dptr     (struct Buffer *buf);