chiark
/
gitweb
/
~ianmdlvl
/
vbig.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
1467299
)
Rearrange argc/argv for more idiomatic access to positional arguments.
author
Richard Kettlewell
<rjk@greenend.org.uk>
Fri, 17 Jun 2011 19:49:50 +0000
(20:49 +0100)
committer
Richard Kettlewell
<rjk@greenend.org.uk>
Fri, 17 Jun 2011 19:49:50 +0000
(20:49 +0100)
vbig.cc
patch
|
blob
|
history
diff --git
a/vbig.cc
b/vbig.cc
index 00513945fa238c9d83164f9e46394e6ec2e5de1c..c6565086927e985eab3bedd60c40c7ed669deb4e 100644
(file)
--- a/
vbig.cc
+++ b/
vbig.cc
@@
-119,23
+119,25
@@
int main(int argc, char **argv) {
fatal(0, "unknown option");
}
}
fatal(0, "unknown option");
}
}
+ argc -= optind;
+ argv += optind;
if(mode == NONE) {
fatal(0, "must specify one of --verify or --create");
exit(1);
}
if(mode == NONE) {
fatal(0, "must specify one of --verify or --create");
exit(1);
}
- if(
optind + 2 != argc
) {
+ if(
argc != 2
) {
fatal(0, "must specify a path and size");
exit(1);
}
fatal(0, "must specify a path and size");
exit(1);
}
- const char *path = argv[
optind
];
+ const char *path = argv[
0
];
errno = 0;
char *end;
errno = 0;
char *end;
- long long size = strtoll(argv[
optind +
1], &end, 10);
+ long long size = strtoll(argv[1], &end, 10);
if(errno) {
fatal(errno, "invalid size");
exit(1);
}
if(errno) {
fatal(errno, "invalid size");
exit(1);
}
- if(end == argv[
optind +
1]) {
+ if(end == argv[1]) {
fatal(0, "invalid size");
exit(1);
}
fatal(0, "invalid size");
exit(1);
}