chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
volume_id: fix endianess bug in linux_raid detection
[elogind.git]
/
extras
/
volume_id
/
lib
/
ntfs.c
diff --git
a/extras/volume_id/lib/ntfs.c
b/extras/volume_id/lib/ntfs.c
index 23c64fc3071ee251f5df9bd1c9793f83c175a1f6..f7675a3434396b267232604935e0aba65a44ba8a 100644
(file)
--- a/
extras/volume_id/lib/ntfs.c
+++ b/
extras/volume_id/lib/ntfs.c
@@
-26,7
+26,7
@@
#include "libvolume_id.h"
#include "util.h"
#include "libvolume_id.h"
#include "util.h"
-struct ntfs_super_block {
+st
atic st
ruct ntfs_super_block {
uint8_t jump[3];
uint8_t oem_id[8];
uint16_t bytes_per_sector;
uint8_t jump[3];
uint8_t oem_id[8];
uint16_t bytes_per_sector;
@@
-53,7
+53,7
@@
struct ntfs_super_block {
uint16_t checksum;
} PACKED *ns;
uint16_t checksum;
} PACKED *ns;
-struct master_file_table_record {
+st
atic st
ruct master_file_table_record {
uint8_t magic[4];
uint16_t usa_ofs;
uint16_t usa_count;
uint8_t magic[4];
uint16_t usa_ofs;
uint16_t usa_count;
@@
-66,7
+66,7
@@
struct master_file_table_record {
uint32_t bytes_allocated;
} PACKED *mftr;
uint32_t bytes_allocated;
} PACKED *mftr;
-struct file_attribute {
+st
atic st
ruct file_attribute {
uint32_t type;
uint32_t len;
uint8_t non_resident;
uint32_t type;
uint32_t len;
uint8_t non_resident;
@@
-78,7
+78,7
@@
struct file_attribute {
uint16_t value_offset;
} PACKED *attr;
uint16_t value_offset;
} PACKED *attr;
-struct volume_info {
+st
atic st
ruct volume_info {
uint64_t reserved;
uint8_t major_ver;
uint8_t minor_ver;
uint64_t reserved;
uint8_t major_ver;
uint8_t minor_ver;
@@
-90,7
+90,7
@@
struct volume_info {
#define MFT_RECORD_ATTR_OBJECT_ID 0x40
#define MFT_RECORD_ATTR_END 0xffffffffu
#define MFT_RECORD_ATTR_OBJECT_ID 0x40
#define MFT_RECORD_ATTR_END 0xffffffffu
-int volume_id_probe_ntfs(struct volume_id *id, uint64_t off)
+int volume_id_probe_ntfs(struct volume_id *id, uint64_t off
, uint64_t size
)
{
unsigned int sector_size;
unsigned int cluster_size;
{
unsigned int sector_size;
unsigned int cluster_size;
@@
-105,7
+105,7
@@
int volume_id_probe_ntfs(struct volume_id *id, uint64_t off)
const uint8_t *buf;
const uint8_t *val;
const uint8_t *buf;
const uint8_t *val;
-
dbg
("probing at offset 0x%llx", (unsigned long long) off);
+
info
("probing at offset 0x%llx", (unsigned long long) off);
ns = (struct ntfs_super_block *) volume_id_get_buffer(id, off, 0x200);
if (ns == NULL)
ns = (struct ntfs_super_block *) volume_id_get_buffer(id, off, 0x200);
if (ns == NULL)