X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=extras%2Fvolume_id%2Fvol_id.c;h=dcf56d87e9fb4562c1fe3f54de8075232637795c;hp=b086b3710ca65c1b19c589880a5bfd5d84c3073c;hb=674e00f67c5dc4bd6e7c5aff21c11b36eb81cd75;hpb=b5e694267142042228a6cac99ecad6c4b4ef8759

diff --git a/extras/volume_id/vol_id.c b/extras/volume_id/vol_id.c
index b086b3710..dcf56d87e 100644
--- 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
@@ -31,7 +31,7 @@
 #include <sys/ioctl.h>
 
 #include "../../udev.h"
-#include "libvolume_id/libvolume_id.h"
+#include "lib/libvolume_id.h"
 
 #define BLKGETSIZE64 _IOR(0x12,114,size_t)
 
@@ -63,10 +63,13 @@ void log_message(int priority, const char *format, ...)
 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;
@@ -130,7 +133,7 @@ int main(int argc, char *argv[])
 	logging_init("vol_id");
 
 	/* hook in our debug into libvolume_id */
-	volume_id_log = vid_log;
+	volume_id_log_fn = vid_log;
 
 	for (i = 1 ; i < argc; i++) {
 		char *arg = argv[i];