chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
volume_id: define exported symbols
[elogind.git]
/
extras
/
volume_id
/
vol_id.c
diff --git
a/extras/volume_id/vol_id.c
b/extras/volume_id/vol_id.c
index 6961969c13f63e466638398d537058136cb21108..2274550c197305e9d15d573a87ba65b4f7426bf2 100644
(file)
--- a/
extras/volume_id/vol_id.c
+++ b/
extras/volume_id/vol_id.c
@@
-1,7
+1,7
@@
/*
/*
- * vol_id -
udev callout to
read filesystem label and uuid
+ * vol_id - read filesystem label and uuid
*
*
- * Copyright (C) 2005 Kay Sievers <kay.sievers@vrfy.org>
+ * Copyright (C) 2005
-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
*
* 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
@@
-31,7
+31,7
@@
#include <sys/ioctl.h>
#include "../../udev.h"
#include <sys/ioctl.h>
#include "../../udev.h"
-#include "lib
volume_id/
volume_id.h"
+#include "lib
/lib
volume_id.h"
#define BLKGETSIZE64 _IOR(0x12,114,size_t)
#define BLKGETSIZE64 _IOR(0x12,114,size_t)
@@
-60,6
+60,18
@@
void log_message(int priority, const char *format, ...)
}
#endif
}
#endif
+static void vid_log(int priority, const char *file, int line, const char *format, ...)
+{
+#ifdef USE_LOG
+ va_list args;
+
+ va_start(args, format);
+ log_message(priority, format, args);
+ va_end(args);
+#endif
+ return;
+}
+
static void set_str(char *to, const char *from, size_t count)
{
size_t i, j, len;
static void set_str(char *to, const char *from, size_t count)
{
size_t i, j, len;
@@
-117,6
+129,9
@@
int main(int argc, char *argv[])
logging_init("vol_id");
logging_init("vol_id");
+ /* hook in our debug into libvolume_id */
+ volume_id_log_fn = vid_log;
+
for (i = 1 ; i < argc; i++) {
char *arg = argv[i];
for (i = 1 ; i < argc; i++) {
char *arg = argv[i];