#include <unistd.h>
#include <string.h>
#include <errno.h>
-#include <errno.h>
#include <ctype.h>
#include <fcntl.h>
#include <sys/stat.h>
if (id == NULL)
return -EINVAL;
+ info("probing at offset 0x%llx, size 0x%llx",
+ (unsigned long long) off, (unsigned long long) size);
+
/* probe for raid first, because fs probes may be successful on raid members */
if (size) {
if (volume_id_probe_linux_raid(id, off, size) == 0)
if (id == NULL)
return -EINVAL;
+ info("probing at offset 0x%llx, size 0x%llx",
+ (unsigned long long) off, (unsigned long long) size);
+
if (volume_id_probe_luks(id, off) == 0)
goto found;
static void vid_log(int priority, const char *file, int line, const char *format, ...)
{
#ifdef USE_LOG
+ char log_str[1024];
va_list args;
va_start(args, format);
- log_message(priority, format, args);
+ vsnprintf(log_str, sizeof(log_str), format, args);
+ log_str[sizeof(log_str)-1] = '\0';
+ log_message(priority, "%s:%i %s", file, line, log_str);
va_end(args);
#endif
return;
* udev_rules.c
*
* Copyright (C) 2003 Greg Kroah-Hartman <greg@kroah.com>
- * Copyright (C) 2003-2005 Kay Sievers <kay.sievers@vrfy.org>
+ * Copyright (C) 2003-2006 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 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, write to the Free Software Foundation, Inc.,
* 675 Mass Ave, Cambridge, MA 02139, USA.
goto found;
}
}
- }
- else if (head[0] == '%') {
+ } else if (head[0] == '%') {
/* substitute format char */
if (head[1] == '\0')
break;