get rid of udev_sysdeps.c

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

diff --git a/extras/volume_id/lib/jfs.c b/extras/volume_id/lib/jfs.c
index b230fb258c49ad933764853b1a1ff221d45ad566..d496cf8781ada7d348345deb629b69138b384ad2 100644 (file)
--- a/extras/volume_id/lib/jfs.c
+++ b/extras/volume_id/lib/jfs.c
@@ -3,19 +3,24 @@
  *
  * Copyright (C) 2004 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"
 
 struct jfs_super_block {
        uint8_t         magic[4];
@@ -41,11 +46,11 @@ struct jfs_super_block {
 
 #define JFS_SUPERBLOCK_OFFSET                  0x8000
 
-int volume_id_probe_jfs(struct volume_id *id, uint64_t off)
+int volume_id_probe_jfs(struct volume_id *id, uint64_t off, uint64_t size)
 {
        struct jfs_super_block *js;
 
-       dbg("probing at offset 0x%llx", (unsigned long long) off);
+       info("probing at offset 0x%llx\n", (unsigned long long) off);
 
        js = (struct jfs_super_block *) volume_id_get_buffer(id, off + JFS_SUPERBLOCK_OFFSET, 0x200);
        if (js == NULL)
@@ -56,7 +61,7 @@ int volume_id_probe_jfs(struct volume_id *id, uint64_t off)
 
        volume_id_set_label_raw(id, js->label, 16);
        volume_id_set_label_string(id, js->label, 16);
-       volume_id_set_uuid(id, js->uuid, UUID_DCE);
+       volume_id_set_uuid(id, js->uuid, 0, UUID_DCE);
 
        volume_id_set_usage(id, VOLUME_ID_FILESYSTEM);
        id->type = "jfs";