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
5345cb03
Commit
5345cb03
authored
Mar 06, 2018
by
Poul-Henning Kamp
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
More VCL- vs. C-type cleanup
parent
5d1dd90a
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
41 additions
and
41 deletions
+41
-41
cache_vrt.c
bin/varnishd/cache/cache_vrt.c
+27
-25
vrt.h
include/vrt.h
+14
-16
No files found.
bin/varnishd/cache/cache_vrt.c
View file @
5345cb03
...
@@ -50,13 +50,13 @@ const void * const vrt_magic_string_unset = &vrt_magic_string_unset;
...
@@ -50,13 +50,13 @@ const void * const vrt_magic_string_unset = &vrt_magic_string_unset;
/*--------------------------------------------------------------------*/
/*--------------------------------------------------------------------*/
void
VCL_VOID
VRT_synth
(
VRT_CTX
,
unsigned
code
,
const
char
*
reason
)
VRT_synth
(
VRT_CTX
,
VCL_INT
code
,
VCL_STRING
reason
)
{
{
CHECK_OBJ_NOTNULL
(
ctx
,
VRT_CTX_MAGIC
);
CHECK_OBJ_NOTNULL
(
ctx
,
VRT_CTX_MAGIC
);
CHECK_OBJ_NOTNULL
(
ctx
->
req
,
REQ_MAGIC
);
CHECK_OBJ_NOTNULL
(
ctx
->
req
,
REQ_MAGIC
);
if
(
code
<
100
)
if
(
code
<
100
||
code
>
65535
)
code
=
503
;
code
=
503
;
ctx
->
req
->
err_code
=
(
uint16_t
)
code
;
ctx
->
req
->
err_code
=
(
uint16_t
)
code
;
ctx
->
req
->
err_reason
=
reason
?
reason
ctx
->
req
->
err_reason
=
reason
?
reason
...
@@ -87,7 +87,9 @@ VRT_acl_match(VRT_CTX, VCL_ACL acl, VCL_IP ip)
...
@@ -87,7 +87,9 @@ VRT_acl_match(VRT_CTX, VCL_ACL acl, VCL_IP ip)
return
(
acl
->
match
(
ctx
,
ip
));
return
(
acl
->
match
(
ctx
,
ip
));
}
}
void
/*--------------------------------------------------------------------*/
VCL_VOID
VRT_hit_for_pass
(
VRT_CTX
,
VCL_DURATION
d
)
VRT_hit_for_pass
(
VRT_CTX
,
VCL_DURATION
d
)
{
{
struct
objcore
*
oc
;
struct
objcore
*
oc
;
...
@@ -109,7 +111,7 @@ VRT_hit_for_pass(VRT_CTX, VCL_DURATION d)
...
@@ -109,7 +111,7 @@ VRT_hit_for_pass(VRT_CTX, VCL_DURATION d)
/*--------------------------------------------------------------------*/
/*--------------------------------------------------------------------*/
struct
http
*
VCL_HTTP
VRT_selecthttp
(
VRT_CTX
,
enum
gethdr_e
where
)
VRT_selecthttp
(
VRT_CTX
,
enum
gethdr_e
where
)
{
{
struct
http
*
hp
;
struct
http
*
hp
;
...
@@ -139,7 +141,7 @@ VRT_selecthttp(VRT_CTX, enum gethdr_e where)
...
@@ -139,7 +141,7 @@ VRT_selecthttp(VRT_CTX, enum gethdr_e where)
/*--------------------------------------------------------------------*/
/*--------------------------------------------------------------------*/
const
char
*
VCL_STRING
VRT_GetHdr
(
VRT_CTX
,
const
struct
gethdr_s
*
hs
)
VRT_GetHdr
(
VRT_CTX
,
const
struct
gethdr_s
*
hs
)
{
{
const
char
*
p
;
const
char
*
p
;
...
@@ -322,7 +324,7 @@ VRT_String(struct ws *ws, const char *h, const char *p, va_list ap)
...
@@ -322,7 +324,7 @@ VRT_String(struct ws *ws, const char *h, const char *p, va_list ap)
* Copy and merge a STRING_LIST on the current workspace
* Copy and merge a STRING_LIST on the current workspace
*/
*/
const
char
*
VCL_STRING
VRT_CollectString
(
VRT_CTX
,
const
char
*
p
,
...)
VRT_CollectString
(
VRT_CTX
,
const
char
*
p
,
...)
{
{
va_list
ap
;
va_list
ap
;
...
@@ -340,7 +342,7 @@ VRT_CollectString(VRT_CTX, const char *p, ...)
...
@@ -340,7 +342,7 @@ VRT_CollectString(VRT_CTX, const char *p, ...)
/*--------------------------------------------------------------------*/
/*--------------------------------------------------------------------*/
void
VCL_VOID
VRT_SetHdr
(
VRT_CTX
,
const
struct
gethdr_s
*
hs
,
VRT_SetHdr
(
VRT_CTX
,
const
struct
gethdr_s
*
hs
,
const
char
*
p
,
...)
const
char
*
p
,
...)
{
{
...
@@ -370,7 +372,7 @@ VRT_SetHdr(VRT_CTX , const struct gethdr_s *hs,
...
@@ -370,7 +372,7 @@ VRT_SetHdr(VRT_CTX , const struct gethdr_s *hs,
/*--------------------------------------------------------------------*/
/*--------------------------------------------------------------------*/
void
VCL_VOID
VRT_handling
(
VRT_CTX
,
unsigned
hand
)
VRT_handling
(
VRT_CTX
,
unsigned
hand
)
{
{
...
@@ -383,7 +385,7 @@ VRT_handling(VRT_CTX, unsigned hand)
...
@@ -383,7 +385,7 @@ VRT_handling(VRT_CTX, unsigned hand)
/*--------------------------------------------------------------------*/
/*--------------------------------------------------------------------*/
void
VCL_VOID
VRT_fail
(
VRT_CTX
,
const
char
*
fmt
,
...)
VRT_fail
(
VRT_CTX
,
const
char
*
fmt
,
...)
{
{
va_list
ap
;
va_list
ap
;
...
@@ -405,7 +407,7 @@ VRT_fail(VRT_CTX, const char *fmt, ...)
...
@@ -405,7 +407,7 @@ VRT_fail(VRT_CTX, const char *fmt, ...)
* Feed data into the hash calculation
* Feed data into the hash calculation
*/
*/
void
VCL_VOID
VRT_hashdata
(
VRT_CTX
,
const
char
*
str
,
...)
VRT_hashdata
(
VRT_CTX
,
const
char
*
str
,
...)
{
{
va_list
ap
;
va_list
ap
;
...
@@ -432,7 +434,7 @@ VRT_hashdata(VRT_CTX, const char *str, ...)
...
@@ -432,7 +434,7 @@ VRT_hashdata(VRT_CTX, const char *str, ...)
/*--------------------------------------------------------------------*/
/*--------------------------------------------------------------------*/
double
VCL_TIME
VRT_r_now
(
VRT_CTX
)
VRT_r_now
(
VRT_CTX
)
{
{
CHECK_OBJ_NOTNULL
(
ctx
,
VRT_CTX_MAGIC
);
CHECK_OBJ_NOTNULL
(
ctx
,
VRT_CTX_MAGIC
);
...
@@ -470,7 +472,7 @@ VRT_INT_string(VRT_CTX, VCL_INT num)
...
@@ -470,7 +472,7 @@ VRT_INT_string(VRT_CTX, VCL_INT num)
}
}
VCL_STRING
v_matchproto_
()
VCL_STRING
v_matchproto_
()
VRT_REAL_string
(
VRT_CTX
,
double
num
)
VRT_REAL_string
(
VRT_CTX
,
VCL_REAL
num
)
{
{
CHECK_OBJ_NOTNULL
(
ctx
,
VRT_CTX_MAGIC
);
CHECK_OBJ_NOTNULL
(
ctx
,
VRT_CTX_MAGIC
);
...
@@ -478,7 +480,7 @@ VRT_REAL_string(VRT_CTX, double num)
...
@@ -478,7 +480,7 @@ VRT_REAL_string(VRT_CTX, double num)
}
}
VCL_STRING
v_matchproto_
()
VCL_STRING
v_matchproto_
()
VRT_TIME_string
(
VRT_CTX
,
double
t
)
VRT_TIME_string
(
VRT_CTX
,
VCL_TIME
t
)
{
{
char
*
p
;
char
*
p
;
...
@@ -507,8 +509,8 @@ VRT_BOOL_string(VCL_BOOL val)
...
@@ -507,8 +509,8 @@ VRT_BOOL_string(VCL_BOOL val)
/*--------------------------------------------------------------------*/
/*--------------------------------------------------------------------*/
void
VCL_VOID
VRT_Rollback
(
VRT_CTX
,
const
struct
http
*
hp
)
VRT_Rollback
(
VRT_CTX
,
VCL_HTTP
hp
)
{
{
CHECK_OBJ_NOTNULL
(
ctx
,
VRT_CTX_MAGIC
);
CHECK_OBJ_NOTNULL
(
ctx
,
VRT_CTX_MAGIC
);
...
@@ -528,7 +530,7 @@ VRT_Rollback(VRT_CTX, const struct http *hp)
...
@@ -528,7 +530,7 @@ VRT_Rollback(VRT_CTX, const struct http *hp)
/*--------------------------------------------------------------------*/
/*--------------------------------------------------------------------*/
void
VCL_VOID
VRT_synth_page
(
VRT_CTX
,
const
char
*
str
,
...)
VRT_synth_page
(
VRT_CTX
,
const
char
*
str
,
...)
{
{
va_list
ap
;
va_list
ap
;
...
@@ -553,8 +555,8 @@ VRT_synth_page(VRT_CTX, const char *str, ...)
...
@@ -553,8 +555,8 @@ VRT_synth_page(VRT_CTX, const char *str, ...)
/*--------------------------------------------------------------------*/
/*--------------------------------------------------------------------*/
void
VCL_VOID
VRT_ban_string
(
VRT_CTX
,
const
char
*
str
)
VRT_ban_string
(
VRT_CTX
,
VCL_STRING
str
)
{
{
char
*
a1
,
*
a2
,
*
a3
;
char
*
a1
,
*
a2
,
*
a3
;
char
**
av
;
char
**
av
;
...
@@ -645,8 +647,8 @@ VRT_CacheReqBody(VRT_CTX, VCL_BYTES maxsize)
...
@@ -645,8 +647,8 @@ VRT_CacheReqBody(VRT_CTX, VCL_BYTES maxsize)
* purges
* purges
*/
*/
unsigned
VCL_INT
VRT_purge
(
VRT_CTX
,
double
ttl
,
double
grace
,
double
keep
)
VRT_purge
(
VRT_CTX
,
VCL_DURATION
ttl
,
VCL_DURATION
grace
,
VCL_DURATION
keep
)
{
{
CHECK_OBJ_NOTNULL
(
ctx
,
VRT_CTX_MAGIC
);
CHECK_OBJ_NOTNULL
(
ctx
,
VRT_CTX_MAGIC
);
...
@@ -711,16 +713,16 @@ VRT_memmove(void *dst, const void *src, unsigned len)
...
@@ -711,16 +713,16 @@ VRT_memmove(void *dst, const void *src, unsigned len)
(
void
)
memmove
(
dst
,
src
,
len
);
(
void
)
memmove
(
dst
,
src
,
len
);
}
}
int
VCL_BOOL
VRT_ipcmp
(
const
struct
suckaddr
*
sua1
,
const
struct
suckaddr
*
sua2
)
VRT_ipcmp
(
VCL_IP
sua1
,
VCL_IP
sua2
)
{
{
if
(
sua1
==
NULL
||
sua2
==
NULL
)
if
(
sua1
==
NULL
||
sua2
==
NULL
)
return
(
1
);
return
(
1
);
return
(
VSA_Compare_IP
(
sua1
,
sua2
));
return
(
VSA_Compare_IP
(
sua1
,
sua2
));
}
}
struct
vmod_priv
*
VCL_BLOB
VRT_blob
(
VRT_CTX
,
const
char
*
err
,
const
uint8_t
*
src
,
size_t
len
)
VRT_blob
(
VRT_CTX
,
const
char
*
err
,
const
void
*
src
,
size_t
len
)
{
{
struct
vmod_priv
*
p
;
struct
vmod_priv
*
p
;
void
*
d
;
void
*
d
;
...
...
include/vrt.h
View file @
5345cb03
...
@@ -364,8 +364,8 @@ struct gethdr_s {
...
@@ -364,8 +364,8 @@ struct gethdr_s {
const
char
*
what
;
const
char
*
what
;
};
};
struct
http
*
VRT_selecthttp
(
VRT_CTX
,
enum
gethdr_e
);
VCL_HTTP
VRT_selecthttp
(
VRT_CTX
,
enum
gethdr_e
);
const
char
*
VRT_GetHdr
(
VRT_CTX
,
const
struct
gethdr_s
*
);
VCL_STRING
VRT_GetHdr
(
VRT_CTX
,
const
struct
gethdr_s
*
);
/***********************************************************************
/***********************************************************************
* req related
* req related
...
@@ -376,28 +376,26 @@ VCL_BYTES VRT_CacheReqBody(VRT_CTX, VCL_BYTES maxsize);
...
@@ -376,28 +376,26 @@ VCL_BYTES VRT_CacheReqBody(VRT_CTX, VCL_BYTES maxsize);
/* Regexp related */
/* Regexp related */
const
char
*
VRT_regsub
(
VRT_CTX
,
int
all
,
const
char
*
,
void
*
,
const
char
*
);
const
char
*
VRT_regsub
(
VRT_CTX
,
int
all
,
const
char
*
,
void
*
,
const
char
*
);
void
VRT_ban_string
(
VRT_CTX
,
const
char
*
);
VCL_VOID
VRT_ban_string
(
VRT_CTX
,
VCL_STRING
);
unsigned
VRT_purge
(
VRT_CTX
,
double
ttl
,
double
grace
,
double
keep
);
VCL_INT
VRT_purge
(
VRT_CTX
,
VCL_DURATION
,
VCL_DURATION
,
VCL_DURATION
);
VCL_VOID
VRT_synth
(
VRT_CTX
,
VCL_INT
,
VCL_STRING
);
VCL_VOID
VRT_hit_for_pass
(
VRT_CTX
,
VCL_DURATION
);
void
VRT_synth
(
VRT_CTX
,
unsigned
,
const
char
*
);
VCL_VOID
VRT_SetHdr
(
VRT_CTX
,
const
struct
gethdr_s
*
,
const
char
*
,
...);
void
VRT_hit_for_pass
(
VRT_CTX
,
VCL_DURATION
);
VCL_VOID
VRT_handling
(
VRT_CTX
,
unsigned
hand
);
VCL_VOID
VRT_fail
(
VRT_CTX
,
const
char
*
fmt
,
...)
v_printflike_
(
2
,
3
);
void
VRT_SetHdr
(
VRT_CTX
,
const
struct
gethdr_s
*
,
const
char
*
,
...);
VCL_VOID
VRT_hashdata
(
VRT_CTX
,
const
char
*
str
,
...);
void
VRT_handling
(
VRT_CTX
,
unsigned
hand
);
void
VRT_fail
(
VRT_CTX
,
const
char
*
fmt
,
...)
v_printflike_
(
2
,
3
);
void
VRT_hashdata
(
VRT_CTX
,
const
char
*
str
,
...);
/* Simple stuff */
/* Simple stuff */
int
VRT_strcmp
(
const
char
*
s1
,
const
char
*
s2
);
int
VRT_strcmp
(
const
char
*
s1
,
const
char
*
s2
);
void
VRT_memmove
(
void
*
dst
,
const
void
*
src
,
unsigned
len
);
void
VRT_memmove
(
void
*
dst
,
const
void
*
src
,
unsigned
len
);
int
VRT_ipcmp
(
const
struct
suckaddr
*
sua1
,
const
struct
suckaddr
*
sua2
);
VCL_BOOL
VRT_ipcmp
(
VCL_IP
,
VCL_IP
);
struct
vmod_priv
*
VRT_blob
(
VRT_CTX
,
const
char
*
,
const
uint8_t
*
,
size_t
);
VCL_BLOB
VRT_blob
(
VRT_CTX
,
const
char
*
,
const
void
*
,
size_t
);
void
VRT_Rollback
(
VRT_CTX
,
const
struct
http
*
);
VCL_VOID
VRT_Rollback
(
VRT_CTX
,
VCL_HTTP
);
/* Synthetic pages */
/* Synthetic pages */
void
VRT_synth_page
(
VRT_CTX
,
const
char
*
,
...);
VCL_VOID
VRT_synth_page
(
VRT_CTX
,
const
char
*
,
...);
/* Backend related */
/* Backend related */
struct
director
*
VRT_new_backend
(
VRT_CTX
,
const
struct
vrt_backend
*
);
struct
director
*
VRT_new_backend
(
VRT_CTX
,
const
struct
vrt_backend
*
);
...
...
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