Changeset fcc3cd8 in mainline

Timestamp:

2011-06-28T07:35:01Z (13 years ago)

Author:

Oleg Romanenko <romanenko.oleg@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

4c3c4a5

Parents:

82374b2

Message:

Using new function to convert LFN UTF16 data to UTF8 string
in fat_directory_read()

Location:

uspace/srv/fs/fat

Files:

• fat_dentry.c (modified) (2 diffs)
• fat_dentry.h (modified) (1 diff)
• fat_directory.c (modified) (2 diffs)

uspace/srv/fs/fat/fat_dentry.c

@@ -266 +266 @@
 }
 
-size_t fat_lfn_get_part(const uint16_t *src, size_t src_size, wchar_t *dst, size_t *offset)
+size_t fat_lfn_get_part(const uint16_t *src, size_t src_size, uint16_t *dst, size_t *offset)
 {
         while (src_size!=0 && (*offset)!=0) {
@@ -279 +279 @@
 }
 
-size_t fat_lfn_get_entry(const fat_dentry_t *d, wchar_t *dst, size_t *offset)
+size_t fat_lfn_get_entry(const fat_dentry_t *d, uint16_t *dst, size_t *offset)
 {
         fat_lfn_get_part(FAT_LFN_PART3(d), FAT_LFN_PART3_SIZE, dst, offset);

uspace/srv/fs/fat/fat_dentry.h

@@ -140 +140 @@
 extern size_t fat_lfn_str_nlength(const uint16_t *, size_t);
 extern size_t fat_lfn_size(const fat_dentry_t *);
-extern size_t fat_lfn_get_part(const uint16_t *, size_t, wchar_t *, size_t *);
-extern size_t fat_lfn_get_entry(const fat_dentry_t *, wchar_t *, size_t *);
+extern size_t fat_lfn_get_part(const uint16_t *, size_t, uint16_t *, size_t *);
+extern size_t fat_lfn_get_entry(const fat_dentry_t *, uint16_t *, size_t *);
 extern size_t fat_lfn_set_part(const wchar_t *, size_t *, size_t, uint16_t *, size_t);
 extern size_t fat_lfn_set_entry(const wchar_t *, size_t *, size_t, fat_dentry_t *);

uspace/srv/fs/fat/fat_directory.c

@@ -154 +154 @@
 {
         fat_dentry_t *d = NULL;
-        wchar_t wname[FAT_LFN_NAME_SIZE];
+        uint16_t wname[FAT_LFN_NAME_SIZE];
         size_t lfn_offset, lfn_size;
         bool long_entry = false;
@@ -199 +199 @@
                                         (checksum == fat_dentry_chksum(d->name))) {
                                         wname[lfn_size] = '\0';
-                                        if (wstr_to_str(name, FAT_LFN_NAME_SIZE, wname)!=EOK)
+                                        if (utf16_to_str(name, FAT_LFN_NAME_SIZE, wname) != EOK)
                                                 fat_dentry_name_get(d, name);
                                 }