- if (dentry->short_name_len != 0) {
- char *short_name_utf8;
- size_t short_name_utf8_len;
- ret = utf16_to_utf8(dentry->short_name,
- dentry->short_name_len,
- &short_name_utf8,
- &short_name_utf8_len);
+ if (dentry_has_short_name(dentry)) {
+ mbchar *short_name_mbs;
+ size_t short_name_mbs_nbytes;
+ ret = utf16le_to_mbs(dentry->short_name,
+ dentry->short_name_nbytes,
+ &short_name_mbs,
+ &short_name_mbs_nbytes);