Commit 8d3e4924 authored by Dag Haavi Finstad's avatar Dag Haavi Finstad

VCC default vcl -> builtin vcl renames.

parent db1d3987
...@@ -488,7 +488,7 @@ mgt_vcc_init(void) ...@@ -488,7 +488,7 @@ mgt_vcc_init(void)
vcc = VCC_New(); vcc = VCC_New();
AN(vcc); AN(vcc);
VCC_Default_VCL(vcc, builtin_vcl); VCC_Builtin_VCL(vcc, builtin_vcl);
AZ(atexit(mgt_vcc_atexit)); AZ(atexit(mgt_vcc_atexit));
} }
......
...@@ -31,7 +31,7 @@ ...@@ -31,7 +31,7 @@
struct vcc; struct vcc;
struct vcc *VCC_New(void); struct vcc *VCC_New(void);
void VCC_Default_VCL(struct vcc *, const char *str); void VCC_Builtin_VCL(struct vcc *, const char *str);
void VCC_VCL_dir(struct vcc *, const char *str); void VCC_VCL_dir(struct vcc *, const char *str);
void VCC_VMOD_dir(struct vcc *, const char *str); void VCC_VMOD_dir(struct vcc *, const char *str);
void VCC_Err_Unref(struct vcc *tl, unsigned u); void VCC_Err_Unref(struct vcc *tl, unsigned u);
......
...@@ -489,7 +489,7 @@ vcc_NewVcc(const struct vcc *tl0) ...@@ -489,7 +489,7 @@ vcc_NewVcc(const struct vcc *tl0)
ALLOC_OBJ(tl, VCC_MAGIC); ALLOC_OBJ(tl, VCC_MAGIC);
AN(tl); AN(tl);
if (tl0 != NULL) { if (tl0 != NULL) {
REPLACE(tl->default_vcl, tl0->default_vcl); REPLACE(tl->builtin_vcl, tl0->builtin_vcl);
REPLACE(tl->vcl_dir, tl0->vcl_dir); REPLACE(tl->vcl_dir, tl0->vcl_dir);
REPLACE(tl->vmod_dir, tl0->vmod_dir); REPLACE(tl->vmod_dir, tl0->vmod_dir);
tl->vars = tl0->vars; tl->vars = tl0->vars;
...@@ -612,8 +612,8 @@ vcc_CompileSource(const struct vcc *tl0, struct vsb *sb, struct source *sp) ...@@ -612,8 +612,8 @@ vcc_CompileSource(const struct vcc *tl0, struct vsb *sb, struct source *sp)
if (tl->err) if (tl->err)
return (vcc_DestroyTokenList(tl, NULL)); return (vcc_DestroyTokenList(tl, NULL));
/* Register and lex the default VCL */ /* Register and lex the builtin VCL */
sp = vcc_new_source(tl->default_vcl, NULL, "Default"); sp = vcc_new_source(tl->builtin_vcl, NULL, "Builtin");
assert(sp != NULL); assert(sp != NULL);
VTAILQ_INSERT_TAIL(&tl->sources, sp, list); VTAILQ_INSERT_TAIL(&tl->sources, sp, list);
sp->idx = tl->nsources++; sp->idx = tl->nsources++;
...@@ -736,15 +736,15 @@ VCC_New(void) ...@@ -736,15 +736,15 @@ VCC_New(void)
} }
/*-------------------------------------------------------------------- /*--------------------------------------------------------------------
* Configure default VCL source code * Configure builtin VCL source code
*/ */
void void
VCC_Default_VCL(struct vcc *tl, const char *str) VCC_Builtin_VCL(struct vcc *tl, const char *str)
{ {
CHECK_OBJ_NOTNULL(tl, VCC_MAGIC); CHECK_OBJ_NOTNULL(tl, VCC_MAGIC);
REPLACE(tl->default_vcl, str); REPLACE(tl->builtin_vcl, str);
} }
/*-------------------------------------------------------------------- /*--------------------------------------------------------------------
......
...@@ -160,7 +160,7 @@ struct vcc { ...@@ -160,7 +160,7 @@ struct vcc {
#define VCC_MAGIC 0x24ad719d #define VCC_MAGIC 0x24ad719d
/* Parameter/Template section */ /* Parameter/Template section */
char *default_vcl; char *builtin_vcl;
char *vcl_dir; char *vcl_dir;
char *vmod_dir; char *vmod_dir;
......
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