summaryrefslogtreecommitdiff
path: root/extras/volume_id
diff options
context:
space:
mode:
authorKay Sievers <kay.sievers@suse.de>2006-01-09 21:18:00 +0100
committerKay Sievers <kay.sievers@suse.de>2006-01-09 21:18:00 +0100
commit1aa1e24848903d11780db1ade355be73ad61a937 (patch)
treefb15c937a1a6e9f0197c905cc7af6ee5df8b108c /extras/volume_id
parent47fbf3c58260e3fed1078061f8d45e01b0e120f0 (diff)
replace libsysfs
We never used any of the libsysfs convenience features. Here we replace it completely with 300 lines of code, which are much simpler and a bit faster cause udev(d) does not open any syfs file for a simple event which does not need any parent device information. Signed-off-by: Kay Sievers <kay.sievers@suse.de>
Diffstat (limited to 'extras/volume_id')
-rw-r--r--extras/volume_id/Makefile2
-rw-r--r--extras/volume_id/vol_id.c3
2 files changed, 2 insertions, 3 deletions
diff --git a/extras/volume_id/Makefile b/extras/volume_id/Makefile
index 6201044941..edb5d3ac68 100644
--- a/extras/volume_id/Makefile
+++ b/extras/volume_id/Makefile
@@ -35,7 +35,7 @@ $(LIBVOLUME_ID):
$(MAKE) -C libvolume_id
$(PROG): %: $(HEADERS) %.o $(LIBVOLUME_ID)
- $(QUIET) $(LD) $(LDFLAGS) $@.o $(LIBVOLUME_ID) -o $@ $(LIBUDEV) $(LIBSYSFS) $(LIB_OBJS)
+ $(QUIET) $(LD) $(LDFLAGS) $@.o $(LIBVOLUME_ID) -o $@ $(LIBUDEV) $(LIB_OBJS)
ifneq ($(strip $(STRIPCMD)),)
$(QUIET) $(STRIPCMD) $@
endif
diff --git a/extras/volume_id/vol_id.c b/extras/volume_id/vol_id.c
index 6f99c52728..a291eda51d 100644
--- a/extras/volume_id/vol_id.c
+++ b/extras/volume_id/vol_id.c
@@ -29,8 +29,7 @@
#include <ctype.h>
#include <sys/ioctl.h>
-#include "../../udev_utils.h"
-#include "../../logging.h"
+#include "../../udev.h"
#include "libvolume_id/volume_id.h"
#define BLKGETSIZE64 _IOR(0x12,114,size_t)