r2777 - trunk/varnish-cache/bin/varnishtest
phk at projects.linpro.no
phk at projects.linpro.no
Mon Jun 23 00:00:02 CEST 2008
Author: phk
Date: 2008-06-23 00:00:02 +0200 (Mon, 23 Jun 2008)
New Revision: 2777
Modified:
trunk/varnish-cache/bin/varnishtest/vtc.c
trunk/varnish-cache/bin/varnishtest/vtc.h
trunk/varnish-cache/bin/varnishtest/vtc_client.c
trunk/varnish-cache/bin/varnishtest/vtc_http.c
trunk/varnish-cache/bin/varnishtest/vtc_server.c
trunk/varnish-cache/bin/varnishtest/vtc_stats.c
trunk/varnish-cache/bin/varnishtest/vtc_varnish.c
Log:
Macroize the method function arguments
Modified: trunk/varnish-cache/bin/varnishtest/vtc.c
===================================================================
--- trunk/varnish-cache/bin/varnishtest/vtc.c 2008-06-22 21:41:20 UTC (rev 2776)
+++ trunk/varnish-cache/bin/varnishtest/vtc.c 2008-06-22 22:00:02 UTC (rev 2777)
@@ -172,7 +172,7 @@
}
assert(cp->cmd != NULL);
- cp->cmd(token_s, priv);
+ cp->cmd(token_s, priv, cmd);
}
}
@@ -185,7 +185,7 @@
{
for (; cmd->name != NULL; cmd++)
- cmd->cmd(NULL, NULL);
+ cmd->cmd(NULL, NULL, NULL);
}
/**********************************************************************
@@ -193,10 +193,11 @@
*/
static void
-cmd_test(char **av, void *priv)
+cmd_test(CMD_ARGS)
{
(void)priv;
+ (void)cmd;
if (av == NULL)
return;
@@ -212,11 +213,12 @@
*/
void
-cmd_delay(char **av, void *priv)
+cmd_delay(CMD_ARGS)
{
double f;
(void)priv;
+ (void)cmd;
if (av == NULL)
return;
AN(av[1]);
@@ -234,9 +236,10 @@
*/
void
-cmd_dump(char **av, void *priv)
+cmd_dump(CMD_ARGS)
{
+ (void)cmd;
if (av == NULL)
return;
printf("cmd_dump(%p)\n", priv);
Modified: trunk/varnish-cache/bin/varnishtest/vtc.h
===================================================================
--- trunk/varnish-cache/bin/varnishtest/vtc.h 2008-06-22 21:41:20 UTC (rev 2776)
+++ trunk/varnish-cache/bin/varnishtest/vtc.h 2008-06-22 22:00:02 UTC (rev 2777)
@@ -26,11 +26,13 @@
* $Id$
*/
-typedef void cmd_f(char **av, void *priv);
-
struct vsb;
struct vtclog;
+struct cmds;
+#define CMD_ARGS char **av, void *priv, const struct cmds *cmd
+typedef void cmd_f(CMD_ARGS);
+
struct cmds {
const char *name;
cmd_f *cmd;
Modified: trunk/varnish-cache/bin/varnishtest/vtc_client.c
===================================================================
--- trunk/varnish-cache/bin/varnishtest/vtc_client.c 2008-06-22 21:41:20 UTC (rev 2776)
+++ trunk/varnish-cache/bin/varnishtest/vtc_client.c 2008-06-22 22:00:02 UTC (rev 2777)
@@ -161,11 +161,12 @@
*/
void
-cmd_client(char **av, void *priv)
+cmd_client(CMD_ARGS)
{
struct client *c, *c2;
(void)priv;
+ (void)cmd;
if (av == NULL) {
/* Reset and free */
Modified: trunk/varnish-cache/bin/varnishtest/vtc_http.c
===================================================================
--- trunk/varnish-cache/bin/varnishtest/vtc_http.c 2008-06-22 21:41:20 UTC (rev 2776)
+++ trunk/varnish-cache/bin/varnishtest/vtc_http.c 2008-06-22 22:00:02 UTC (rev 2777)
@@ -116,13 +116,14 @@
}
static void
-cmd_http_expect(char **av, void *priv)
+cmd_http_expect(CMD_ARGS)
{
struct http *hp;
char *lhs;
char *cmp;
char *rhs;
+ (void)cmd;
CAST_OBJ_NOTNULL(hp, priv, HTTP_MAGIC);
assert(!strcmp(av[0], "expect"));
av++;
@@ -305,10 +306,11 @@
*/
static void
-cmd_http_rxresp(char **av, void *priv)
+cmd_http_rxresp(CMD_ARGS)
{
struct http *hp;
+ (void)cmd;
CAST_OBJ_NOTNULL(hp, priv, HTTP_MAGIC);
AN(hp->client);
assert(!strcmp(av[0], "rxresp"));
@@ -329,7 +331,7 @@
*/
static void
-cmd_http_txresp(char **av, void *priv)
+cmd_http_txresp(CMD_ARGS)
{
struct http *hp;
struct vsb *vsb;
@@ -341,6 +343,7 @@
const char *nl = "\r\n";
int l;
+ (void)cmd;
CAST_OBJ_NOTNULL(hp, priv, HTTP_MAGIC);
AZ(hp->client);
assert(!strcmp(av[0], "txresp"));
@@ -408,10 +411,11 @@
*/
static void
-cmd_http_rxreq(char **av, void *priv)
+cmd_http_rxreq(CMD_ARGS)
{
struct http *hp;
+ (void)cmd;
CAST_OBJ_NOTNULL(hp, priv, HTTP_MAGIC);
AZ(hp->client);
assert(!strcmp(av[0], "rxreq"));
@@ -432,7 +436,7 @@
*/
static void
-cmd_http_txreq(char **av, void *priv)
+cmd_http_txreq(CMD_ARGS)
{
struct http *hp;
struct vsb *vsb;
@@ -444,6 +448,7 @@
const char *nl = "\r\n";
int l;
+ (void)cmd;
CAST_OBJ_NOTNULL(hp, priv, HTTP_MAGIC);
AN(hp->client);
assert(!strcmp(av[0], "txreq"));
Modified: trunk/varnish-cache/bin/varnishtest/vtc_server.c
===================================================================
--- trunk/varnish-cache/bin/varnishtest/vtc_server.c 2008-06-22 21:41:20 UTC (rev 2776)
+++ trunk/varnish-cache/bin/varnishtest/vtc_server.c 2008-06-22 22:00:02 UTC (rev 2777)
@@ -203,11 +203,12 @@
*/
void
-cmd_server(char **av, void *priv)
+cmd_server(CMD_ARGS)
{
struct server *s, *s2;
(void)priv;
+ (void)cmd;
if (av == NULL) {
/* Reset and free */
Modified: trunk/varnish-cache/bin/varnishtest/vtc_stats.c
===================================================================
--- trunk/varnish-cache/bin/varnishtest/vtc_stats.c 2008-06-22 21:41:20 UTC (rev 2776)
+++ trunk/varnish-cache/bin/varnishtest/vtc_stats.c 2008-06-22 22:00:02 UTC (rev 2777)
@@ -32,8 +32,8 @@
#include "vtc.h"
void
-cmd_stats(char **av, void *priv)
+cmd_stats(CMD_ARGS)
{
- cmd_dump(av, priv);
+ cmd_dump(av, priv, cmd);
}
Modified: trunk/varnish-cache/bin/varnishtest/vtc_varnish.c
===================================================================
--- trunk/varnish-cache/bin/varnishtest/vtc_varnish.c 2008-06-22 21:41:20 UTC (rev 2776)
+++ trunk/varnish-cache/bin/varnishtest/vtc_varnish.c 2008-06-22 22:00:02 UTC (rev 2777)
@@ -409,11 +409,12 @@
*/
void
-cmd_varnish(char **av, void *priv)
+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