projects
/
pulseview.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
53d45c5
)
Reordered argument handling
author
Joel Holdsworth
<joel@airwebreathe.org.uk>
Sun, 12 Apr 2015 13:24:58 +0000
(14:24 +0100)
committer
Uwe Hermann
<uwe@hermann-uwe.de>
Thu, 11 Jun 2015 18:38:48 +0000
(20:38 +0200)
main.cpp
patch
|
blob
|
history
diff --git
a/main.cpp
b/main.cpp
index cfaba777d2f26add33a344da7aacf17facc8931d..089deee756db87024ef5fe698a8be7335726debc 100644
(file)
--- a/
main.cpp
+++ b/
main.cpp
@@
-56,9
+56,11
@@
void usage()
" %s [OPTION…] [FILE] — %s\n"
"\n"
"Help Options:\n"
" %s [OPTION…] [FILE] — %s\n"
"\n"
"Help Options:\n"
- " -l, --loglevel Set libsigrok/libsigrokdecode loglevel\n"
- " -V, --version Show release version\n"
" -h, -?, --help Show help option\n"
" -h, -?, --help Show help option\n"
+ "\n"
+ "Application Options:\n"
+ " -V, --version Show release version\n"
+ " -l, --loglevel Set libsigrok/libsigrokdecode loglevel\n"
"\n", PV_BIN_NAME, PV_DESCRIPTION);
}
"\n", PV_BIN_NAME, PV_DESCRIPTION);
}
@@
-78,9
+80,9
@@
int main(int argc, char *argv[])
// Parse arguments
while (1) {
static const struct option long_options[] = {
// Parse arguments
while (1) {
static const struct option long_options[] = {
- {"loglevel", required_argument, 0, 'l'},
- {"version", no_argument, 0, 'V'},
{"help", no_argument, 0, 'h'},
{"help", no_argument, 0, 'h'},
+ {"version", no_argument, 0, 'V'},
+ {"loglevel", required_argument, 0, 'l'},
{0, 0, 0, 0}
};
{0, 0, 0, 0}
};
@@
-90,6
+92,16
@@
int main(int argc, char *argv[])
break;
switch (c) {
break;
switch (c) {
+ case 'h':
+ case '?':
+ usage();
+ return 0;
+
+ case 'V':
+ // Print version info
+ fprintf(stdout, "%s %s\n", PV_TITLE, PV_VERSION_STRING);
+ return 0;
+
case 'l':
{
const int loglevel = atoi(optarg);
case 'l':
{
const int loglevel = atoi(optarg);
@@
-101,16
+113,6
@@
int main(int argc, char *argv[])
break;
}
break;
}
-
- case 'V':
- // Print version info
- fprintf(stdout, "%s %s\n", PV_TITLE, PV_VERSION_STRING);
- return 0;
-
- case 'h':
- case '?':
- usage();
- return 0;
}
}
}
}