X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=extras%2Fvolume_id%2Flib%2Fxfs.c;h=35ba68ed3e917d70258759e180748182ebfb531e;hp=5c1a82e1d37afe6c515ca88dfb2c01267dc79d51;hb=2f664629829d8ed52a8bc55b31faf8ec8b65bd3c;hpb=cdf18948639e56d2e3c71606c72e2f2d239c100b

diff --git a/extras/volume_id/lib/xfs.c b/extras/volume_id/lib/xfs.c
index 5c1a82e1d..35ba68ed3 100644
--- a/extras/volume_id/lib/xfs.c
+++ b/extras/volume_id/lib/xfs.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,17 +29,17 @@
 #include <ctype.h>
 
 #include "libvolume_id.h"
-#include "util.h"
+#include "libvolume_id-private.h"
 
 struct xfs_super_block {
-	uint8_t	magic[4];
+	uint8_t		magic[4];
 	uint32_t	blocksize;
 	uint64_t	dblocks;
 	uint64_t	rblocks;
 	uint32_t	dummy1[2];
-	uint8_t	uuid[16];
+	uint8_t		uuid[16];
 	uint32_t	dummy2[15];
-	uint8_t	fname[12];
+	uint8_t		fname[12];
 	uint32_t	dummy3[2];
 	uint64_t	icount;
 	uint64_t	ifree;
@@ -45,7 +50,7 @@ int volume_id_probe_xfs(struct volume_id *id, uint64_t off, uint64_t size)
 {
 	struct xfs_super_block *xs;
 
-	info("probing at offset 0x%llx", (unsigned long long) off);
+	info("probing at offset 0x%" PRIx64 "\n", off);
 
 	xs = (struct xfs_super_block *) volume_id_get_buffer(id, off, 0x200);
 	if (xs == NULL)
@@ -56,7 +61,7 @@ int volume_id_probe_xfs(struct volume_id *id, uint64_t off, uint64_t size)
 
 	volume_id_set_label_raw(id, xs->fname, 12);
 	volume_id_set_label_string(id, xs->fname, 12);
-	volume_id_set_uuid(id, xs->uuid, UUID_DCE);
+	volume_id_set_uuid(id, xs->uuid, 0, UUID_DCE);
 
 	volume_id_set_usage(id, VOLUME_ID_FILESYSTEM);
 	id->type = "xfs";