diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-08-26 10:36:09 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-08-26 10:36:09 +0000 |
| commit | 0151cc01a4f5b10ee3fe12d4ac107e05075a5a5c (patch) | |
| tree | a9d6e5a8d24fc16df39017850d9871bdc0237948 /lib/exfat_fs.c | |
| parent | Releasing progress-linux version 1.2.4-1~progress7.99u1. (diff) | |
| download | exfatprogs-0151cc01a4f5b10ee3fe12d4ac107e05075a5a5c.tar.xz exfatprogs-0151cc01a4f5b10ee3fe12d4ac107e05075a5a5c.zip | |
Merging upstream version 1.2.5.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to '')
| -rw-r--r-- | lib/exfat_fs.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/lib/exfat_fs.c b/lib/exfat_fs.c index b24f532..ee87bb1 100644 --- a/lib/exfat_fs.c +++ b/lib/exfat_fs.c @@ -249,8 +249,6 @@ int exfat_resolve_path(struct path_resolve_ctx *ctx, struct exfat_inode *child) int depth, i; int name_len; __le16 *utf16_path; - static const __le16 utf16_slash = cpu_to_le16(0x002F); - static const __le16 utf16_null = cpu_to_le16(0x0000); size_t in_size; ctx->local_path[0] = '\0'; @@ -268,13 +266,13 @@ int exfat_resolve_path(struct path_resolve_ctx *ctx, struct exfat_inode *child) memcpy((char *)utf16_path, (char *)ctx->ancestors[i]->name, name_len * 2); utf16_path += name_len; - memcpy((char *)utf16_path, &utf16_slash, sizeof(utf16_slash)); + *utf16_path = UTF16_SLASH; utf16_path++; } if (depth > 1) utf16_path--; - memcpy((char *)utf16_path, &utf16_null, sizeof(utf16_null)); + *utf16_path = UTF16_NULL; utf16_path++; in_size = (utf16_path - ctx->utf16_path) * sizeof(__le16); |