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 9ac5c91e5a4017f3827a8fb3acd8adb9bcf28565..2e83c0809852d2129ce98258384a0b5f2a207094 100644 (file)
--- a/extras/volume_id/lib/ddf_raid.c
+++ b/extras/volume_id/lib/ddf_raid.c
@@ -1,7 +1,7 @@
 /*
  * volume_id - reads filesystem label and uuid
  *
- * Copyright (C) 2004 Kay Sievers <kay.sievers@vrfy.org>
+ * Copyright (C) 2007 Kay Sievers <kay.sievers@vrfy.org>
  *
  *     This program is free software; you can redistribute it and/or modify it
  *     under the terms of the GNU General Public License as published by the
@@ -27,23 +27,26 @@
 #include "libvolume_id.h"
 #include "util.h"
 
+/* http://www.snia.org/standards/home */
+
 #define DDF_HEADER                     0xDE11DE11
 #define DDF_GUID_LENGTH                        24
 #define DDF_REV_LENGTH                 8
 
-static struct ddf_header {
+struct ddf_header {
        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;
+       struct ddf_header *ddf;
 
-       info("probing at offset 0x%llx, size 0x%llx",
+       info("probing at offset 0x%llx, size 0x%llx\n",
            (unsigned long long) off, (unsigned long long) size);
        if (size < 0x10000)
                return -1;