Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
varnish-cache
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Commits
Open sidebar
varnishcache
varnish-cache
Commits
8d3e4924
Commit
8d3e4924
authored
Mar 28, 2014
by
Dag Haavi Finstad
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
VCC default vcl -> builtin vcl renames.
parent
db1d3987
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
9 additions
and
9 deletions
+9
-9
mgt_vcc.c
bin/varnishd/mgt/mgt_vcc.c
+1
-1
libvcc.h
include/libvcc.h
+1
-1
vcc_compile.c
lib/libvcc/vcc_compile.c
+6
-6
vcc_compile.h
lib/libvcc/vcc_compile.h
+1
-1
No files found.
bin/varnishd/mgt/mgt_vcc.c
View file @
8d3e4924
...
...
@@ -488,7 +488,7 @@ mgt_vcc_init(void)
vcc
=
VCC_New
();
AN
(
vcc
);
VCC_
Default
_VCL
(
vcc
,
builtin_vcl
);
VCC_
Builtin
_VCL
(
vcc
,
builtin_vcl
);
AZ
(
atexit
(
mgt_vcc_atexit
));
}
...
...
include/libvcc.h
View file @
8d3e4924
...
...
@@ -31,7 +31,7 @@
struct
vcc
;
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_VMOD_dir
(
struct
vcc
*
,
const
char
*
str
);
void
VCC_Err_Unref
(
struct
vcc
*
tl
,
unsigned
u
);
...
...
lib/libvcc/vcc_compile.c
View file @
8d3e4924
...
...
@@ -489,7 +489,7 @@ vcc_NewVcc(const struct vcc *tl0)
ALLOC_OBJ
(
tl
,
VCC_MAGIC
);
AN
(
tl
);
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
->
vmod_dir
,
tl0
->
vmod_dir
);
tl
->
vars
=
tl0
->
vars
;
...
...
@@ -612,8 +612,8 @@ vcc_CompileSource(const struct vcc *tl0, struct vsb *sb, struct source *sp)
if
(
tl
->
err
)
return
(
vcc_DestroyTokenList
(
tl
,
NULL
));
/* Register and lex the
default
VCL */
sp
=
vcc_new_source
(
tl
->
default_vcl
,
NULL
,
"Default
"
);
/* Register and lex the
builtin
VCL */
sp
=
vcc_new_source
(
tl
->
builtin_vcl
,
NULL
,
"Builtin
"
);
assert
(
sp
!=
NULL
);
VTAILQ_INSERT_TAIL
(
&
tl
->
sources
,
sp
,
list
);
sp
->
idx
=
tl
->
nsources
++
;
...
...
@@ -736,15 +736,15 @@ VCC_New(void)
}
/*--------------------------------------------------------------------
* Configure
default
VCL source code
* Configure
builtin
VCL source code
*/
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
);
REPLACE
(
tl
->
default
_vcl
,
str
);
REPLACE
(
tl
->
builtin
_vcl
,
str
);
}
/*--------------------------------------------------------------------
...
...
lib/libvcc/vcc_compile.h
View file @
8d3e4924
...
...
@@ -160,7 +160,7 @@ struct vcc {
#define VCC_MAGIC 0x24ad719d
/* Parameter/Template section */
char
*
default
_vcl
;
char
*
builtin
_vcl
;
char
*
vcl_dir
;
char
*
vmod_dir
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment