diff options
Diffstat (limited to 'extras')
| -rw-r--r-- | extras/ata_id/ata_id.c | 4 | ||||
| -rw-r--r-- | extras/cdrom_id/cdrom_id.c | 6 | ||||
| -rw-r--r-- | extras/collect/collect.c | 8 | ||||
| -rw-r--r-- | extras/fstab_import/fstab_import.c | 6 | ||||
| -rw-r--r-- | extras/scsi_id/scsi_id.c | 22 | ||||
| -rw-r--r-- | extras/usb_id/usb_id.c | 8 | ||||
| -rw-r--r-- | extras/volume_id/vol_id.c | 20 |
7 files changed, 37 insertions, 37 deletions
diff --git a/extras/ata_id/ata_id.c b/extras/ata_id/ata_id.c index 927dbfabd7..a4f73b8dfd 100644 --- a/extras/ata_id/ata_id.c +++ b/extras/ata_id/ata_id.c @@ -88,8 +88,8 @@ int main(int argc, char *argv[]) int fd; int rc = 0; static const struct option options[] = { - { "export", 0, NULL, 'x' }, - { "help", 0, NULL, 'h' }, + { "export", no_argument, NULL, 'x' }, + { "help", no_argument, NULL, 'h' }, {} }; diff --git a/extras/cdrom_id/cdrom_id.c b/extras/cdrom_id/cdrom_id.c index 627ae0dee4..381aa70bed 100644 --- a/extras/cdrom_id/cdrom_id.c +++ b/extras/cdrom_id/cdrom_id.c @@ -503,9 +503,9 @@ int main(int argc, char *argv[]) { 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; diff --git a/extras/collect/collect.c b/extras/collect/collect.c index 14184a5e05..7ebe865b62 100644 --- a/extras/collect/collect.c +++ b/extras/collect/collect.c @@ -321,10 +321,10 @@ static void everybody(void) int main(int argc, char **argv) { static const struct option options[] = { - { "add", 0, NULL, 'a' }, - { "remove", 0, NULL, 'r' }, - { "debug", 0, NULL, 'd' }, - { "help", 0, NULL, 'h' }, + { "add", no_argument, NULL, 'a' }, + { "remove", no_argument, NULL, 'r' }, + { "debug", no_argument, NULL, 'd' }, + { "help", no_argument, NULL, 'h' }, {} }; int argi; diff --git a/extras/fstab_import/fstab_import.c b/extras/fstab_import/fstab_import.c index 71ab5d34ee..e793604faa 100644 --- a/extras/fstab_import/fstab_import.c +++ b/extras/fstab_import/fstab_import.c @@ -66,9 +66,9 @@ int main(int argc, char *argv[]) { 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' }, {} }; char **devices; diff --git a/extras/scsi_id/scsi_id.c b/extras/scsi_id/scsi_id.c index 10ec98c8bf..6334af386b 100644 --- a/extras/scsi_id/scsi_id.c +++ b/extras/scsi_id/scsi_id.c @@ -31,17 +31,17 @@ #include "scsi_id.h" static const struct option options[] = { - { "device", 1, NULL, 'd' }, - { "config", 1, NULL, 'f' }, - { "page", 1, NULL, 'p' }, - { "blacklisted", 0, NULL, 'b' }, - { "whitelisted", 0, NULL, 'g' }, - { "replace-whitespace", 0, NULL, 'u' }, - { "sg-version", 1, NULL, 's' }, - { "verbose", 0, NULL, 'v' }, - { "version", 0, NULL, 'V' }, - { "export", 0, NULL, 'x' }, - { "help", 0, NULL, 'h' }, + { "device", required_argument, NULL, 'd' }, + { "config", required_argument, NULL, 'f' }, + { "page", required_argument, NULL, 'p' }, + { "blacklisted", no_argument, NULL, 'b' }, + { "whitelisted", no_argument, NULL, 'g' }, + { "replace-whitespace", no_argument, NULL, 'u' }, + { "sg-version", required_argument, NULL, 's' }, + { "verbose", no_argument, NULL, 'v' }, + { "version", no_argument, NULL, 'V' }, + { "export", no_argument, NULL, 'x' }, + { "help", no_argument, NULL, 'h' }, {} }; diff --git a/extras/usb_id/usb_id.c b/extras/usb_id/usb_id.c index 2154552120..f39496b07c 100644 --- a/extras/usb_id/usb_id.c +++ b/extras/usb_id/usb_id.c @@ -359,10 +359,10 @@ int main(int argc, char **argv) char devpath[MAX_PATH_LEN]; static int export; static const struct option options[] = { - { "usb-info", 0, NULL, 'u' }, - { "num-info", 0, NULL, 'n' }, - { "export", 0, NULL, 'x' }, - { "help", 0, NULL, 'h' }, + { "usb-info", no_argument, NULL, 'u' }, + { "num-info", no_argument, NULL, 'n' }, + { "export", no_argument, NULL, 'x' }, + { "help", no_argument, NULL, 'h' }, {} }; diff --git a/extras/volume_id/vol_id.c b/extras/volume_id/vol_id.c index b47d6a4ecb..0137b84fbe 100644 --- a/extras/volume_id/vol_id.c +++ b/extras/volume_id/vol_id.c @@ -111,16 +111,16 @@ static int all_probers(volume_id_probe_fn_t probe_fn, int main(int argc, char *argv[]) { static const struct option options[] = { - { "label", 0, NULL, 'l' }, - { "label-raw", 0, NULL, 'L' }, - { "uuid", 0, NULL, 'u' }, - { "type", 0, NULL, 't' }, - { "export", 0, NULL, 'x' }, - { "skip-raid", 0, NULL, 's' }, - { "probe-all", 0, NULL, 'a' }, - { "offset", 2, NULL, 'o' }, - { "debug", 0, NULL, 'd' }, - { "help", 0, NULL, 'h' }, + { "label", no_argument, NULL, 'l' }, + { "label-raw", no_argument, NULL, 'L' }, + { "uuid", no_argument, NULL, 'u' }, + { "type", no_argument, NULL, 't' }, + { "export", no_argument, NULL, 'x' }, + { "skip-raid", no_argument, NULL, 's' }, + { "probe-all", no_argument, NULL, 'a' }, + { "offset", optional_argument, NULL, 'o' }, + { "debug", no_argument, NULL, 'd' }, + { "help", no_argument, NULL, 'h' }, {} }; |