diff options
| author | Ansuel Smith <ansuelsmth@gmail.com> | 2019-06-16 19:00:50 +0200 |
|---|---|---|
| committer | Jo-Philipp Wich <jo@mein.io> | 2019-09-03 11:23:23 +0200 |
| commit | 9b3eb63d686b6d97a537f30b3bb6e29a7dec32a8 (patch) | |
| tree | d277b83f960e9ee68bb09b678195cf50e533b339 | |
| parent | c9d0462713cff660e763bc6b0897830edffe50c7 (diff) | |
| download | fstools-9b3eb63d686b6d97a537f30b3bb6e29a7dec32a8.tar.gz | |
libblkid-tiny: use blkid_probe_set_utf8label for label set
Signed-off-by: Ansuel Smith <ansuelsmth@gmail.com>
| -rw-r--r-- | libblkid-tiny/f2fs.c | 2 | ||||
| -rw-r--r-- | libblkid-tiny/hfs.c | 2 | ||||
| -rw-r--r-- | libblkid-tiny/ntfs.c | 6 |
3 files changed, 1 insertions, 9 deletions
diff --git a/libblkid-tiny/f2fs.c b/libblkid-tiny/f2fs.c index 6efce61..2bf0f5e 100644 --- a/libblkid-tiny/f2fs.c +++ b/libblkid-tiny/f2fs.c @@ -71,12 +71,10 @@ static int probe_f2fs(blkid_probe pr, const struct blkid_idmag *mag) if (major == 1 && minor == 0) return 0; -#if 0 if (*((unsigned char *) sb->volume_name)) blkid_probe_set_utf8label(pr, (unsigned char *) sb->volume_name, sizeof(sb->volume_name), BLKID_ENC_UTF16LE); -#endif blkid_probe_set_uuid(pr, sb->uuid); blkid_probe_sprintf_version(pr, "%u.%u", major, minor); diff --git a/libblkid-tiny/hfs.c b/libblkid-tiny/hfs.c index 8676d36..04f25a1 100644 --- a/libblkid-tiny/hfs.c +++ b/libblkid-tiny/hfs.c @@ -294,11 +294,9 @@ static int probe_hfsplus(blkid_probe pr, const struct blkid_idmag *mag) if (be32_to_cpu(key->parent_id) != HFSPLUS_POR_CNID) return 0; -#if 0 blkid_probe_set_utf8label(pr, key->unicode, be16_to_cpu(key->unicode_len) * 2, BLKID_ENC_UTF16BE); -#endif return 0; } diff --git a/libblkid-tiny/ntfs.c b/libblkid-tiny/ntfs.c index 93c1d88..3a9d5cb 100644 --- a/libblkid-tiny/ntfs.c +++ b/libblkid-tiny/ntfs.c @@ -82,13 +82,11 @@ enum { static int probe_ntfs(blkid_probe pr, const struct blkid_idmag *mag) { struct ntfs_super_block *ns; -#if 0 struct master_file_table_record *mft; -#endif uint32_t sectors_per_cluster, mft_record_size; uint16_t sector_size; - uint64_t nr_clusters, off; //, attr_off; + uint64_t nr_clusters, off, attr_off; unsigned char *buf_mft; ns = blkid_probe_get_sb(pr, mag, struct ntfs_super_block); @@ -174,7 +172,6 @@ static int probe_ntfs(blkid_probe pr, const struct blkid_idmag *mag) if (memcmp(buf_mft, "FILE", 4)) return 1; -#if 0 mft = (struct master_file_table_record *) buf_mft; attr_off = le16_to_cpu(mft->attrs_offset); @@ -204,7 +201,6 @@ static int probe_ntfs(blkid_probe pr, const struct blkid_idmag *mag) attr_off += attr_len; } -#endif blkid_probe_sprintf_uuid(pr, (unsigned char *) &ns->volume_serial, |