Skip to content

V
varnish-objvar
Unverified Commit a46d462c authored by Nils Goroll's avatar Nils Goroll
Browse files
Options

Polish

parent f68e5ca9
Hide whitespace changes
Inline Side-by-side
Showing with 17 additions and 4 deletions
src/vmod_constant.c
View file @ a46d462c
...@@ -62,7 +62,7 @@ ...@@ -62,7 +62,7 @@
#define var_code(vmod_, VMODPFX_, vmodpfx_, TYPE, type) \ #define var_code(vmod_, VMODPFX_, vmodpfx_, TYPE, type) \
struct vmodpfx_ ## type { \ struct vmodpfx_ ## type { \
uint16_t magic; \ uint16_t magic; \
int defined:1; \ unsigned defined:1; \
VCL_ ## TYPE var; \ VCL_ ## TYPE var; \
}; \ }; \
\ \
...@@ -108,6 +108,9 @@ ...@@ -108,6 +108,9 @@
vmod_ ## type ## _get(VRT_CTX, struct vmodpfx_ ## type *v, \ vmod_ ## type ## _get(VRT_CTX, struct vmodpfx_ ## type *v, \
VCL_ ## TYPE fallback) \ VCL_ ## TYPE fallback) \
{ \ { \
\
(void) ctx; \
\
CHECK_OBJ_NOTNULL(v, VMODPFX_ ## TYPE ## _MAGIC); \ CHECK_OBJ_NOTNULL(v, VMODPFX_ ## TYPE ## _MAGIC); \
\ \
if (v->defined) \ if (v->defined) \
...@@ -119,6 +122,9 @@ ...@@ -119,6 +122,9 @@
VCL_BOOL \ VCL_BOOL \
vmod_ ## type ## _defined(VRT_CTX, struct vmodpfx_ ## type *v) \ vmod_ ## type ## _defined(VRT_CTX, struct vmodpfx_ ## type *v) \
{ \ { \
\
(void) ctx; \
\
CHECK_OBJ_NOTNULL(v, VMODPFX_ ## TYPE ## _MAGIC); \ CHECK_OBJ_NOTNULL(v, VMODPFX_ ## TYPE ## _MAGIC); \
\ \
return (!!v->defined); \ return (!!v->defined); \
......
src/vmod_globalvar.c
View file @ a46d462c
...@@ -152,14 +152,15 @@ task_ref_var(VRT_CTX, struct vmod_globalvar_var *v, unsigned magic) { ...@@ -152,14 +152,15 @@ task_ref_var(VRT_CTX, struct vmod_globalvar_var *v, unsigned magic) {
#define immediate(vmod_, VMODPFX_, vmodpfx_, TYPE, type) \ #define immediate(vmod_, VMODPFX_, vmodpfx_, TYPE, type) \
struct vmodpfx_ ## type { \ struct vmodpfx_ ## type { \
uint16_t magic; \ uint16_t magic; \
int defined:1; \ unsigned defined:1; \
VCL_ ## TYPE var; \ VCL_ ## TYPE var; \
}; \ }; \
\ \
static inline void \ static inline void \
init_var_ ## type(struct vmodpfx_ ## type *v) \ init_var_ ## type(struct vmodpfx_ ## type *v) \
{ \ { \
(void)0; \ \
(void) v; \
} \ } \
\ \
static inline void \ static inline void \
...@@ -195,7 +196,7 @@ task_ref_var(VRT_CTX, struct vmod_globalvar_var *v, unsigned magic) { ...@@ -195,7 +196,7 @@ task_ref_var(VRT_CTX, struct vmod_globalvar_var *v, unsigned magic) {
#define pointer(vmod_, VMODPFX_, vmodpfx_, TYPE, type) \ #define pointer(vmod_, VMODPFX_, vmodpfx_, TYPE, type) \
struct vmodpfx_ ## type { \ struct vmodpfx_ ## type { \
uint16_t magic; \ uint16_t magic; \
int defined:1; \ unsigned defined:1; \
pthread_mutex_t mtx; \ pthread_mutex_t mtx; \
struct vmod_globalvar_var *var; \ struct vmod_globalvar_var *var; \
}; \ }; \
...@@ -218,6 +219,7 @@ task_ref_var(VRT_CTX, struct vmod_globalvar_var *v, unsigned magic) { ...@@ -218,6 +219,7 @@ task_ref_var(VRT_CTX, struct vmod_globalvar_var *v, unsigned magic) {
{ \ { \
VCL_ ## TYPE vv = v; \ VCL_ ## TYPE vv = v; \
FREE_ ## TYPE(vv); \ FREE_ ## TYPE(vv); \
AZ(vv); \
} \ } \
\ \
static inline void \ static inline void \
...@@ -325,6 +327,8 @@ task_ref_var(VRT_CTX, struct vmod_globalvar_var *v, unsigned magic) { ...@@ -325,6 +327,8 @@ task_ref_var(VRT_CTX, struct vmod_globalvar_var *v, unsigned magic) {
vmod_ ## type ## _set(VRT_CTX, struct vmodpfx_ ## type *v, \ vmod_ ## type ## _set(VRT_CTX, struct vmodpfx_ ## type *v, \
VCL_ ## TYPE val) \ VCL_ ## TYPE val) \
{ \ { \
\
(void) ctx; \
CHECK_OBJ_NOTNULL(v, VMODPFX_ ## TYPE ## _MAGIC); \ CHECK_OBJ_NOTNULL(v, VMODPFX_ ## TYPE ## _MAGIC); \
\ \
set_var_ ## type(v, val); \ set_var_ ## type(v, val); \
...@@ -335,6 +339,7 @@ task_ref_var(VRT_CTX, struct vmod_globalvar_var *v, unsigned magic) { ...@@ -335,6 +339,7 @@ task_ref_var(VRT_CTX, struct vmod_globalvar_var *v, unsigned magic) {
{ \ { \
struct vmod_globalvar_var *o; \ struct vmod_globalvar_var *o; \
\ \
(void) ctx; \
CHECK_OBJ_NOTNULL(v, VMODPFX_ ## TYPE ## _MAGIC); \ CHECK_OBJ_NOTNULL(v, VMODPFX_ ## TYPE ## _MAGIC); \
\ \
if (! v->defined) \ if (! v->defined) \
...@@ -346,6 +351,8 @@ task_ref_var(VRT_CTX, struct vmod_globalvar_var *v, unsigned magic) { ...@@ -346,6 +351,8 @@ task_ref_var(VRT_CTX, struct vmod_globalvar_var *v, unsigned magic) {
VCL_BOOL \ VCL_BOOL \
vmod_ ## type ## _defined(VRT_CTX, struct vmodpfx_ ## type *v) \ vmod_ ## type ## _defined(VRT_CTX, struct vmodpfx_ ## type *v) \
{ \ { \
\
(void) ctx; \
CHECK_OBJ_NOTNULL(v, VMODPFX_ ## TYPE ## _MAGIC); \ CHECK_OBJ_NOTNULL(v, VMODPFX_ ## TYPE ## _MAGIC); \
\ \
return (!!v->defined); \ return (!!v->defined); \
......
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