Replace WIM_GID_LEN => WIM_GUID_LEN

[wimlib] / src / wimboot.c

diff --git a/src/wimboot.c b/src/wimboot.c
index 7ee67f96b3c1a4d825dc236d4b2db58b2db46f45..3dd6da1eded2135c0db75660292a75290d13cd61 100644 (file)
--- a/src/wimboot.c
+++ b/src/wimboot.c
@@ -312,7 +312,7 @@ static u8 *
 fill_in_wimoverlay_dat(u8 *buf,
                       const struct WimOverlay_dat_header *old_hdr,
                       const wchar_t *wim_path,
 fill_in_wimoverlay_dat(u8 *buf,
                       const struct WimOverlay_dat_header *old_hdr,
                       const wchar_t *wim_path,

-                      const u8 wim_guid[WIM_GID_LEN],
+                      const u8 wim_guid[WIM_GUID_LEN],

                       int image,
                       u64 new_data_source_id,
                       const PARTITION_INFORMATION_EX *part_info,
                       int image,
                       u64 new_data_source_id,
                       const PARTITION_INFORMATION_EX *part_info,


@@ -360,8 +360,8 @@ fill_in_wimoverlay_dat(u8 *buf,
        new_entry_1->entry_2_length = new_entry_2_size;
        new_entry_1->wim_type = WIM_BOOT_NOT_OS_WIM;
        new_entry_1->wim_index = image;
        new_entry_1->entry_2_length = new_entry_2_size;
        new_entry_1->wim_type = WIM_BOOT_NOT_OS_WIM;
        new_entry_1->wim_index = image;

-       BUILD_BUG_ON(sizeof(new_entry_1->guid) != WIM_GID_LEN);
-       memcpy(new_entry_1->guid, wim_guid, WIM_GID_LEN);
+       BUILD_BUG_ON(sizeof(new_entry_1->guid) != WIM_GUID_LEN);
+       memcpy(new_entry_1->guid, wim_guid, WIM_GUID_LEN);

 
        p += sizeof(struct WimOverlay_dat_entry_1);
 
 
        p += sizeof(struct WimOverlay_dat_entry_1);
 


@@ -457,7 +457,7 @@ fill_in_wimoverlay_dat(u8 *buf,
 static int
 prepare_wimoverlay_dat(const struct WimOverlay_dat_header *old_hdr,
                       const wchar_t *wim_path,
 static int
 prepare_wimoverlay_dat(const struct WimOverlay_dat_header *old_hdr,
                       const wchar_t *wim_path,

-                      const u8 wim_guid[WIM_GID_LEN],
+                      const u8 wim_guid[WIM_GUID_LEN],

                       int image,
                       void **new_contents_ret,
                       u32 *new_contents_size_ret,
                       int image,
                       void **new_contents_ret,
                       u32 *new_contents_size_ret,


@@ -757,7 +757,7 @@ out_free_contents:
  */
 static int
 update_wimoverlay_manually(const wchar_t *drive, const wchar_t *wim_path,
  */
 static int
 update_wimoverlay_manually(const wchar_t *drive, const wchar_t *wim_path,

-                          const u8 wim_guid[WIM_GID_LEN],
+                          const u8 wim_guid[WIM_GUID_LEN],

                           int image, u64 *data_source_id_ret)
 {
        wchar_t path_main[] = L"A:\\System Volume Information\\WimOverlay.dat";
                           int image, u64 *data_source_id_ret)
 {
        wchar_t path_main[] = L"A:\\System Volume Information\\WimOverlay.dat";


@@ -911,7 +911,7 @@ try_to_attach_wof(const wchar_t *drive)
  */
 int
 wimboot_alloc_data_source_id(const wchar_t *wim_path,
  */
 int
 wimboot_alloc_data_source_id(const wchar_t *wim_path,

-                            const u8 wim_guid[WIM_GID_LEN],
+                            const u8 wim_guid[WIM_GUID_LEN],

                             int image, const wchar_t *target,
                             u64 *data_source_id_ret, bool *wof_running_ret)
 {
                             int image, const wchar_t *target,
                             u64 *data_source_id_ret, bool *wof_running_ret)
 {