diff options
| author | Kay Sievers <kay.sievers@vrfy.org> | 2011-04-13 01:47:56 +0200 |
|---|---|---|
| committer | Kay Sievers <kay.sievers@vrfy.org> | 2011-04-13 01:47:56 +0200 |
| commit | e48e2912023b5600d291904b0f7b0017387e8cb2 (patch) | |
| tree | c2a4d569cbeca5102e89c0be1357d77aea0fe947 /extras | |
| parent | ff2c503df091e6e4e9ab48cdb6df6ec8b7b525d0 (diff) | |
trivial cleanups
Diffstat (limited to 'extras')
| -rw-r--r-- | extras/ata_id/ata_id.c | 2 | ||||
| -rw-r--r-- | extras/firmware/firmware.c | 4 | ||||
| -rw-r--r-- | extras/hid2hci/hid2hci.c | 4 | ||||
| -rw-r--r-- | extras/path_id/path_id.c | 2 | ||||
| -rw-r--r-- | extras/udev-acl/udev-acl.c | 1 | ||||
| -rw-r--r-- | extras/usb_id/usb_id.c | 2 |
6 files changed, 2 insertions, 13 deletions
diff --git a/extras/ata_id/ata_id.c b/extras/ata_id/ata_id.c index 594cfb2017..cb4a1a1f07 100644 --- a/extras/ata_id/ata_id.c +++ b/extras/ata_id/ata_id.c @@ -486,8 +486,6 @@ int main(int argc, char *argv[]) printf("Usage: ata_id [--export] [--help] <device>\n" " --export print values as environment keys\n" " --help print this help text\n\n"); - default: - rc = 1; goto exit; } } diff --git a/extras/firmware/firmware.c b/extras/firmware/firmware.c index f2df76c8c5..36ce79054c 100644 --- a/extras/firmware/firmware.c +++ b/extras/firmware/firmware.c @@ -43,7 +43,7 @@ static bool set_loading(struct udev *udev, char *loadpath, const char *state) static bool copy_firmware(struct udev *udev, const char *source, const char *target, size_t size) { char *buf; - FILE *fsource, *ftarget; + FILE *fsource = NULL, *ftarget = NULL; bool ret = false; buf = malloc(size); @@ -112,8 +112,6 @@ int main(int argc, char **argv) break; case 'h': printf("Usage: firmware --firmware=<fwfile> --devpath=<path> [--help]\n\n"); - default: - rc = 1; goto exit; } } diff --git a/extras/hid2hci/hid2hci.c b/extras/hid2hci/hid2hci.c index 839c4fbce7..98e60d9ac1 100644 --- a/extras/hid2hci/hid2hci.c +++ b/extras/hid2hci/hid2hci.c @@ -243,7 +243,7 @@ int main(int argc, char *argv[]) for (;;) { int option; - option = getopt_long(argc, argv, "m:p:M:qh", options, NULL); + option = getopt_long(argc, argv, "m:p:M:h", options, NULL); if (option == -1) break; @@ -277,8 +277,6 @@ int main(int argc, char *argv[]) break; case 'h': usage(NULL); - default: - exit(1); } } diff --git a/extras/path_id/path_id.c b/extras/path_id/path_id.c index c19bfd0f8d..db13eeba27 100644 --- a/extras/path_id/path_id.c +++ b/extras/path_id/path_id.c @@ -388,8 +388,6 @@ int main(int argc, char **argv) printf("Usage: path_id [--debug] [--help] <devpath>\n" " --debug print debug information\n" " --help print this help text\n\n"); - default: - rc = 1; goto exit; } } diff --git a/extras/udev-acl/udev-acl.c b/extras/udev-acl/udev-acl.c index 31e9991a51..2dd3e6cac9 100644 --- a/extras/udev-acl/udev-acl.c +++ b/extras/udev-acl/udev-acl.c @@ -364,7 +364,6 @@ int main (int argc, char* argv[]) break; case 'h': printf("Usage: udev-acl --action=ACTION [--device=DEVICEFILE] [--user=UID]\n\n"); - default: goto out; } } diff --git a/extras/usb_id/usb_id.c b/extras/usb_id/usb_id.c index fabd09283d..3a7a0ffd49 100644 --- a/extras/usb_id/usb_id.c +++ b/extras/usb_id/usb_id.c @@ -503,8 +503,6 @@ int main(int argc, char **argv) " --num-info use numerical values\n" " --export print values as environment keys\n" " --help print this help text\n\n"); - default: - retval = 1; goto exit; } } |