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
aa350825
Commit
aa350825
authored
Apr 18, 2017
by
Dridi Boukelmoune
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Simplify VUT options initialization
We don't need an indirection in a separate C file per VUT.
parent
12814efb
Changes
15
Show whitespace changes
Inline
Side-by-side
Showing
15 changed files
with
24 additions
and
182 deletions
+24
-182
Makefile.am
bin/varnishhist/Makefile.am
+3
-3
varnishhist.c
bin/varnishhist/varnishhist.c
+3
-0
varnishhist_options.c
bin/varnishhist/varnishhist_options.c
+0
-34
Makefile.am
bin/varnishlog/Makefile.am
+1
-2
varnishlog.c
bin/varnishlog/varnishlog.c
+4
-0
varnishlog_options.c
bin/varnishlog/varnishlog_options.c
+0
-35
Makefile.am
bin/varnishncsa/Makefile.am
+0
-1
varnishncsa.c
bin/varnishncsa/varnishncsa.c
+3
-0
varnishncsa_options.c
bin/varnishncsa/varnishncsa_options.c
+0
-34
Makefile.am
bin/varnishstat/Makefile.am
+1
-2
varnishstat.c
bin/varnishstat/varnishstat.c
+3
-0
varnishstat_options.c
bin/varnishstat/varnishstat_options.c
+0
-34
Makefile.am
bin/varnishtop/Makefile.am
+3
-3
varnishtop.c
bin/varnishtop/varnishtop.c
+3
-0
varnishtop_options.c
bin/varnishtop/varnishtop_options.c
+0
-34
No files found.
bin/varnishhist/Makefile.am
View file @
aa350825
...
...
@@ -6,10 +6,10 @@ AM_CPPFLAGS = \
bin_PROGRAMS
=
varnishhist
varnishhist_SOURCES
=
varnishhist.c
\
varnishhist_SOURCES
=
\
varnishhist.c
\
varnishhist_options.h
\
varnishhist_profiles.h
\
varnishhist_options.c
varnishhist_profiles.h
varnishhist_CFLAGS
=
\
@SAN_CFLAGS@
...
...
bin/varnishhist/varnishhist.c
View file @
aa350825
...
...
@@ -42,6 +42,9 @@
#include <string.h>
#include <unistd.h>
#define VOPT_DEFINITION
#define VOPT_INC "varnishhist_options.h"
#include "vdef.h"
#include "vcurses.h"
#include "vapi/vsl.h"
...
...
bin/varnishhist/varnishhist_options.c
deleted
100644 → 0
View file @
12814efb
/*-
* Copyright (c) 2014 Varnish Software AS
* All rights reserved.
*
* Author: Martin Blix Grydeland <martin@varnish-software.com>
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
*
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
* ARE DISCLAIMED. IN NO EVENT SHALL AUTHOR OR CONTRIBUTORS BE LIABLE
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
* Option definitions for varnishhist
*/
#include <stdlib.h>
#define VOPT_DEFINITION
#define VOPT_INC "varnishhist_options.h"
#include "vapi/voptget.h"
bin/varnishlog/Makefile.am
View file @
aa350825
...
...
@@ -8,8 +8,7 @@ bin_PROGRAMS = varnishlog
varnishlog_SOURCES
=
\
varnishlog.c
\
varnishlog_options.h
\
varnishlog_options.c
varnishlog_options.h
varnishlog_CFLAGS
=
\
@SAN_CFLAGS@
...
...
bin/varnishlog/varnishlog.c
View file @
aa350825
...
...
@@ -39,6 +39,10 @@
#include <errno.h>
#include <stdint.h>
#define VOPT_DEFINITION
#define VOPT_INC "varnishlog_options.h"
#include "vapi/vsm.h"
#include "vapi/vsl.h"
#include "vapi/voptget.h"
#include "vas.h"
...
...
bin/varnishlog/varnishlog_options.c
deleted
100644 → 0
View file @
12814efb
/*-
* Copyright (c) 2006 Verdens Gang AS
* Copyright (c) 2006-2014 Varnish Software AS
* All rights reserved.
*
* Author: Martin Blix Grydeland <martin@varnish-software.com>
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
*
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
* ARE DISCLAIMED. IN NO EVENT SHALL AUTHOR OR CONTRIBUTORS BE LIABLE
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
* Option definitions for varnishlog
*/
#include <stdlib.h>
#define VOPT_DEFINITION
#define VOPT_INC "varnishlog_options.h"
#include "vapi/voptget.h"
bin/varnishncsa/Makefile.am
View file @
aa350825
...
...
@@ -9,7 +9,6 @@ bin_PROGRAMS = varnishncsa
varnishncsa_SOURCES
=
\
varnishncsa.c
\
varnishncsa_options.h
\
varnishncsa_options.c
\
base64.h
\
base64.c
...
...
bin/varnishncsa/varnishncsa.c
View file @
aa350825
...
...
@@ -53,6 +53,9 @@
#include <time.h>
#include <math.h>
#define VOPT_DEFINITION
#define VOPT_INC "varnishncsa_options.h"
#include "base64.h"
#include "vapi/vsl.h"
#include "vapi/voptget.h"
...
...
bin/varnishncsa/varnishncsa_options.c
deleted
100644 → 0
View file @
12814efb
/*-
* Copyright (c) 2013-2015 Varnish Software AS
* All rights reserved.
*
* Author: Martin Blix Grydeland <martin@varnish-software.com>
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
*
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
* ARE DISCLAIMED. IN NO EVENT SHALL AUTHOR OR CONTRIBUTORS BE LIABLE
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
* Option definitions for varnishlog
*/
#include <stdlib.h>
#define VOPT_DEFINITION
#define VOPT_INC "varnishncsa_options.h"
#include "vapi/voptget.h"
bin/varnishstat/Makefile.am
View file @
aa350825
...
...
@@ -10,8 +10,7 @@ varnishstat_SOURCES = \
varnishstat.h
\
varnishstat.c
\
varnishstat_curses.c
\
varnishstat_options.h
\
varnishstat_options.c
varnishstat_options.h
varnishstat_CFLAGS
=
\
@SAN_CFLAGS@
...
...
bin/varnishstat/varnishstat.c
View file @
aa350825
...
...
@@ -39,6 +39,9 @@
#include <unistd.h>
#include <math.h>
#define VOPT_DEFINITION
#define VOPT_INC "varnishstat_options.h"
#include "vapi/voptget.h"
#include "vapi/vsl.h"
#include "vdef.h"
...
...
bin/varnishstat/varnishstat_options.c
deleted
100644 → 0
View file @
12814efb
/*-
* Copyright (c) 2016 Varnish Software AS
* All rights reserved.
*
* Author: Federico G. Schwindt <fgsch@lodoss.net>
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
*
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
* ARE DISCLAIMED. IN NO EVENT SHALL AUTHOR OR CONTRIBUTORS BE LIABLE
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
* Option definitions for varnishstat
*/
#include <stdlib.h>
#define VOPT_DEFINITION
#define VOPT_INC "varnishstat_options.h"
#include "vapi/voptget.h"
bin/varnishtop/Makefile.am
View file @
aa350825
...
...
@@ -6,9 +6,9 @@ AM_CPPFLAGS = \
bin_PROGRAMS
=
varnishtop
varnishtop_SOURCES
=
varnishtop.c
\
varnishtop
_options.h
\
varnishtop_options.
c
varnishtop_SOURCES
=
\
varnishtop
.c
\
varnishtop_options.
h
varnishtop_CFLAGS
=
\
...
...
bin/varnishtop/varnishtop.c
View file @
aa350825
...
...
@@ -42,6 +42,9 @@
#include <string.h>
#include <unistd.h>
#define VOPT_DEFINITION
#define VOPT_INC "varnishtop_options.h"
#include "vcurses.h"
#include "vapi/vsl.h"
#include "vapi/vsm.h"
...
...
bin/varnishtop/varnishtop_options.c
deleted
100644 → 0
View file @
12814efb
/*-
* Copyright (c) 2014 Varnish Software AS
* All rights reserved.
*
* Author: Martin Blix Grydeland <martin@varnish-software.com>
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
*
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
* ARE DISCLAIMED. IN NO EVENT SHALL AUTHOR OR CONTRIBUTORS BE LIABLE
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
* Option definitions for varnishtop
*/
#include <stdlib.h>
#define VOPT_DEFINITION
#define VOPT_INC "varnishtop_options.h"
#include "vapi/voptget.h"
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