diff options
| author | Robin Watts <robin.watts@artifex.com> | 2017-03-27 23:45:21 +0100 |
|---|---|---|
| committer | Robin Watts <robin.watts@artifex.com> | 2017-03-28 10:56:20 +0100 |
| commit | 57b2ee8fe52cf9e2eaf4095b8697f33e17a5529f (patch) | |
| tree | e242b53678ee7dfcade6998a76ad27b1aae77a90 | |
| parent | 24d484d1b2b1c46e1cac883949965aace2f949ba (diff) | |
| download | mupdf-57b2ee8fe52cf9e2eaf4095b8697f33e17a5529f.tar.xz | |
Rename fz_new_archive to fz_new_derived_archive
Fits with the rest of the code.
| -rw-r--r-- | include/mupdf/fitz/archive.h | 4 | ||||
| -rw-r--r-- | source/fitz/directory.c | 2 | ||||
| -rw-r--r-- | source/fitz/untar.c | 2 | ||||
| -rw-r--r-- | source/fitz/unzip.c | 2 |
4 files changed, 6 insertions, 4 deletions
diff --git a/include/mupdf/fitz/archive.h b/include/mupdf/fitz/archive.h index be055615..c204b34f 100644 --- a/include/mupdf/fitz/archive.h +++ b/include/mupdf/fitz/archive.h @@ -25,7 +25,9 @@ struct fz_archive_s fz_new_archive: Create and initialize an archive struct. */ fz_archive *fz_new_archive_of_size(fz_context *ctx, fz_stream *file, int size); -#define fz_new_archive(C,F,M) ((M*)Memento_label(fz_new_archive_of_size(C, F, sizeof(M)), #M)) + +#define fz_new_derived_archive(C,F,M) \ + ((M*)Memento_label(fz_new_archive_of_size(C, F, sizeof(M)), #M)) /* fz_open_archive: Open a zip or tar archive diff --git a/source/fitz/directory.c b/source/fitz/directory.c index 5b9ccf82..6e2750b9 100644 --- a/source/fitz/directory.c +++ b/source/fitz/directory.c @@ -64,7 +64,7 @@ fz_open_directory(fz_context *ctx, const char *path) if (!fz_is_directory(ctx, path)) fz_throw(ctx, FZ_ERROR_GENERIC, "'%s' is not a directory", path); - dir = fz_new_archive(ctx, NULL, fz_directory); + dir = fz_new_derived_archive(ctx, NULL, fz_directory); dir->super.format = "dir"; dir->super.has_entry = has_dir_entry; dir->super.read_entry = read_dir_entry; diff --git a/source/fitz/untar.c b/source/fitz/untar.c index 849af073..e8d5f183 100644 --- a/source/fitz/untar.c +++ b/source/fitz/untar.c @@ -193,7 +193,7 @@ fz_open_tar_archive_with_stream(fz_context *ctx, fz_stream *file) if (!fz_is_tar_archive(ctx, file)) fz_throw(ctx, FZ_ERROR_GENERIC, "cannot recognize tar archive"); - tar = fz_new_archive(ctx, file, fz_tar_archive); + tar = fz_new_derived_archive(ctx, file, fz_tar_archive); tar->super.format = "tar"; tar->super.count_entries = count_tar_entries; tar->super.list_entry = list_tar_entry; diff --git a/source/fitz/unzip.c b/source/fitz/unzip.c index 24094c1a..0e595c05 100644 --- a/source/fitz/unzip.c +++ b/source/fitz/unzip.c @@ -409,7 +409,7 @@ fz_open_zip_archive_with_stream(fz_context *ctx, fz_stream *file) if (!fz_is_zip_archive(ctx, file)) fz_throw(ctx, FZ_ERROR_GENERIC, "cannot recognize zip archive"); - zip = fz_new_archive(ctx, file, fz_zip_archive); + zip = fz_new_derived_archive(ctx, file, fz_zip_archive); zip->super.format = "zip"; zip->super.count_entries = count_zip_entries; zip->super.list_entry = list_zip_entry; |