Zip Reader: Take members from the index if they exist.

[pspp] / src / libpspp / str.h

diff --git a/src/libpspp/str.h b/src/libpspp/str.h
index cf4888ed2896da9ca750463780a8f540a4f2601b..99cc7afc31b018138c8632ea3aeaa08973da3592 100644 (file)
--- a/src/libpspp/str.h
+++ b/src/libpspp/str.h
@@ -227,10 +227,19 @@ 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,
+                        size_t new_len);
+
 /* Other */
 /* calls relocate from gnulib on ST */
 void ds_relocate (struct string *st);
@@ -240,7 +249,7 @@ void u8_buf_copy_rpad (uint8_t *dst, size_t dst_size,
                       const uint8_t *src, size_t src_size,
                       char pad);
 \f
-struct substring
+static inline struct substring
 ss_empty (void)
 {
   struct substring ss;