update file headers

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

diff --git a/extras/volume_id/lib/ext.c b/extras/volume_id/lib/ext.c
index ac21f12501e0b443d82b08d2ffa47a2fa4965150..97299d60d8b1b3815bcdb41e7e351468d03c1296 100644 (file)
--- a/extras/volume_id/lib/ext.c
+++ b/extras/volume_id/lib/ext.c
@@ -4,21 +4,24 @@
  * Copyright (C) 2004-2008 Kay Sievers <kay.sievers@vrfy.org>
  * Copyright (C) 2008 Theodore Ts'o <tytso@mit.edu>
  *
- * The probe logic is based on libblkid from e2fsutils.
+ * 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 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 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>
@@ -27,7 +30,7 @@
 #include <ctype.h>
 
 #include "libvolume_id.h"
-#include "util.h"
+#include "libvolume_id-private.h"
 
 struct ext2_super_block {
        uint32_t        s_inodes_count;
@@ -132,7 +135,7 @@ int volume_id_probe_ext(struct volume_id *id, uint64_t off, uint64_t size)
        uint32_t feature_incompat;
        uint32_t flags;
 
-       info("probing at offset 0x%llx", (unsigned long long) off);
+       info("probing at offset 0x%llx\n", (unsigned long long) off);
 
        es = (struct ext2_super_block *) volume_id_get_buffer(id, off + EXT_SUPERBLOCK_OFFSET, 0x200);
        if (es == NULL)
@@ -142,9 +145,9 @@ int volume_id_probe_ext(struct volume_id *id, uint64_t off, uint64_t size)
                return -1;
 
        bsize = 0x400 << le32_to_cpu(es->s_log_block_size);
-       dbg("ext blocksize 0x%zx", bsize);
+       dbg("ext blocksize 0x%zx\n", bsize);
        if (bsize < EXT3_MIN_BLOCK_SIZE || bsize > EXT3_MAX_BLOCK_SIZE) {
-               dbg("invalid ext blocksize");
+               dbg("invalid ext blocksize\n");
                return -1;
        }