X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=extras%2Fcdrom_id%2Fcdrom_id.c;h=6ea763b415b3fdfca21d0663b162141beafa566c;hp=2306d9ad716ae608eee4d3e651d15f40056bf6b4;hb=1230d021bd75de9b1503bbaa807d6a59789963db;hpb=e91ac78ffc62a7a4f10fc66ed492e5b67a11448a

diff --git a/extras/cdrom_id/cdrom_id.c b/extras/cdrom_id/cdrom_id.c
index 2306d9ad7..6ea763b41 100644
--- a/extras/cdrom_id/cdrom_id.c
+++ b/extras/cdrom_id/cdrom_id.c
@@ -37,7 +37,8 @@
 #include <sys/ioctl.h>
 #include <linux/cdrom.h>
 
-#include "../../udev/udev.h"
+#include "libudev.h"
+#include "libudev-private.h"
 
 static int debug;
 
@@ -172,27 +173,27 @@ static int scsi_cmd_run(struct udev *udev, struct scsi_cmd *cmd, int fd, unsigne
 
 static int cd_capability_compat(struct udev *udev, int fd)
 {
-	int capabilty;
+	int capability;
 
-	capabilty = ioctl(fd, CDROM_GET_CAPABILITY, NULL);
-	if (capabilty < 0) {
+	capability = ioctl(fd, CDROM_GET_CAPABILITY, NULL);
+	if (capability < 0) {
 		info(udev, "CDROM_GET_CAPABILITY failed\n");
 		return -1;
 	}
 
-	if (capabilty & CDC_CD_R)
+	if (capability & CDC_CD_R)
 		cd_cd_r = 1;
-	if (capabilty & CDC_CD_RW)
+	if (capability & CDC_CD_RW)
 		cd_cd_rw = 1;
-	if (capabilty & CDC_DVD)
+	if (capability & CDC_DVD)
 		cd_dvd_rom = 1;
-	if (capabilty & CDC_DVD_R)
+	if (capability & CDC_DVD_R)
 		cd_dvd_r = 1;
-	if (capabilty & CDC_DVD_RAM)
+	if (capability & CDC_DVD_RAM)
 		cd_dvd_ram = 1;
-	if (capabilty & CDC_MRW)
+	if (capability & CDC_MRW)
 		cd_mrw = 1;
-	if (capabilty & CDC_MRW_W)
+	if (capability & CDC_MRW_W)
 		cd_mrw_w = 1;
 	return 0;
 }
@@ -528,7 +529,7 @@ int main(int argc, char *argv[])
 	if (udev == NULL)
 		goto exit;
 
-	logging_init("cdrom_id");
+	udev_log_init("cdrom_id");
 	udev_set_log_fn(udev, log_fn);
 
 	while (1) {
@@ -706,7 +707,7 @@ exit:
 	if (fd >= 0)
 		close(fd);
 	udev_unref(udev);
-	logging_close();
+	udev_log_close();
 	return rc;
 }