opensource/kubo
1
0
Fork 0
mirror of https://github.com/ipfs/kubo.git synced 2025-06-19 01:39:35 +08:00
Code Issues Projects Releases Wiki Activity

commands: s/j/valueIndex/

Browse Source
This commit is contained in:
Matt Bell
2014-11-11 16:49:26 -08:00
committed by Juan Batiz-Benet
parent eedc2e9cc7
commit 50751617b6
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
commands/command.go
View File

@ -167,18 +167,18 @@ func (c *Command) CheckArguments(req Request) error {
}
// iterate over the arg definitions
j := 0
valueIndex := 0 // the index of the current value (in `args`)
for _, argDef := range c.Arguments {
// skip optional argument definitions if there aren't sufficient remaining values
if len(args)-j <= numRequired && !argDef.Required {
if len(args)-valueIndex <= numRequired && !argDef.Required {
continue
}
// the value for this argument definition. can be nil if it wasn't provided by the caller
var v interface{}
if j < len(args) {
v = args[j]
j++
if valueIndex < len(args) {
v = args[valueIndex]
valueIndex++
}
err := checkArgValue(v, argDef)
@ -187,8 +187,8 @@ func (c *Command) CheckArguments(req Request) error {
}
// any additional values are for the variadic arg definition
if argDef.Variadic && j < len(args)-1 {
for _, val := range args[j:] {
if argDef.Variadic && valueIndex < len(args)-1 {
for _, val := range args[valueIndex:] {
err := checkArgValue(val, argDef)
if err != nil {
return err