zip-reader: New function zip_member_read_all().

[pspp] / src / libpspp / zip-reader.h

diff --git a/src/libpspp/zip-reader.h b/src/libpspp/zip-reader.h
index 842864143df3384ad14d92ad66cc73e1fef7c727..7293aba3185ff18383d08bf14b5e951327daaa3e 100644 (file)
--- a/src/libpspp/zip-reader.h
+++ b/src/libpspp/zip-reader.h
@@ -31,6 +31,11 @@ struct zip_reader *zip_reader_create (const char *filename, struct string *errs)
 /* Destroy the zip reader */
 void zip_reader_destroy (struct zip_reader *zr);
 
+/* Returns the name of ZR's member IDX, IDX >= 0.  Returns NULL if ZR has fewer
+   than (IDX + 1) members. */
+const char *zip_reader_get_member_name(const struct zip_reader *zr,
+                                       size_t idx);
+
 /* Return the zip member in the reader ZR, called MEMBER */
 struct zip_member *zip_member_open (struct zip_reader *zr, const char *member);
 
@@ -38,7 +43,14 @@ struct zip_member *zip_member_open (struct zip_reader *zr, const char *member);
    Returns the number of bytes read, or -1 on error */
 int zip_member_read (struct zip_member *zm, void *buf, size_t n);
 
+/* Read all of ZM into memory, storing the data in *DATAP and its size in *NP.
+   Returns NULL if successful, otherwise an error string that the caller
+   must eventually free(). */
+char *zip_member_read_all (struct zip_reader *, const char *member_name,
+                           void **datap, size_t *np) WARN_UNUSED_RESULT;
+
 void zip_member_finish (struct zip_member *zm);
 
 
+
 #endif