man: fix typos

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

diff --git a/extras/volume_id/lib/lvm.c b/extras/volume_id/lib/lvm.c
index 5dc360f65d8ce5f15cac1d4bc04b2e89c19b2e0e..a3f409a0eeff45b659431f6282b29d424028a01a 100644 (file)
--- a/extras/volume_id/lib/lvm.c
+++ b/extras/volume_id/lib/lvm.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>
@@ -25,7 +30,6 @@
 
 #include "libvolume_id.h"
 #include "libvolume_id-private.h"
-#include "util.h"
 
 struct lvm1_super_block {
        uint8_t id[2];
@@ -52,7 +56,7 @@ int volume_id_probe_lvm1(struct volume_id *id, uint64_t off, uint64_t size)
        const uint8_t *buf;
        struct lvm1_super_block *lvm;
 
-       info("probing at offset 0x%llx\n", (unsigned long long) off);
+       info("probing at offset 0x%" PRIx64 "\n", off);
 
        buf = volume_id_get_buffer(id, off + LVM1_SB_OFF, 0x800);
        if (buf == NULL)
@@ -79,7 +83,7 @@ int volume_id_probe_lvm2(struct volume_id *id, uint64_t off, uint64_t size)
        struct lvm2_super_block *lvm;
        struct lvm2_pv_header *pvhdr;
 
-       dbg("probing at offset 0x%llx\n", (unsigned long long) off);
+       dbg("probing at offset 0x%" PRIx64 "\n", off);
 
        buf = volume_id_get_buffer(id, off, LVM2LABEL_SCAN_SECTORS * 0x200);
        if (buf == NULL)