Skip to content

Commit 4bbe5e6

Browse files
committed
win32: name the dummy union in GIT_REPARSE_DATA_BUFFER
Instead of buf->"typeofbuffer"ReparseBuffer the members will be referenced with buf->ReparseBuffer."typeofbuffer" https://docs.microsoft.com/en-us/windows-hardware/drivers/ddi/ntifs/ns-ntifs-_reparse_data_buffer?redirectedfrom=MSDN calls the union DUMMYUNIONNAME but that looks a bit cluttered.
1 parent b018958 commit 4bbe5e6

File tree

3 files changed

+15
-15
lines changed

3 files changed

+15
-15
lines changed

src/win32/path_w32.c

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -381,14 +381,14 @@ int git_win32_path_readlink_w(git_win32_path dest, const git_win32_path path)
381381

382382
switch (reparse_buf->ReparseTag) {
383383
case IO_REPARSE_TAG_SYMLINK:
384-
target = reparse_buf->SymbolicLinkReparseBuffer.PathBuffer +
385-
(reparse_buf->SymbolicLinkReparseBuffer.SubstituteNameOffset / sizeof(WCHAR));
386-
target_len = reparse_buf->SymbolicLinkReparseBuffer.SubstituteNameLength / sizeof(WCHAR);
384+
target = reparse_buf->ReparseBuffer.SymbolicLink.PathBuffer +
385+
(reparse_buf->ReparseBuffer.SymbolicLink.SubstituteNameOffset / sizeof(WCHAR));
386+
target_len = reparse_buf->ReparseBuffer.SymbolicLink.SubstituteNameLength / sizeof(WCHAR);
387387
break;
388388
case IO_REPARSE_TAG_MOUNT_POINT:
389-
target = reparse_buf->MountPointReparseBuffer.PathBuffer +
390-
(reparse_buf->MountPointReparseBuffer.SubstituteNameOffset / sizeof(WCHAR));
391-
target_len = reparse_buf->MountPointReparseBuffer.SubstituteNameLength / sizeof(WCHAR);
389+
target = reparse_buf->ReparseBuffer.MountPoint.PathBuffer +
390+
(reparse_buf->ReparseBuffer.MountPoint.SubstituteNameOffset / sizeof(WCHAR));
391+
target_len = reparse_buf->ReparseBuffer.MountPoint.SubstituteNameLength / sizeof(WCHAR);
392392
break;
393393
default:
394394
errno = EINVAL;

src/win32/reparse.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,18 +26,18 @@ typedef struct _GIT_REPARSE_DATA_BUFFER {
2626
USHORT PrintNameLength;
2727
ULONG Flags;
2828
WCHAR PathBuffer[1];
29-
} SymbolicLinkReparseBuffer;
29+
} SymbolicLink;
3030
struct {
3131
USHORT SubstituteNameOffset;
3232
USHORT SubstituteNameLength;
3333
USHORT PrintNameOffset;
3434
USHORT PrintNameLength;
3535
WCHAR PathBuffer[1];
36-
} MountPointReparseBuffer;
36+
} MountPoint;
3737
struct {
3838
UCHAR DataBuffer[1];
39-
} GenericReparseBuffer;
40-
};
39+
} Generic;
40+
} ReparseBuffer;
4141
} GIT_REPARSE_DATA_BUFFER;
4242

4343
#define REPARSE_DATA_HEADER_SIZE 8

tests/core/link.c

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ static void do_junction(const char *old, const char *new)
123123
reparse_buf = LocalAlloc(LMEM_FIXED|LMEM_ZEROINIT, reparse_buflen);
124124
cl_assert(reparse_buf);
125125

126-
subst_utf16 = reparse_buf->MountPointReparseBuffer.PathBuffer;
126+
subst_utf16 = reparse_buf->ReparseBuffer.MountPoint.PathBuffer;
127127
print_utf16 = subst_utf16 + subst_utf16_len + 1;
128128

129129
ret = git__utf8_to_16(subst_utf16, subst_utf16_len + 1,
@@ -135,10 +135,10 @@ static void do_junction(const char *old, const char *new)
135135
cl_assert_equal_i(print_utf16_len, ret);
136136

137137
reparse_buf->ReparseTag = IO_REPARSE_TAG_MOUNT_POINT;
138-
reparse_buf->MountPointReparseBuffer.SubstituteNameOffset = 0;
139-
reparse_buf->MountPointReparseBuffer.SubstituteNameLength = subst_byte_len;
140-
reparse_buf->MountPointReparseBuffer.PrintNameOffset = (USHORT)(subst_byte_len + sizeof(WCHAR));
141-
reparse_buf->MountPointReparseBuffer.PrintNameLength = print_byte_len;
138+
reparse_buf->ReparseBuffer.MountPoint.SubstituteNameOffset = 0;
139+
reparse_buf->ReparseBuffer.MountPoint.SubstituteNameLength = subst_byte_len;
140+
reparse_buf->ReparseBuffer.MountPoint.PrintNameOffset = (USHORT)(subst_byte_len + sizeof(WCHAR));
141+
reparse_buf->ReparseBuffer.MountPoint.PrintNameLength = print_byte_len;
142142
reparse_buf->ReparseDataLength = reparse_buflen - REPARSE_DATA_HEADER_SIZE;
143143

144144
cl_win32_pass(DeviceIoControl(handle, FSCTL_SET_REPARSE_POINT,

0 commit comments

Comments
 (0)