usb_id: fix switch statement for video type

[elogind.git] / extras / volume_id / lib / netware.c

diff --git a/extras/volume_id/lib/netware.c b/extras/volume_id/lib/netware.c
index 49afe21fc4b1b02fd9720e829d499bfca8c83185..58749e5f0571cffa57a8661766bbe764965a1efe 100644 (file)
--- a/extras/volume_id/lib/netware.c
+++ b/extras/volume_id/lib/netware.c
@@ -3,19 +3,24 @@
  *
  * Copyright (C) 2006 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
- *     Free Software Foundation version 2 of the License.
+ * 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 Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef _GNU_SOURCE
 #define _GNU_SOURCE 1
 #endif
 
-#ifdef HAVE_CONFIG_H
-#  include <config.h>
-#endif
-
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
@@ -24,7 +29,7 @@
 #include <ctype.h>
 
 #include "libvolume_id.h"
-#include "util.h"
+#include "libvolume_id-private.h"
 
 #define NW_SUPERBLOCK_OFFSET                   0x1000
 
@@ -36,13 +41,53 @@ struct netware_super_block {
        uint16_t        SBH_VersionMediaMinor;
        uint32_t        SBH_ItemsMoved;
        uint8_t         SBH_InternalID[16];
+       uint32_t        SBH_PackedSize;
+       uint32_t        SBH_Checksum;
+       uint32_t        supersyncid;
+       int64_t         superlocation[4];
+       uint32_t        physSizeUsed;
+       uint32_t        sizeUsed;
+       uint32_t        superTimeStamp;
+       uint32_t        reserved0[1];
+       int64_t         SBH_LoggedPoolDataBlk;
+       int64_t         SBH_PoolDataBlk;
+       uint8_t         SBH_OldInternalID[16];
+       uint32_t        SBH_PoolToLVStartUTC;
+       uint32_t        SBH_PoolToLVEndUTC;
+       uint16_t        SBH_VersionMediaMajorCreate;
+       uint16_t        SBH_VersionMediaMinorCreate;
+       uint32_t        SBH_BlocksMoved;
+       uint32_t        SBH_TempBTSpBlk;
+       uint32_t        SBH_TempFTSpBlk;
+       uint32_t        SBH_TempFTSpBlk1;
+       uint32_t        SBH_TempFTSpBlk2;
+       uint32_t        nssMagicNumber;
+       uint32_t        poolClassID;
+       uint32_t        poolID;
+       uint32_t        createTime;
+       int64_t         SBH_LoggedVolumeDataBlk;
+       int64_t         SBH_VolumeDataBlk;
+       int64_t         SBH_SystemBeastBlkNum;
+       uint64_t        totalblocks;
+       uint16_t        SBH_Name[64];
+       uint8_t         SBH_VolumeID[16];
+       uint8_t         SBH_PoolID[16];
+       uint8_t         SBH_PoolInternalID[16];
+       uint64_t        SBH_Lsn;
+       uint32_t        SBH_SS_Enabled;
+       uint32_t        SBH_SS_CreateTime;
+       uint8_t         SBH_SS_OriginalPoolID[16];
+       uint8_t         SBH_SS_OriginalVolumeID[16];
+       uint8_t         SBH_SS_Guid[16];
+       uint16_t        SBH_SS_OriginalName[64];
+       uint32_t        reserved2[64-(2+46)];
 } PACKED;
 
-int volume_id_probe_netware(struct volume_id *id, uint64_t off)
+int volume_id_probe_netware(struct volume_id *id, uint64_t off, uint64_t size)
 {
        struct netware_super_block *nw;
 
-       info("probing at offset 0x%llx", (unsigned long long) off);
+       info("probing at offset 0x%" PRIx64 "\n", off);
 
        nw = (struct netware_super_block *) volume_id_get_buffer(id, off + NW_SUPERBLOCK_OFFSET, 0x200);
        if (nw == NULL)
@@ -51,7 +96,7 @@ int volume_id_probe_netware(struct volume_id *id, uint64_t off)
        if (memcmp(nw->SBH_Signature, "SPB5", 4) != 0)
                return -1;
 
-       volume_id_set_uuid(id, nw->SBH_InternalID, UUID_DCE);
+       volume_id_set_uuid(id, nw->SBH_PoolID, 0, UUID_DCE);
 
        snprintf(id->type_version, sizeof(id->type_version)-1, "%u.%02u",
                 le16_to_cpu(nw->SBH_VersionMediaMajor), le16_to_cpu(nw->SBH_VersionMediaMinor));