projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
zip-reader: New function zip_reader_contains_member().
[pspp]
/
src
/
libpspp
/
zip-reader.c
diff --git
a/src/libpspp/zip-reader.c
b/src/libpspp/zip-reader.c
index d46af3415f14f7cd425d2dee921a20b8d23bf1bb..6c7c4e41bccec78651c87c33312e84ac527b344f 100644
(file)
--- a/
src/libpspp/zip-reader.c
+++ b/
src/libpspp/zip-reader.c
@@
-407,7
+407,7
@@
zip_reader_create (const char *file_name, struct string *errs)
}
static struct zip_entry *
}
static struct zip_entry *
-zip_entry_find (struct zip_reader *zr, const char *member)
+zip_entry_find (
const
struct zip_reader *zr, const char *member)
{
for (int i = 0; i < zr->n_entries; ++i)
{
{
for (int i = 0; i < zr->n_entries; ++i)
{
@@
-424,6
+424,13
@@
zip_reader_get_member_name(const struct zip_reader *zr, size_t idx)
return idx < zr->n_entries ? zr->entries[idx].name : NULL;
}
return idx < zr->n_entries ? zr->entries[idx].name : NULL;
}
+/* Returns true if ZR contains a member named MEMBER, false otherwise. */
+bool
+zip_reader_contains_member (const struct zip_reader *zr, const char *member)
+{
+ return zip_entry_find (zr, member) != NULL;
+}
+
/* Return the member called MEMBER from the reader ZR */
struct zip_member *
zip_member_open (struct zip_reader *zr, const char *member)
/* Return the member called MEMBER from the reader ZR */
struct zip_member *
zip_member_open (struct zip_reader *zr, const char *member)