Commit 5f67d3ae authored by Poul-Henning Kamp's avatar Poul-Henning Kamp

Slight reshuffling of some lines of code.

parent c44bd67f
...@@ -212,14 +212,27 @@ VCLS_func_help_json(struct cli *cli, const char * const *av, void *priv) ...@@ -212,14 +212,27 @@ VCLS_func_help_json(struct cli *cli, const char * const *av, void *priv)
*/ */
static void static void
cls_dispatch(struct cli *cli, const struct cli_proto *cp, cls_dispatch(struct cli *cli, struct VCLS *cs, char * const * av, int ac)
char * const * av, int ac)
{ {
int json = 0; int json = 0;
struct cli_proto *cp;
AN(av); AN(av);
assert(ac >= 0); assert(ac >= 0);
VTAILQ_FOREACH(cp, &cs->funcs, list) {
if (cp->auth > cli->auth)
continue;
if (!strcmp(cp->desc->request, av[1]))
break;
}
if (cp == NULL && cs->wildcard && cs->wildcard->auth <= cli->auth)
cp = cs->wildcard;
if (cp == NULL)
return;
VSB_clear(cli->sb); VSB_clear(cli->sb);
if (ac > 1 && !strcmp(av[2], "-j")) if (ac > 1 && !strcmp(av[2], "-j"))
...@@ -263,7 +276,6 @@ static int ...@@ -263,7 +276,6 @@ static int
cls_exec(struct VCLS_fd *cfd, char * const *av) cls_exec(struct VCLS_fd *cfd, char * const *av)
{ {
struct VCLS *cs; struct VCLS *cs;
struct cli_proto *clp;
struct cli *cli; struct cli *cli;
int na; int na;
ssize_t len; ssize_t len;
...@@ -313,17 +325,7 @@ cls_exec(struct VCLS_fd *cfd, char * const *av) ...@@ -313,17 +325,7 @@ cls_exec(struct VCLS_fd *cfd, char * const *av)
for (na = 0; av[na + 1] != NULL; na++) for (na = 0; av[na + 1] != NULL; na++)
continue; continue;
VTAILQ_FOREACH(clp, &cs->funcs, list) { cls_dispatch(cli, cs, av, na);
if (clp->auth > cli->auth)
continue;
if (!strcmp(clp->desc->request, av[1])) {
cls_dispatch(cli, clp, av, na);
break;
}
}
if (clp == NULL &&
cs->wildcard && cs->wildcard->auth <= cli->auth)
cls_dispatch(cli, cs->wildcard, av, na);
} while (0); } while (0);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment