Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
U
unique-xids
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
uplex-varnish
unique-xids
Commits
444e642f
Commit
444e642f
authored
Apr 23, 2012
by
Poul-Henning Kamp
Committed by
Tollef Fog Heen
May 24, 2012
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add an explicit macro_undef() function so we don't pass a NULL
argument to a printflike function.
parent
09dedf3c
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
38 additions
and
18 deletions
+38
-18
vtc.c
bin/varnishtest/vtc.c
+31
-12
vtc.h
bin/varnishtest/vtc.h
+1
-0
vtc_server.c
bin/varnishtest/vtc_server.c
+3
-3
vtc_varnish.c
bin/varnishtest/vtc_varnish.c
+3
-3
No files found.
bin/varnishtest/vtc.c
View file @
444e642f
...
@@ -90,6 +90,8 @@ macro_def(struct vtclog *vl, const char *instance, const char *name,
...
@@ -90,6 +90,8 @@ macro_def(struct vtclog *vl, const char *instance, const char *name,
struct
macro
*
m
;
struct
macro
*
m
;
va_list
ap
;
va_list
ap
;
AN
(
fmt
);
if
(
instance
!=
NULL
)
{
if
(
instance
!=
NULL
)
{
bprintf
(
buf1
,
"%s_%s"
,
instance
,
name
);
bprintf
(
buf1
,
"%s_%s"
,
instance
,
name
);
name
=
buf1
;
name
=
buf1
;
...
@@ -99,13 +101,12 @@ macro_def(struct vtclog *vl, const char *instance, const char *name,
...
@@ -99,13 +101,12 @@ macro_def(struct vtclog *vl, const char *instance, const char *name,
VTAILQ_FOREACH
(
m
,
&
macro_list
,
list
)
VTAILQ_FOREACH
(
m
,
&
macro_list
,
list
)
if
(
!
strcmp
(
name
,
m
->
name
))
if
(
!
strcmp
(
name
,
m
->
name
))
break
;
break
;
if
(
m
==
NULL
&&
fmt
!=
NULL
)
{
if
(
m
==
NULL
)
{
m
=
calloc
(
sizeof
*
m
,
1
);
m
=
calloc
(
sizeof
*
m
,
1
);
AN
(
m
);
AN
(
m
);
REPLACE
(
m
->
name
,
name
);
REPLACE
(
m
->
name
,
name
);
VTAILQ_INSERT_TAIL
(
&
macro_list
,
m
,
list
);
VTAILQ_INSERT_TAIL
(
&
macro_list
,
m
,
list
);
}
}
if
(
fmt
!=
NULL
)
{
AN
(
m
);
AN
(
m
);
va_start
(
ap
,
fmt
);
va_start
(
ap
,
fmt
);
free
(
m
->
val
);
free
(
m
->
val
);
...
@@ -115,7 +116,25 @@ macro_def(struct vtclog *vl, const char *instance, const char *name,
...
@@ -115,7 +116,25 @@ macro_def(struct vtclog *vl, const char *instance, const char *name,
m
->
val
=
strdup
(
buf2
);
m
->
val
=
strdup
(
buf2
);
AN
(
m
->
val
);
AN
(
m
->
val
);
vtc_log
(
vl
,
4
,
"macro def %s=%s"
,
name
,
m
->
val
);
vtc_log
(
vl
,
4
,
"macro def %s=%s"
,
name
,
m
->
val
);
}
else
if
(
m
!=
NULL
)
{
AZ
(
pthread_mutex_unlock
(
&
macro_mtx
));
}
void
macro_undef
(
struct
vtclog
*
vl
,
const
char
*
instance
,
const
char
*
name
)
{
char
buf1
[
256
];
struct
macro
*
m
;
if
(
instance
!=
NULL
)
{
bprintf
(
buf1
,
"%s_%s"
,
instance
,
name
);
name
=
buf1
;
}
AZ
(
pthread_mutex_lock
(
&
macro_mtx
));
VTAILQ_FOREACH
(
m
,
&
macro_list
,
list
)
if
(
!
strcmp
(
name
,
m
->
name
))
break
;
if
(
m
!=
NULL
)
{
vtc_log
(
vl
,
4
,
"macro undef %s"
,
name
);
vtc_log
(
vl
,
4
,
"macro undef %s"
,
name
);
VTAILQ_REMOVE
(
&
macro_list
,
m
,
list
);
VTAILQ_REMOVE
(
&
macro_list
,
m
,
list
);
free
(
m
->
name
);
free
(
m
->
name
);
...
...
bin/varnishtest/vtc.h
View file @
444e642f
...
@@ -80,6 +80,7 @@ void vtc_hexdump(struct vtclog *vl, int lvl, const char *pfx,
...
@@ -80,6 +80,7 @@ void vtc_hexdump(struct vtclog *vl, int lvl, const char *pfx,
int
exec_file
(
const
char
*
fn
,
const
char
*
script
,
const
char
*
tmpdir
,
int
exec_file
(
const
char
*
fn
,
const
char
*
script
,
const
char
*
tmpdir
,
char
*
logbuf
,
unsigned
loglen
);
char
*
logbuf
,
unsigned
loglen
);
void
macro_undef
(
struct
vtclog
*
vl
,
const
char
*
instance
,
const
char
*
name
);
void
macro_def
(
struct
vtclog
*
vl
,
const
char
*
instance
,
const
char
*
name
,
void
macro_def
(
struct
vtclog
*
vl
,
const
char
*
instance
,
const
char
*
name
,
const
char
*
fmt
,
...);
const
char
*
fmt
,
...);
struct
vsb
*
macro_expand
(
struct
vtclog
*
vl
,
const
char
*
text
);
struct
vsb
*
macro_expand
(
struct
vtclog
*
vl
,
const
char
*
text
);
...
...
bin/varnishtest/vtc_server.c
View file @
444e642f
...
@@ -147,9 +147,9 @@ server_delete(struct server *s)
...
@@ -147,9 +147,9 @@ server_delete(struct server *s)
{
{
CHECK_OBJ_NOTNULL
(
s
,
SERVER_MAGIC
);
CHECK_OBJ_NOTNULL
(
s
,
SERVER_MAGIC
);
macro_
def
(
s
->
vl
,
s
->
name
,
"addr"
,
NULL
);
macro_
undef
(
s
->
vl
,
s
->
name
,
"addr"
);
macro_
def
(
s
->
vl
,
s
->
name
,
"port"
,
NULL
);
macro_
undef
(
s
->
vl
,
s
->
name
,
"port"
);
macro_
def
(
s
->
vl
,
s
->
name
,
"sock"
,
NULL
);
macro_
undef
(
s
->
vl
,
s
->
name
,
"sock"
);
vtc_logclose
(
s
->
vl
);
vtc_logclose
(
s
->
vl
);
free
(
s
->
name
);
free
(
s
->
name
);
/* XXX: MEMLEAK (?) (VSS ??) */
/* XXX: MEMLEAK (?) (VSS ??) */
...
...
bin/varnishtest/vtc_varnish.c
View file @
444e642f
...
@@ -527,9 +527,9 @@ varnish_stop(struct varnish *v)
...
@@ -527,9 +527,9 @@ varnish_stop(struct varnish *v)
varnish_launch
(
v
);
varnish_launch
(
v
);
if
(
vtc_error
)
if
(
vtc_error
)
return
;
return
;
macro_
def
(
v
->
vl
,
v
->
name
,
"addr"
,
NULL
);
macro_
undef
(
v
->
vl
,
v
->
name
,
"addr"
);
macro_
def
(
v
->
vl
,
v
->
name
,
"port"
,
NULL
);
macro_
undef
(
v
->
vl
,
v
->
name
,
"port"
);
macro_
def
(
v
->
vl
,
v
->
name
,
"sock"
,
NULL
);
macro_
undef
(
v
->
vl
,
v
->
name
,
"sock"
);
vtc_log
(
v
->
vl
,
2
,
"Stop"
);
vtc_log
(
v
->
vl
,
2
,
"Stop"
);
(
void
)
varnish_ask_cli
(
v
,
"stop"
,
NULL
);
(
void
)
varnish_ask_cli
(
v
,
"stop"
,
NULL
);
while
(
1
)
{
while
(
1
)
{
...
...
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