Commit 6d5c7338 authored by Poul-Henning Kamp's avatar Poul-Henning Kamp

Variable rename for easier searching.

parent f564428b
...@@ -56,7 +56,7 @@ ...@@ -56,7 +56,7 @@
#define MAGIC_INIT_STRING "\001" #define MAGIC_INIT_STRING "\001"
struct params mgt_param; struct params mgt_param;
static int nparspec; static int nparspec;
static struct parspec const ** parspec; static struct parspec const ** parspecs;
static int margin; static int margin;
/*--------------------------------------------------------------------*/ /*--------------------------------------------------------------------*/
...@@ -67,8 +67,8 @@ mcf_findpar(const char *name) ...@@ -67,8 +67,8 @@ mcf_findpar(const char *name)
int i; int i;
for (i = 0; i < nparspec; i++) for (i = 0; i < nparspec; i++)
if (!strcmp(parspec[i]->name, name)) if (!strcmp(parspecs[i]->name, name))
return (parspec[i]); return (parspecs[i]);
return (NULL); return (NULL);
} }
...@@ -1289,7 +1289,7 @@ mcf_param_show(struct cli *cli, const char * const *av, void *priv) ...@@ -1289,7 +1289,7 @@ mcf_param_show(struct cli *cli, const char * const *av, void *priv)
else else
lfmt = 1; lfmt = 1;
for (i = 0; i < nparspec; i++) { for (i = 0; i < nparspec; i++) {
pp = parspec[i]; pp = parspecs[i];
if (av[2] != NULL && !lfmt && strcmp(pp->name, av[2])) if (av[2] != NULL && !lfmt && strcmp(pp->name, av[2]))
continue; continue;
VCLI_Out(cli, "%-*s ", margin, pp->name); VCLI_Out(cli, "%-*s ", margin, pp->name);
...@@ -1398,12 +1398,12 @@ MCF_AddParams(const struct parspec *ps) ...@@ -1398,12 +1398,12 @@ MCF_AddParams(const struct parspec *ps)
margin = strlen(pp->name) + 1; margin = strlen(pp->name) + 1;
n++; n++;
} }
parspec = realloc(parspec, (1L + nparspec + n) * sizeof *parspec); parspecs = realloc(parspecs, (1L + nparspec + n) * sizeof *parspecs);
XXXAN(parspec); XXXAN(parspecs);
for (pp = ps; pp->name != NULL; pp++) for (pp = ps; pp->name != NULL; pp++)
parspec[nparspec++] = pp; parspecs[nparspec++] = pp;
parspec[nparspec] = NULL; parspecs[nparspec] = NULL;
qsort (parspec, nparspec, sizeof parspec[0], parspec_cmp); qsort (parspecs, nparspec, sizeof parspecs[0], parspec_cmp);
} }
/*-------------------------------------------------------------------- /*--------------------------------------------------------------------
...@@ -1417,7 +1417,7 @@ MCF_SetDefaults(struct cli *cli) ...@@ -1417,7 +1417,7 @@ MCF_SetDefaults(struct cli *cli)
int i; int i;
for (i = 0; i < nparspec; i++) { for (i = 0; i < nparspec; i++) {
pp = parspec[i]; pp = parspecs[i];
if (cli != NULL) if (cli != NULL)
VCLI_Out(cli, VCLI_Out(cli,
"Set Default for %s = %s\n", pp->name, pp->def); "Set Default for %s = %s\n", pp->name, pp->def);
...@@ -1453,7 +1453,7 @@ MCF_DumpRst(void) ...@@ -1453,7 +1453,7 @@ MCF_DumpRst(void)
printf("\n.. The following is the autogenerated " printf("\n.. The following is the autogenerated "
"output from varnishd -x dumprst\n\n"); "output from varnishd -x dumprst\n\n");
for (i = 0; i < nparspec; i++) { for (i = 0; i < nparspec; i++) {
pp = parspec[i]; pp = parspecs[i];
printf("%s\n", pp->name); printf("%s\n", pp->name);
if (pp->units != NULL && *pp->units != '\0') if (pp->units != NULL && *pp->units != '\0')
printf("\t- Units: %s\n", pp->units); printf("\t- Units: %s\n", pp->units);
......
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