diff options
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-07-06 11:53:26 -0700 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-07-06 11:53:26 -0700 |
commit | 797490624ac2118bd6ddcc10b112335cf52c45de (patch) | |
tree | edaf016830f2ed1e1923fc2eeb3540c0b11163f7 | |
parent | 9f5b515f64527bd0395437ec13fef79d48abc048 (diff) | |
download | usbutils-797490624ac2118bd6ddcc10b112335cf52c45de.tar.gz |
lsusb.c: remove unused variables and the unused -x command line option
It wasn't doing anything, and I don't know what it ever did, so remove
it. It also wasn't documented, so hopefully will not break anyone's
scripts...
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r-- | lsusb.c | 13 |
1 files changed, 4 insertions, 9 deletions
@@ -2791,14 +2791,13 @@ static void dump_ccid_device(const unsigned char *buf) static void dump_report_desc(unsigned char *b, int l) { - unsigned int t, j, bsize, btag, btype, data = 0xffff, hut = 0xffff; + unsigned int j, bsize, btag, btype, data = 0xffff, hut = 0xffff; int i; char *types[4] = { "Main", "Global", "Local", "reserved" }; char indent[] = " "; printf(" Report Descriptor: (length is %d)\n", l); for (i = 0; i < l; ) { - t = b[i]; bsize = b[i] & 0x03; if (bsize == 3) bsize = 4; @@ -3931,14 +3930,14 @@ int main(int argc, char *argv[]) }; libusb_context *ctx; int c, err = 0; - unsigned int allowctrlmsg = 0, treemode = 0; + unsigned int treemode = 0; int bus = -1, devnum = -1, vendor = -1, product = -1; const char *devdump = NULL; int help = 0; char *cp; int status; - while ((c = getopt_long(argc, argv, "D:vxtP:p:s:d:Vh", + while ((c = getopt_long(argc, argv, "D:vtP:p:s:d:Vh", long_options, NULL)) != EOF) { switch (c) { case 'V': @@ -3947,15 +3946,11 @@ int main(int argc, char *argv[]) case 'v': verblevel++; break; - + case 'h': help=1; break; - case 'x': - allowctrlmsg = 1; - break; - case 't': treemode = 1; break; |