Merge 'master' into 'psppsheet'.

[pspp] / src / libpspp / str.h

diff --git a/src/libpspp/str.h b/src/libpspp/str.h
index e017696cf60bdc1efc9dd12a744e3d9b7befeec5..306bd8ba89f110762dbf31f04abace081227b0cc 100644 (file)
--- a/src/libpspp/str.h
+++ b/src/libpspp/str.h
@@ -228,8 +228,14 @@ void ds_put_cstr (struct string *, const char *);
 void ds_put_substring (struct string *, struct substring);
 void ds_put_vformat (struct string *st, const char *, va_list)
      PRINTF_FORMAT (2, 0);
+void ds_put_c_vformat (struct string *st, const char *, va_list)
+     PRINTF_FORMAT (2, 0);
+
 void ds_put_format (struct string *, const char *, ...)
      PRINTF_FORMAT (2, 3);
+void ds_put_c_format (struct string *, const char *, ...)
+     PRINTF_FORMAT (2, 3);
+
 char *ds_put_uninit (struct string *st, size_t incr);
 
 char *ds_splice_uninit (struct string *, size_t ofs, size_t old_len,