vol_id: clarify error message

[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 6e1e95f86cf3304fdd591c33fc6a7d195905840e..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
 
@@ -78,11 +83,11 @@ struct netware_super_block {
        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)
@@ -91,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_PoolID, 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));