chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
scsi_id: we don't use DEVPATH env var anymore, update man page
[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 627ae0dee4f7a4897a93abbb3beb41912e4b42f2..7be0789f35bc2bf92013a2571fefb22c07eb7430 100644
(file)
--- a/
extras/cdrom_id/cdrom_id.c
+++ b/
extras/cdrom_id/cdrom_id.c
@@
-39,10
+39,6
@@
#include "../../udev/udev.h"
#include "../../udev/udev.h"
-#ifndef ARRAY_SIZE
-#define ARRAY_SIZE(a) (sizeof(a) / sizeof(a[0]))
-#endif
-
static int debug;
static void log_fn(struct udev *udev, int priority,
static int debug;
static void log_fn(struct udev *udev, int priority,
@@
-503,9
+499,9
@@
int main(int argc, char *argv[])
{
struct udev *udev;
static const struct option options[] = {
{
struct udev *udev;
static const struct option options[] = {
- { "export",
0
, NULL, 'x' },
- { "debug",
0
, NULL, 'd' },
- { "help",
0
, NULL, 'h' },
+ { "export",
no_argument
, NULL, 'x' },
+ { "debug",
no_argument
, NULL, 'd' },
+ { "help",
no_argument
, NULL, 'h' },
{}
};
const char *node = NULL;
{}
};
const char *node = NULL;