chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
libudev: allow to store negative values in the udev database
[elogind.git]
/
extras
/
cdrom_id
/
cdrom_id.c
diff --git
a/extras/cdrom_id/cdrom_id.c
b/extras/cdrom_id/cdrom_id.c
index 2306d9ad716ae608eee4d3e651d15f40056bf6b4..6ea763b415b3fdfca21d0663b162141beafa566c 100644
(file)
--- 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 <sys/ioctl.h>
#include <linux/cdrom.h>
-#include "../../udev/udev.h"
+#include "libudev.h"
+#include "libudev-private.h"
static int debug;
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)
{
static int cd_capability_compat(struct udev *udev, int fd)
{
- int capabilty;
+ int capabil
i
ty;
- capabilty = ioctl(fd, CDROM_GET_CAPABILITY, NULL);
- if (capabilty < 0) {
+ capabil
i
ty = ioctl(fd, CDROM_GET_CAPABILITY, NULL);
+ if (capabil
i
ty < 0) {
info(udev, "CDROM_GET_CAPABILITY failed\n");
return -1;
}
info(udev, "CDROM_GET_CAPABILITY failed\n");
return -1;
}
- if (capabilty & CDC_CD_R)
+ if (capabil
i
ty & CDC_CD_R)
cd_cd_r = 1;
cd_cd_r = 1;
- if (capabilty & CDC_CD_RW)
+ if (capabil
i
ty & CDC_CD_RW)
cd_cd_rw = 1;
cd_cd_rw = 1;
- if (capabilty & CDC_DVD)
+ if (capabil
i
ty & CDC_DVD)
cd_dvd_rom = 1;
cd_dvd_rom = 1;
- if (capabilty & CDC_DVD_R)
+ if (capabil
i
ty & CDC_DVD_R)
cd_dvd_r = 1;
cd_dvd_r = 1;
- if (capabilty & CDC_DVD_RAM)
+ if (capabil
i
ty & CDC_DVD_RAM)
cd_dvd_ram = 1;
cd_dvd_ram = 1;
- if (capabilty & CDC_MRW)
+ if (capabil
i
ty & CDC_MRW)
cd_mrw = 1;
cd_mrw = 1;
- if (capabilty & CDC_MRW_W)
+ if (capabil
i
ty & CDC_MRW_W)
cd_mrw_w = 1;
return 0;
}
cd_mrw_w = 1;
return 0;
}
@@
-528,7
+529,7
@@
int main(int argc, char *argv[])
if (udev == NULL)
goto exit;
if (udev == NULL)
goto exit;
-
loggin
g_init("cdrom_id");
+
udev_lo
g_init("cdrom_id");
udev_set_log_fn(udev, log_fn);
while (1) {
udev_set_log_fn(udev, log_fn);
while (1) {
@@
-706,7
+707,7
@@
exit:
if (fd >= 0)
close(fd);
udev_unref(udev);
if (fd >= 0)
close(fd);
udev_unref(udev);
-
loggin
g_close();
+
udev_lo
g_close();
return rc;
}
return rc;
}