X-Git-Url: https://wimlib.net/git/?p=wimlib;a=blobdiff_plain;f=src%2Fwimlib.h;h=0b0f04bf6b045acea1a988f154cfbecf072ee144;hp=1957f6bad090bd7fbbd81bb39f3c9409ab3b9ae4;hb=7c83ef53090441de11cc78d8d26dc337cd7ac475;hpb=3cf06a471de65b5e69b44c41b95b1bbfb49ab55f

diff --git a/src/wimlib.h b/src/wimlib.h
index 1957f6ba..0b0f04bf 100644
--- a/src/wimlib.h
+++ b/src/wimlib.h
@@ -211,6 +211,10 @@
 #include <stdbool.h>
 #include <inttypes.h>
 
+#define WIMLIB_MAJOR_VERSION 1
+#define WIMLIB_MINOR_VERSION 2
+#define WIMLIB_PATCH_VERSION 0
+
 /**
  * Opaque structure that represents a WIM file.  This is an in-memory structure
  * and need not correspond to a specific on-disk file.  However, a ::WIMStruct
@@ -530,6 +534,7 @@ union wimlib_progress_info {
 typedef int (*wimlib_progress_func_t)(enum wimlib_progress_msg msg_type,
 				      const union wimlib_progress_info *info);
 
+
 /*****************************
  * WIMLIB_ADD_IMAGE_FLAG_*   *
  *****************************/
@@ -662,6 +667,7 @@ typedef int (*wimlib_progress_func_t)(enum wimlib_progress_msg msg_type,
  */
 enum wimlib_error_code {
 	WIMLIB_ERR_SUCCESS = 0,
+	WIMLIB_ERR_ALREADY_LOCKED,
 	WIMLIB_ERR_COMPRESSED_LOOKUP_TABLE,
 	WIMLIB_ERR_DECOMPRESSION,
 	WIMLIB_ERR_DELETE_STAGING_DIR,
@@ -1570,6 +1576,11 @@ extern int wimlib_open_wim(const char *wim_file, int open_flags,
  *
  * @return 0 on success; nonzero on error.  This function may return any value
  * returned by wimlib_write() as well as the following error codes:
+ * @retval ::WIMLIB_ERR_ALREADY_LOCKED
+ * 	The append-only overwrite mode was going to be used, but an exclusive
+ * 	advisory lock on the on-disk WIM file could not be acquired, probably
+ * 	because another thread or process was calling wimlib_overwrite() on the
+ * 	same underlying on-disk file at the same time.
  * @retval ::WIMLIB_ERR_NO_FILENAME
  * 	@a wim corresponds to a WIM created with wimlib_create_new_wim() rather
  * 	than a WIM read with wimlib_open_wim().
@@ -1739,8 +1750,8 @@ extern void wimlib_print_wim_information(const WIMStruct *wim);
  * 	image, indexed starting at 1, is returned.  If the keyword "all" or "*"
  * 	was specified, ::WIMLIB_ALL_IMAGES is returned.  Otherwise,
  * 	::WIMLIB_NO_IMAGE is returned.  If @a image_name_or_num was @c NULL or
- * 	the empty string, ::WIM_NO_IMAGE is returned, even if one or more images
- * 	in @a wim has no name.
+ * 	the empty string, ::WIMLIB_NO_IMAGE is returned, even if one or more
+ * 	images in @a wim has no name.
  */
 extern int wimlib_resolve_image(WIMStruct *wim, const char *image_name_or_num);