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: remove unnecessary global variable
[elogind.git]
/
extras
/
volume_id
/
lib
/
ddf_raid.c
diff --git
a/extras/volume_id/lib/ddf_raid.c
b/extras/volume_id/lib/ddf_raid.c
index 60837a48b17e71ac5b1d78aa51d7783f37913b06..2e83c0809852d2129ce98258384a0b5f2a207094 100644
(file)
--- a/
extras/volume_id/lib/ddf_raid.c
+++ b/
extras/volume_id/lib/ddf_raid.c
@@
-33,17
+33,18
@@
#define DDF_GUID_LENGTH 24
#define DDF_REV_LENGTH 8
#define DDF_GUID_LENGTH 24
#define DDF_REV_LENGTH 8
-st
atic st
ruct ddf_header {
+struct ddf_header {
uint32_t signature;
uint32_t crc;
uint8_t guid[DDF_GUID_LENGTH];
uint8_t ddf_rev[DDF_REV_LENGTH];
uint32_t signature;
uint32_t crc;
uint8_t guid[DDF_GUID_LENGTH];
uint8_t ddf_rev[DDF_REV_LENGTH];
-} PACKED
*ddf
;
+} PACKED;
int volume_id_probe_ddf_raid(struct volume_id *id, uint64_t off, uint64_t size)
{
uint64_t ddf_off = ((size / 0x200)-1) * 0x200;
const uint8_t *buf;
int volume_id_probe_ddf_raid(struct volume_id *id, uint64_t off, uint64_t size)
{
uint64_t ddf_off = ((size / 0x200)-1) * 0x200;
const uint8_t *buf;
+ struct ddf_header *ddf;
info("probing at offset 0x%llx, size 0x%llx\n",
(unsigned long long) off, (unsigned long long) size);
info("probing at offset 0x%llx, size 0x%llx\n",
(unsigned long long) off, (unsigned long long) size);