diff options
| author | Tor Andersson <tor.andersson@artifex.com> | 2016-12-21 17:30:27 +0100 |
|---|---|---|
| committer | Tor Andersson <tor.andersson@artifex.com> | 2016-12-27 15:06:51 +0100 |
| commit | e22743070ff1f3d4cc83177c4669476fd2526844 (patch) | |
| tree | 937bbb4ef97038d55b9b00d6dbdc314bda97568d | |
| parent | 9423400441f32a4c28651ee255cb95cecf49a57a (diff) | |
| download | mupdf-e22743070ff1f3d4cc83177c4669476fd2526844.tar.xz | |
Stylistic cleanups.
| -rw-r--r-- | source/fitz/directory.c | 22 | ||||
| -rw-r--r-- | source/fitz/untar.c | 15 | ||||
| -rw-r--r-- | source/fitz/unzip.c | 16 |
3 files changed, 24 insertions, 29 deletions
diff --git a/source/fitz/directory.c b/source/fitz/directory.c index aba11eb9..5b9ccf82 100644 --- a/source/fitz/directory.c +++ b/source/fitz/directory.c @@ -59,22 +59,20 @@ fz_is_directory(fz_context *ctx, const char *path) fz_archive * fz_open_directory(fz_context *ctx, const char *path) { - fz_directory *dir = NULL; + fz_directory *dir; - fz_var(dir); + 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->super.format = "dir"; + dir->super.has_entry = has_dir_entry; + dir->super.read_entry = read_dir_entry; + dir->super.open_entry = open_dir_entry; + dir->super.drop_archive = drop_directory; fz_try(ctx) { - 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->super.format = "dir"; - dir->super.has_entry = has_dir_entry; - dir->super.read_entry = read_dir_entry; - dir->super.open_entry = open_dir_entry; - dir->super.drop_archive = drop_directory; - dir->path = fz_strdup(ctx, path); } fz_catch(ctx) diff --git a/source/fitz/untar.c b/source/fitz/untar.c index 3c00425d..849af073 100644 --- a/source/fitz/untar.c +++ b/source/fitz/untar.c @@ -194,17 +194,16 @@ fz_open_tar_archive_with_stream(fz_context *ctx, fz_stream *file) fz_throw(ctx, FZ_ERROR_GENERIC, "cannot recognize tar archive"); tar = fz_new_archive(ctx, file, fz_tar_archive); + tar->super.format = "tar"; + tar->super.count_entries = count_tar_entries; + tar->super.list_entry = list_tar_entry; + tar->super.has_entry = has_tar_entry; + tar->super.read_entry = read_tar_entry; + tar->super.open_entry = open_tar_entry; + tar->super.drop_archive = drop_tar_archive; fz_try(ctx) { - tar->super.format = "tar"; - tar->super.count_entries = count_tar_entries; - tar->super.list_entry = list_tar_entry; - tar->super.has_entry = has_tar_entry; - tar->super.read_entry = read_tar_entry; - tar->super.open_entry = open_tar_entry; - tar->super.drop_archive = drop_tar_archive; - ensure_tar_entries(ctx, tar); } fz_catch(ctx) diff --git a/source/fitz/unzip.c b/source/fitz/unzip.c index d7f2ad0e..24094c1a 100644 --- a/source/fitz/unzip.c +++ b/source/fitz/unzip.c @@ -410,18 +410,16 @@ fz_open_zip_archive_with_stream(fz_context *ctx, fz_stream *file) fz_throw(ctx, FZ_ERROR_GENERIC, "cannot recognize zip archive"); zip = fz_new_archive(ctx, file, fz_zip_archive); + zip->super.format = "zip"; + zip->super.count_entries = count_zip_entries; + zip->super.list_entry = list_zip_entry; + zip->super.has_entry = has_zip_entry; + zip->super.read_entry = read_zip_entry; + zip->super.open_entry = open_zip_entry; + zip->super.drop_archive = drop_zip_archive; fz_try(ctx) { - - zip->super.format = "zip"; - zip->super.count_entries = count_zip_entries; - zip->super.list_entry = list_zip_entry; - zip->super.has_entry = has_zip_entry; - zip->super.read_entry = read_zip_entry; - zip->super.open_entry = open_zip_entry; - zip->super.drop_archive = drop_zip_archive; - ensure_zip_entries(ctx, zip); } fz_catch(ctx) |