From 6c22a824ca41822f106c1d5764526ff1dfd5e87b Mon Sep 17 00:00:00 2001 From: Eric Biggers Date: Tue, 18 Mar 2014 21:56:09 -0500 Subject: [PATCH] Cleanups --- NEWS | 10 +++++----- configure.ac | 2 +- doc/imagex-export.1.in | 2 +- include/wimlib.h | 2 +- programs/imagex.c | 6 +++--- programs/mkwinpeimg.in | 2 +- src/mount_image.c | 6 ++---- 7 files changed, 14 insertions(+), 16 deletions(-) diff --git a/NEWS b/NEWS index bd50c589..00f43502 100644 --- a/NEWS +++ b/NEWS @@ -8,14 +8,14 @@ Version 1.6.2 (BETA): wimunmount now provides the '--new-image' option to cause changes to a read-write mounted image to be committed as a new image rather than as - an update of the same image. (The corresponding new library flag is + an update of the mounted image. (The corresponding new library flag is WIMLIB_UNMOUNT_FLAG_NEW_IMAGE.) - The LZMS compression chunk size, or "dictionary size", may now be up to - 1 GiB (2^30). + The LZMS ("recovery") compression chunk size, or "dictionary size", may + now be up to 1 GiB (1,073,741,824 bytes). - The performance of LZX and LZMS compression with large chunk sizes has - been slightly improved. + The performance of LZX ("maximum") and LZMS ("recovery") compression + with large chunk sizes has been slightly improved. Version 1.6.1: Stored files with size exactly 4 GiB (4,294,967,296 bytes) are now diff --git a/configure.ac b/configure.ac index 944ccb00..d1b7799b 100644 --- a/configure.ac +++ b/configure.ac @@ -1,4 +1,4 @@ -AC_INIT([wimlib], [1.6.2-beta], [ebiggers3@gmail.com]) +AC_INIT([wimlib], [1.6.2-BETA], [ebiggers3@gmail.com]) AC_CONFIG_SRCDIR([src/wim.c]) AC_CONFIG_MACRO_DIR([m4]) AC_CONFIG_AUX_DIR([build-aux]) diff --git a/doc/imagex-export.1.in b/doc/imagex-export.1.in index 64ee3c68..a024e383 100644 --- a/doc/imagex-export.1.in +++ b/doc/imagex-export.1.in @@ -165,7 +165,7 @@ always be created. WIMs, which usually contain LZMS-compressed solid blocks and may carry the \fI.esd\fR file extension rather than \fI.wim\fR. However, \fI.esd\fR files downloaded directly by the Windows 8 web downloader have encrypted segments, and -wimlib cannot export images from files until they are first decrypted. In +wimlib cannot export images from such files until they are first decrypted. In addition, to ensure the destination archive is created in the original WIM format rather than in the newer format, specify \fB--compress\fR=\fImaximum\fR. .SH EXAMPLES diff --git a/include/wimlib.h b/include/wimlib.h index 854bca7c..fd55ebf8 100644 --- a/include/wimlib.h +++ b/include/wimlib.h @@ -10,7 +10,7 @@ */ /* - * Copyright (C) 2012, 2013 Eric Biggers + * Copyright (C) 2012, 2013, 2014 Eric Biggers * * This file is part of wimlib, a library for working with WIM files. * diff --git a/programs/imagex.c b/programs/imagex.c index c0a9f8c2..6a95b041 100644 --- a/programs/imagex.c +++ b/programs/imagex.c @@ -6,7 +6,7 @@ */ /* - * Copyright (C) 2012, 2013 Eric Biggers + * Copyright (C) 2012, 2013, 2014 Eric Biggers * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -4166,8 +4166,8 @@ version(void) { static const tchar *s = T( -IMAGEX_PROGNAME " (" PACKAGE ") " PACKAGE_VERSION "\n" -"Copyright (C) 2012, 2013 Eric Biggers\n" +IMAGEX_PROGNAME " (distributed with " PACKAGE " " PACKAGE_VERSION ")\n" +"Copyright (C) 2012, 2013, 2014 Eric Biggers\n" "License GPLv3+; GNU GPL version 3 or later .\n" "This is free software: you are free to change and redistribute it.\n" "There is NO WARRANTY, to the extent permitted by law.\n" diff --git a/programs/mkwinpeimg.in b/programs/mkwinpeimg.in index 42b4a1c5..654249b2 100755 --- a/programs/mkwinpeimg.in +++ b/programs/mkwinpeimg.in @@ -116,7 +116,7 @@ EOF } version() { - echo "$script_name (wimlib $WIMLIB_VERSION)" + echo "$script_name (distributed with wimlib $WIMLIB_VERSION)" exit 0 } diff --git a/src/mount_image.c b/src/mount_image.c index fac3f78a..cf5d4353 100644 --- a/src/mount_image.c +++ b/src/mount_image.c @@ -2615,7 +2615,7 @@ wimlib_mount_image(WIMStruct *wim, int image, const char *dir, #endif /* Assign inode numbers. Also, if a read-write mount was requested, - * mark the dentry tree as modified, and add each streams referenced by + * mark the dentry tree as modified, and add each stream referenced by * files in the image to a list and preemptively double the number of * references to each. The latter is done to allow implementing the * WIMLIB_UNMOUNT_FLAG_NEW_IMAGE semantics. */ @@ -2629,10 +2629,8 @@ wimlib_mount_image(WIMStruct *wim, int image, const char *dir, struct wim_lookup_table_entry *lte; lte = inode_stream_lte(inode, i, wim->lookup_table); - if (lte) { - lte->orig_stream_list = (struct list_head){NULL, NULL}; + if (lte) lte->out_refcnt = 0; - } } } image_for_each_inode(inode, imd) { -- 2.43.0