*
* Copyright (C) 2005-2007 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>
#include "libvolume_id.h"
#include "libvolume_id-private.h"
-#include "util.h"
#define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0]))
{ volume_id_probe_squashfs, { "squashfs", } },
{ volume_id_probe_netware, { "netware", } },
{ volume_id_probe_oracleasm, { "oracleasm", } },
+ { volume_id_probe_btrfs, { "btrfs", } },
};
/* the user can overwrite this log function */
if (!device_is_readable(id, off))
return -1;
- info("probing at offset 0x%llx, size 0x%llx\n",
- (unsigned long long) off, (unsigned long long) size);
+ info("probing at offset 0x%" PRIx64 ", size 0x%" PRIx64 "\n", off, size);
for (i = 0; i < ARRAY_SIZE(prober_raid); i++)
if (prober_raid[i].prober(id, off, size) == 0)
if (!device_is_readable(id, off))
return -1;
- info("probing at offset 0x%llx, size 0x%llx\n",
- (unsigned long long) off, (unsigned long long) size);
+ info("probing at offset 0x%" PRIx64 ", size 0x%" PRIx64 "\n", off, size);
for (i = 0; i < ARRAY_SIZE(prober_filesystem); i++)
if (prober_filesystem[i].prober(id, off, size) == 0)
{
struct volume_id *id;
- id = malloc(sizeof(struct volume_id));
+ id = calloc(1, sizeof(struct volume_id));
if (id == NULL)
return NULL;
- memset(id, 0x00, sizeof(struct volume_id));
id->fd = fd;