[master] 946ec369f Eliminate the now unused 'cmds' argument from cli command functions
Poul-Henning Kamp
phk at FreeBSD.org
Mon Oct 19 09:29:07 UTC 2020
commit 946ec369fe4d9535d516d9a577c18860765033e8
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date: Mon Oct 19 09:28:14 2020 +0000
Eliminate the now unused 'cmds' argument from cli command functions
diff --git a/bin/varnishtest/vtc.c b/bin/varnishtest/vtc.c
index e70e7a578..d1a14cf8c 100644
--- a/bin/varnishtest/vtc.c
+++ b/bin/varnishtest/vtc.c
@@ -458,7 +458,7 @@ parse_string(struct vtclog *vl, void *priv, const char *spec)
vtc_fatal(vl, "Unknown command: \"%s\"", token_s[0]);
assert(cp->cmd != NULL);
- cp->cmd(token_s, priv, vl->cmds, vl);
+ cp->cmd(token_s, priv, vl);
}
}
@@ -471,7 +471,7 @@ reset_cmds(const struct cmds *cmd)
{
for (; cmd->name != NULL; cmd++)
- cmd->cmd(NULL, NULL, NULL, NULL);
+ cmd->cmd(NULL, NULL, NULL);
}
/**********************************************************************
diff --git a/bin/varnishtest/vtc.h b/bin/varnishtest/vtc.h
index 17fd4fe15..1c716508f 100644
--- a/bin/varnishtest/vtc.h
+++ b/bin/varnishtest/vtc.h
@@ -54,11 +54,9 @@
} while (0)
struct vtclog;
-struct cmds;
struct suckaddr;
-#define CMD_ARGS \
- char * const *av, void *priv, const struct cmds *cmd, struct vtclog *vl
+#define CMD_ARGS char * const *av, void *priv, struct vtclog *vl
typedef void cmd_f(CMD_ARGS);
diff --git a/bin/varnishtest/vtc_barrier.c b/bin/varnishtest/vtc_barrier.c
index 6af18d252..ee334953f 100644
--- a/bin/varnishtest/vtc_barrier.c
+++ b/bin/varnishtest/vtc_barrier.c
@@ -400,7 +400,6 @@ cmd_barrier(CMD_ARGS)
int r;
(void)priv;
- (void)cmd;
if (av == NULL) {
/* Reset and free */
diff --git a/bin/varnishtest/vtc_client.c b/bin/varnishtest/vtc_client.c
index ab22147f5..07a8d48c1 100644
--- a/bin/varnishtest/vtc_client.c
+++ b/bin/varnishtest/vtc_client.c
@@ -330,7 +330,6 @@ cmd_client(CMD_ARGS)
struct client *c, *c2;
(void)priv;
- (void)cmd;
if (av == NULL) {
/* Reset and free */
diff --git a/bin/varnishtest/vtc_haproxy.c b/bin/varnishtest/vtc_haproxy.c
index 4167097e0..b7f467cb7 100644
--- a/bin/varnishtest/vtc_haproxy.c
+++ b/bin/varnishtest/vtc_haproxy.c
@@ -200,7 +200,6 @@ cmd_haproxy_cli_send(CMD_ARGS)
struct haproxy_cli *hc;
int j;
- (void)cmd;
(void)vl;
CAST_OBJ_NOTNULL(hc, priv, HAPROXY_CLI_MAGIC);
AZ(strcmp(av[0], "send"));
@@ -302,7 +301,6 @@ cmd_haproxy_cli_expect(CMD_ARGS)
int erroroffset, i, ret;
char *cmp, *spec;
- (void)cmd;
(void)vl;
CAST_OBJ_NOTNULL(hc, priv, HAPROXY_CLI_MAGIC);
AZ(strcmp(av[0], "expect"));
@@ -1012,7 +1010,6 @@ cmd_haproxy(CMD_ARGS)
struct haproxy *h, *h2;
(void)priv;
- (void)cmd;
if (av == NULL) {
/* Reset and free */
diff --git a/bin/varnishtest/vtc_http.c b/bin/varnishtest/vtc_http.c
index c669ca476..dc286066a 100644
--- a/bin/varnishtest/vtc_http.c
+++ b/bin/varnishtest/vtc_http.c
@@ -357,7 +357,6 @@ cmd_http_expect(CMD_ARGS)
char *cmp;
const char *rhs;
- (void)cmd;
(void)vl;
CAST_OBJ_NOTNULL(hp, priv, HTTP_MAGIC);
AZ(strcmp(av[0], "expect"));
@@ -381,7 +380,6 @@ cmd_http_expect_pattern(CMD_ARGS)
struct http *hp;
char t = '0';
- (void)cmd;
(void)vl;
CAST_OBJ_NOTNULL(hp, priv, HTTP_MAGIC);
AZ(strcmp(av[0], "expect_pattern"));
@@ -692,7 +690,6 @@ cmd_http_rxresp(CMD_ARGS)
struct http *hp;
int has_obj = 1;
- (void)cmd;
(void)vl;
CAST_OBJ_NOTNULL(hp, priv, HTTP_MAGIC);
ONLY_CLIENT(hp, av);
@@ -734,7 +731,6 @@ cmd_http_rxresphdrs(CMD_ARGS)
{
struct http *hp;
- (void)cmd;
(void)vl;
CAST_OBJ_NOTNULL(hp, priv, HTTP_MAGIC);
ONLY_CLIENT(hp, av);
@@ -761,7 +757,6 @@ cmd_http_gunzip(CMD_ARGS)
struct http *hp;
(void)av;
- (void)cmd;
(void)vl;
CAST_OBJ_NOTNULL(hp, priv, HTTP_MAGIC);
@@ -965,7 +960,6 @@ cmd_http_txresp(CMD_ARGS)
const char *reason = "OK";
char* body = NULL;
- (void)cmd;
(void)vl;
CAST_OBJ_NOTNULL(hp, priv, HTTP_MAGIC);
ONLY_SERVER(hp, av);
@@ -1007,7 +1001,6 @@ cmd_http_upgrade(CMD_ARGS)
char *h;
struct http *hp;
- (void)cmd;
CAST_OBJ_NOTNULL(hp, priv, HTTP_MAGIC);
ONLY_SERVER(hp, av);
AN(hp->sfd);
@@ -1059,7 +1052,6 @@ cmd_http_rxreq(CMD_ARGS)
{
struct http *hp;
- (void)cmd;
CAST_OBJ_NOTNULL(hp, priv, HTTP_MAGIC);
ONLY_SERVER(hp, av);
AZ(strcmp(av[0], "rxreq"));
@@ -1086,7 +1078,6 @@ cmd_http_rxreqhdrs(CMD_ARGS)
{
struct http *hp;
- (void)cmd;
(void)vl;
CAST_OBJ_NOTNULL(hp, priv, HTTP_MAGIC);
AZ(strcmp(av[0], "rxreqhdrs"));
@@ -1111,7 +1102,6 @@ cmd_http_rxreqbody(CMD_ARGS)
{
struct http *hp;
- (void)cmd;
(void)vl;
CAST_OBJ_NOTNULL(hp, priv, HTTP_MAGIC);
ONLY_SERVER(hp, av);
@@ -1138,7 +1128,6 @@ cmd_http_rxrespbody(CMD_ARGS)
struct http *hp;
int max = 0;
- (void)cmd;
(void)vl;
CAST_OBJ_NOTNULL(hp, priv, HTTP_MAGIC);
ONLY_CLIENT(hp, av);
@@ -1169,7 +1158,6 @@ cmd_http_rxchunk(CMD_ARGS)
struct http *hp;
int ll, i;
- (void)cmd;
(void)vl;
CAST_OBJ_NOTNULL(hp, priv, HTTP_MAGIC);
ONLY_CLIENT(hp, av);
@@ -1197,7 +1185,6 @@ cmd_http_txreq(CMD_ARGS)
const char *up = NULL;
unsigned nohost;
- (void)cmd;
(void)vl;
CAST_OBJ_NOTNULL(hp, priv, HTTP_MAGIC);
ONLY_CLIENT(hp, av);
@@ -1272,7 +1259,6 @@ cmd_http_recv(CMD_ARGS)
int i, n;
char u[32];
- (void)cmd;
(void)vl;
CAST_OBJ_NOTNULL(hp, priv, HTTP_MAGIC);
AN(av[1]);
@@ -1301,7 +1287,6 @@ cmd_http_send(CMD_ARGS)
struct http *hp;
int i;
- (void)cmd;
(void)vl;
CAST_OBJ_NOTNULL(hp, priv, HTTP_MAGIC);
AN(av[1]);
@@ -1325,7 +1310,6 @@ cmd_http_send_n(CMD_ARGS)
struct http *hp;
int i, n, l;
- (void)cmd;
(void)vl;
CAST_OBJ_NOTNULL(hp, priv, HTTP_MAGIC);
AN(av[1]);
@@ -1355,7 +1339,6 @@ cmd_http_send_urgent(CMD_ARGS)
struct http *hp;
int i;
- (void)cmd;
(void)vl;
CAST_OBJ_NOTNULL(hp, priv, HTTP_MAGIC);
AN(av[1]);
@@ -1381,7 +1364,6 @@ cmd_http_sendhex(CMD_ARGS)
struct vsb *vsb;
struct http *hp;
- (void)cmd;
(void)vl;
CAST_OBJ_NOTNULL(hp, priv, HTTP_MAGIC);
AN(av[1]);
@@ -1406,7 +1388,6 @@ cmd_http_chunked(CMD_ARGS)
{
struct http *hp;
- (void)cmd;
(void)vl;
CAST_OBJ_NOTNULL(hp, priv, HTTP_MAGIC);
AN(av[1]);
@@ -1432,7 +1413,6 @@ cmd_http_chunkedlen(CMD_ARGS)
char buf[16384];
struct http *hp;
- (void)cmd;
(void)vl;
CAST_OBJ_NOTNULL(hp, priv, HTTP_MAGIC);
AN(av[1]);
@@ -1472,7 +1452,6 @@ cmd_http_timeout(CMD_ARGS)
struct http *hp;
double d;
- (void)cmd;
(void)vl;
CAST_OBJ_NOTNULL(hp, priv, HTTP_MAGIC);
AN(av[1]);
@@ -1496,7 +1475,6 @@ cmd_http_expect_close(CMD_ARGS)
char c;
int i;
- (void)cmd;
(void)vl;
CAST_OBJ_NOTNULL(hp, priv, HTTP_MAGIC);
AZ(av[1]);
@@ -1539,7 +1517,6 @@ cmd_http_close(CMD_ARGS)
{
struct http *hp;
- (void)cmd;
(void)vl;
CAST_OBJ_NOTNULL(hp, priv, HTTP_MAGIC);
ONLY_SERVER(hp, av);
@@ -1563,7 +1540,6 @@ cmd_http_accept(CMD_ARGS)
{
struct http *hp;
- (void)cmd;
(void)vl;
CAST_OBJ_NOTNULL(hp, priv, HTTP_MAGIC);
ONLY_SERVER(hp, av);
@@ -1593,13 +1569,14 @@ cmd_http_fatal(CMD_ARGS)
struct http *hp;
CAST_OBJ_NOTNULL(hp, priv, HTTP_MAGIC);
+ (void)vl;
AZ(av[1]);
- if (!strcmp(av[0], "fatal"))
+ if (!strcmp(av[0], "fatal")) {
hp->fatal = 0;
- else if (!strcmp(av[0], "non_fatal"))
+ } else {
+ assert(!strcmp(av[0], "non_fatal"));
hp->fatal = -1;
- else
- vtc_fatal(vl, "XXX: fatal %s", cmd->name);
+ }
}
#define cmd_http_non_fatal cmd_http_fatal
@@ -1621,7 +1598,7 @@ cmd_http_txpri(CMD_ARGS)
{
size_t l;
struct http *hp;
- (void)cmd;
+
CAST_OBJ_NOTNULL(hp, priv, HTTP_MAGIC);
ONLY_CLIENT(hp, av);
@@ -1651,7 +1628,7 @@ static void
cmd_http_rxpri(CMD_ARGS)
{
struct http *hp;
- (void)cmd;
+
CAST_OBJ_NOTNULL(hp, priv, HTTP_MAGIC);
ONLY_SERVER(hp, av);
@@ -1677,7 +1654,6 @@ cmd_http_settings(CMD_ARGS)
char *p;
struct http *hp;
CAST_OBJ_NOTNULL(hp, priv, HTTP_MAGIC);
- (void)cmd;
if (!hp->h2)
vtc_fatal(hp->vl, "Only possible in H/2 mode");
@@ -1718,7 +1694,7 @@ cmd_http_stream(CMD_ARGS)
"} -run\n"
);
}
- cmd_stream(av, hp, cmd, vl);
+ cmd_stream(av, hp, vl);
}
/* SECTION: client-server.spec.write_body
@@ -1734,7 +1710,6 @@ cmd_http_write_body(CMD_ARGS)
{
struct http *hp;
- (void)cmd;
(void)vl;
CAST_OBJ_NOTNULL(hp, priv, HTTP_MAGIC);
AN(av[0]);
diff --git a/bin/varnishtest/vtc_http2.c b/bin/varnishtest/vtc_http2.c
index aa3e0d495..f2deff037 100644
--- a/bin/varnishtest/vtc_http2.c
+++ b/bin/varnishtest/vtc_http2.c
@@ -1249,7 +1249,6 @@ cmd_sendhex(CMD_ARGS)
struct stream *s;
struct vsb *vsb;
- (void)cmd;
(void)vl;
CAST_OBJ_NOTNULL(s, priv, STREAM_MAGIC);
CAST_OBJ_NOTNULL(hp, s->hp, HTTP_MAGIC);
@@ -1417,7 +1416,6 @@ cmd_tx11obj(CMD_ARGS)
struct hpk_hdr hdr;
char *cmd_str = *av;
char *b, *p;
- (void)cmd;
CAST_OBJ_NOTNULL(s, priv, STREAM_MAGIC);
INIT_FRAME(f, CONTINUATION, 0, s->id, END_HEADERS);
@@ -1692,7 +1690,6 @@ cmd_txdata(CMD_ARGS)
struct frame f;
char *body = NULL;
char *data = NULL;
- (void)cmd;
CAST_OBJ_NOTNULL(s, priv, STREAM_MAGIC);
@@ -1767,7 +1764,7 @@ cmd_txrst(CMD_ARGS)
char *p;
uint32_t err = 0;
struct frame f;
- (void)cmd;
+
CAST_OBJ_NOTNULL(s, priv, STREAM_MAGIC);
INIT_FRAME(f, RST_STREAM, 4, s->id, 0);
@@ -1821,7 +1818,6 @@ cmd_txprio(CMD_ARGS)
uint32_t exclusive = 0;
uint8_t buf[5];
- (void)cmd;
CAST_OBJ_NOTNULL(s, priv, STREAM_MAGIC);
INIT_FRAME(f, PRIORITY, 5, s->id, 0);
@@ -1898,7 +1894,6 @@ cmd_txsettings(CMD_ARGS)
char buf[512];
char *cursor = buf;
- (void)cmd;
CAST_OBJ_NOTNULL(s, priv, STREAM_MAGIC);
CAST_OBJ_NOTNULL(hp, s->hp, HTTP_MAGIC);
@@ -1968,7 +1963,6 @@ cmd_txping(CMD_ARGS)
struct frame f;
char buf[8];
- (void)cmd;
memset(buf, 0, 8);
CAST_OBJ_NOTNULL(s, priv, STREAM_MAGIC);
INIT_FRAME(f, PING, 8, s->id, 0);
@@ -2020,7 +2014,6 @@ cmd_txgoaway(CMD_ARGS)
uint32_t ls = 0;
struct frame f;
- (void)cmd;
CAST_OBJ_NOTNULL(s, priv, STREAM_MAGIC);
INIT_FRAME(f, GOAWAY, 8, s->id, 0);
@@ -2080,7 +2073,6 @@ cmd_txwinup(CMD_ARGS)
char buf[8];
uint32_t size = 0;
- (void)cmd;
CAST_OBJ_NOTNULL(s, priv, STREAM_MAGIC);
CAST_OBJ_NOTNULL(hp, s->hp, HTTP_MAGIC);
memset(buf, 0, 8);
@@ -2170,7 +2162,6 @@ cmd_rxhdrs(CMD_ARGS)
unsigned rcv = 0;
enum h2_type expect = TYPE_HEADERS;
- (void)cmd;
CAST_OBJ_NOTNULL(s, priv, STREAM_MAGIC);
while (*++av) {
@@ -2208,7 +2199,6 @@ cmd_rxcont(CMD_ARGS)
unsigned long int times = 1;
unsigned rcv = 0;
- (void)cmd;
(void)av;
CAST_OBJ_NOTNULL(s, priv, STREAM_MAGIC);
@@ -2259,7 +2249,6 @@ cmd_rxdata(CMD_ARGS)
unsigned long int times = 1;
unsigned rcv = 0;
- (void)cmd;
(void)av;
CAST_OBJ_NOTNULL(s, priv, STREAM_MAGIC);
@@ -2305,7 +2294,6 @@ cmd_rxmsg(CMD_ARGS)
int end_stream;
int rcv = 0;
- (void)cmd;
CAST_OBJ_NOTNULL(s, priv, STREAM_MAGIC);
if (!strcmp(av[0], "rxreq"))
@@ -2364,7 +2352,6 @@ cmd_rxpush(CMD_ARGS)
unsigned rcv = 0;
enum h2_type expect = TYPE_PUSH_PROMISE;
- (void)cmd;
CAST_OBJ_NOTNULL(s, priv, STREAM_MAGIC);
while (*++av) {
@@ -2396,7 +2383,6 @@ cmd_rxpush(CMD_ARGS)
static void \
cmd_rx ## lctype(CMD_ARGS) { \
struct stream *s; \
- (void)cmd; \
(void)av; \
CAST_OBJ_NOTNULL(s, priv, STREAM_MAGIC); \
s->frame = rxstuff(s); \
@@ -2452,7 +2438,7 @@ static void
cmd_rxframe(CMD_ARGS)
{
struct stream *s;
- (void)cmd;
+
(void)vl;
(void)av;
CAST_OBJ_NOTNULL(s, priv, STREAM_MAGIC);
@@ -2470,7 +2456,6 @@ cmd_expect(CMD_ARGS)
const char *rhs;
char buf[20];
- (void)cmd;
CAST_OBJ_NOTNULL(s, priv, STREAM_MAGIC);
hp = s->hp;
CHECK_OBJ_NOTNULL(hp, HTTP_MAGIC);
@@ -2501,7 +2486,6 @@ cmd_gunzip(CMD_ARGS)
struct stream *s;
(void)av;
- (void)cmd;
(void)vl;
CAST_OBJ_NOTNULL(s, priv, STREAM_MAGIC);
@@ -2521,7 +2505,6 @@ cmd_write_body(CMD_ARGS)
{
struct stream *s;
- (void)cmd;
(void)vl;
CAST_OBJ_NOTNULL(s, priv, STREAM_MAGIC);
AN(av[0]);
@@ -2752,7 +2735,6 @@ cmd_stream(CMD_ARGS)
struct stream *s;
struct http *h;
- (void)cmd;
(void)vl;
CAST_OBJ_NOTNULL(h, priv, HTTP_MAGIC);
diff --git a/bin/varnishtest/vtc_logexp.c b/bin/varnishtest/vtc_logexp.c
index 486424f2d..5f7f006c5 100644
--- a/bin/varnishtest/vtc_logexp.c
+++ b/bin/varnishtest/vtc_logexp.c
@@ -452,7 +452,6 @@ cmd_logexp_expect(CMD_ARGS)
struct logexp_test *test;
char *end;
- (void)cmd;
CAST_OBJ_NOTNULL(le, priv, LOGEXP_MAGIC);
if (av[1] == NULL || av[2] == NULL || av[3] == NULL)
vtc_fatal(vl, "Syntax error");
@@ -525,7 +524,6 @@ cmd_logexpect(CMD_ARGS)
int i;
(void)priv;
- (void)cmd;
if (av == NULL) {
/* Reset and free */
diff --git a/bin/varnishtest/vtc_misc.c b/bin/varnishtest/vtc_misc.c
index db604ecc6..ca85fabd2 100644
--- a/bin/varnishtest/vtc_misc.c
+++ b/bin/varnishtest/vtc_misc.c
@@ -69,7 +69,6 @@ cmd_vtest(CMD_ARGS)
{
(void)priv;
- (void)cmd;
(void)vl;
if (av == NULL)
@@ -91,7 +90,6 @@ cmd_varnishtest(CMD_ARGS)
{
(void)priv;
- (void)cmd;
(void)vl;
if (av == NULL)
@@ -215,7 +213,6 @@ cmd_shell(CMD_ARGS)
int ok = 0;
(void)priv;
- (void)cmd;
if (av == NULL)
return;
@@ -262,7 +259,6 @@ void v_matchproto_(cmd_f)
cmd_err_shell(CMD_ARGS)
{
(void)priv;
- (void)cmd;
if (av == NULL)
return;
@@ -295,7 +291,6 @@ cmd_setenv(CMD_ARGS)
int force;
(void)priv;
- (void)cmd;
if (av == NULL)
return;
@@ -330,7 +325,6 @@ cmd_delay(CMD_ARGS)
double f;
(void)priv;
- (void)cmd;
if (av == NULL)
return;
AN(av[1]);
@@ -420,7 +414,6 @@ cmd_feature(CMD_ARGS)
int good;
(void)priv;
- (void)cmd;
if (av == NULL)
return;
diff --git a/bin/varnishtest/vtc_process.c b/bin/varnishtest/vtc_process.c
index c1b4835d7..3ef102ffa 100644
--- a/bin/varnishtest/vtc_process.c
+++ b/bin/varnishtest/vtc_process.c
@@ -929,7 +929,6 @@ cmd_process(CMD_ARGS)
int spec_set = 0;
(void)priv;
- (void)cmd;
if (av == NULL) {
/* Reset and free */
diff --git a/bin/varnishtest/vtc_server.c b/bin/varnishtest/vtc_server.c
index 0f44c75c3..f98f2b7bb 100644
--- a/bin/varnishtest/vtc_server.c
+++ b/bin/varnishtest/vtc_server.c
@@ -474,7 +474,6 @@ cmd_server(CMD_ARGS)
struct server *s;
(void)priv;
- (void)cmd;
if (av == NULL) {
/* Reset and free */
diff --git a/bin/varnishtest/vtc_syslog.c b/bin/varnishtest/vtc_syslog.c
index 28f502638..f57bd38d1 100644
--- a/bin/varnishtest/vtc_syslog.c
+++ b/bin/varnishtest/vtc_syslog.c
@@ -387,7 +387,6 @@ cmd_syslog_expect(CMD_ARGS)
char *cmp, *spec;
(void)vl;
- (void)cmd;
CAST_OBJ_NOTNULL(s, priv, SYSLOG_SRV_MAGIC);
AZ(strcmp(av[0], "expect"));
av++;
@@ -423,7 +422,6 @@ cmd_syslog_recv(CMD_ARGS)
struct syslog_srv *s;
CAST_OBJ_NOTNULL(s, priv, SYSLOG_SRV_MAGIC);
- (void)cmd;
(void)vl;
AZ(strcmp(av[0], "recv"));
av++;
@@ -555,7 +553,6 @@ cmd_syslog(CMD_ARGS)
struct syslog_srv *s;
(void)priv;
- (void)cmd;
if (av == NULL) {
/* Reset and free */
diff --git a/bin/varnishtest/vtc_varnish.c b/bin/varnishtest/vtc_varnish.c
index 8bb701baa..5476806bc 100644
--- a/bin/varnishtest/vtc_varnish.c
+++ b/bin/varnishtest/vtc_varnish.c
@@ -1074,7 +1074,6 @@ cmd_varnish(CMD_ARGS)
struct varnish *v, *v2;
(void)priv;
- (void)cmd;
if (av == NULL) {
/* Reset and free */
More information about the varnish-commit
mailing list