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
25ea4541
Commit
25ea4541
authored
May 31, 2011
by
Poul-Henning Kamp
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Namespace cleanup: Collect version-related stuff under VCS_
parent
50002cc1
Changes
10
Show whitespace changes
Inline
Side-by-side
Showing
10 changed files
with
13 additions
and
14 deletions
+13
-14
varnishd.c
bin/varnishd/varnishd.c
+1
-1
varnishhist.c
bin/varnishhist/varnishhist.c
+1
-1
varnishlog.c
bin/varnishlog/varnishlog.c
+1
-1
varnishncsa.c
bin/varnishncsa/varnishncsa.c
+1
-1
varnishsizes.c
bin/varnishsizes/varnishsizes.c
+1
-1
varnishstat.c
bin/varnishstat/varnishstat.c
+1
-1
varnishtop.c
bin/varnishtop/varnishtop.c
+1
-1
libvarnish.h
include/libvarnish.h
+2
-2
Makefile.am
lib/libvarnish/Makefile.am
+2
-3
version.c
lib/libvarnish/version.c
+2
-2
No files found.
bin/varnishd/varnishd.c
View file @
25ea4541
...
@@ -495,7 +495,7 @@ main(int argc, char * const *argv)
...
@@ -495,7 +495,7 @@ main(int argc, char * const *argv)
break
;
break
;
case
'V'
:
case
'V'
:
/* XXX: we should print the ident here */
/* XXX: we should print the ident here */
varnish_version
(
"varnishd"
);
VCS_Message
(
"varnishd"
);
exit
(
0
);
exit
(
0
);
case
'x'
:
case
'x'
:
#ifdef DIAGNOSTICS
#ifdef DIAGNOSTICS
...
...
bin/varnishhist/varnishhist.c
View file @
25ea4541
...
@@ -334,7 +334,7 @@ main(int argc, char **argv)
...
@@ -334,7 +334,7 @@ main(int argc, char **argv)
while
((
o
=
getopt
(
argc
,
argv
,
VSL_ARGS
"Vw:"
))
!=
-
1
)
{
while
((
o
=
getopt
(
argc
,
argv
,
VSL_ARGS
"Vw:"
))
!=
-
1
)
{
switch
(
o
)
{
switch
(
o
)
{
case
'V'
:
case
'V'
:
varnish_version
(
"varnishhist"
);
VCS_Message
(
"varnishhist"
);
exit
(
0
);
exit
(
0
);
case
'w'
:
case
'w'
:
delay
=
atoi
(
optarg
);
delay
=
atoi
(
optarg
);
...
...
bin/varnishlog/varnishlog.c
View file @
25ea4541
...
@@ -311,7 +311,7 @@ main(int argc, char * const *argv)
...
@@ -311,7 +311,7 @@ main(int argc, char * const *argv)
u_flag
=
1
;
u_flag
=
1
;
break
;
break
;
case
'V'
:
case
'V'
:
varnish_version
(
"varnishlog"
);
VCS_Message
(
"varnishlog"
);
exit
(
0
);
exit
(
0
);
case
'w'
:
case
'w'
:
w_arg
=
optarg
;
w_arg
=
optarg
;
...
...
bin/varnishncsa/varnishncsa.c
View file @
25ea4541
...
@@ -757,7 +757,7 @@ main(int argc, char *argv[])
...
@@ -757,7 +757,7 @@ main(int argc, char *argv[])
P_arg
=
optarg
;
P_arg
=
optarg
;
break
;
break
;
case
'V'
:
case
'V'
:
varnish_version
(
"varnishncsa"
);
VCS_Message
(
"varnishncsa"
);
exit
(
0
);
exit
(
0
);
case
'w'
:
case
'w'
:
w_arg
=
optarg
;
w_arg
=
optarg
;
...
...
bin/varnishsizes/varnishsizes.c
View file @
25ea4541
...
@@ -335,7 +335,7 @@ main(int argc, char **argv)
...
@@ -335,7 +335,7 @@ main(int argc, char **argv)
while
((
o
=
getopt
(
argc
,
argv
,
VSL_ARGS
"Vw:"
))
!=
-
1
)
{
while
((
o
=
getopt
(
argc
,
argv
,
VSL_ARGS
"Vw:"
))
!=
-
1
)
{
switch
(
o
)
{
switch
(
o
)
{
case
'V'
:
case
'V'
:
varnish_version
(
"varnishsizes"
);
VCS_Message
(
"varnishsizes"
);
exit
(
0
);
exit
(
0
);
case
'w'
:
case
'w'
:
delay
=
atoi
(
optarg
);
delay
=
atoi
(
optarg
);
...
...
bin/varnishstat/varnishstat.c
View file @
25ea4541
...
@@ -209,7 +209,7 @@ main(int argc, char * const *argv)
...
@@ -209,7 +209,7 @@ main(int argc, char * const *argv)
list_fields
(
vd
);
list_fields
(
vd
);
exit
(
0
);
exit
(
0
);
case
'V'
:
case
'V'
:
varnish_version
(
"varnishstat"
);
VCS_Message
(
"varnishstat"
);
exit
(
0
);
exit
(
0
);
case
'w'
:
case
'w'
:
delay
=
atoi
(
optarg
);
delay
=
atoi
(
optarg
);
...
...
bin/varnishtop/varnishtop.c
View file @
25ea4541
...
@@ -333,7 +333,7 @@ main(int argc, char **argv)
...
@@ -333,7 +333,7 @@ main(int argc, char **argv)
}
}
break
;
break
;
case
'V'
:
case
'V'
:
varnish_version
(
"varnishtop"
);
VCS_Message
(
"varnishtop"
);
exit
(
0
);
exit
(
0
);
case
'm'
:
case
'm'
:
fprintf
(
stderr
,
"-m is not supported
\n
"
);
fprintf
(
stderr
,
"-m is not supported
\n
"
);
...
...
include/libvarnish.h
View file @
25ea4541
...
@@ -96,14 +96,14 @@ struct timespec TIM_timespec(double t);
...
@@ -96,14 +96,14 @@ struct timespec TIM_timespec(double t);
struct
timeval
TIM_timeval
(
double
t
);
struct
timeval
TIM_timeval
(
double
t
);
/* from libvarnish/version.c */
/* from libvarnish/version.c */
void
varnish_version
(
const
char
*
);
void
VCS_Message
(
const
char
*
);
/* from libvarnish/vtmpfile.c */
/* from libvarnish/vtmpfile.c */
int
vtmpfile
(
char
*
);
int
vtmpfile
(
char
*
);
char
*
vreadfile
(
const
char
*
pfx
,
const
char
*
fn
,
ssize_t
*
sz
);
char
*
vreadfile
(
const
char
*
pfx
,
const
char
*
fn
,
ssize_t
*
sz
);
char
*
vreadfd
(
int
fd
,
ssize_t
*
sz
);
char
*
vreadfd
(
int
fd
,
ssize_t
*
sz
);
const
char
*
vcs_v
ersion
(
void
);
const
char
*
VCS_V
ersion
(
void
);
/* Safe printf into a fixed-size buffer */
/* Safe printf into a fixed-size buffer */
#define bprintf(buf, fmt, ...) \
#define bprintf(buf, fmt, ...) \
...
...
lib/libvarnish/Makefile.am
View file @
25ea4541
...
@@ -49,10 +49,9 @@ vcs_version.c: FORCE
...
@@ -49,10 +49,9 @@ vcs_version.c: FORCE
echo
' */'
;
\
echo
' */'
;
\
echo
''
;
\
echo
''
;
\
echo
"#include <libvarnish.h>"
;
\
echo
"#include <libvarnish.h>"
;
\
echo
"const char*
vcs_v
ersion(void)"
;
\
echo
"const char*
VCS_V
ersion(void)"
;
\
echo
"{"
;
\
echo
"{"
;
\
echo
" const char* VCS_Version =
\"
$$
V
\"
;"
;
\
echo
" return (
\"
$$
V
\"
);"
;
\
echo
" return VCS_Version;"
;
\
echo
"}"
;
\
echo
"}"
;
\
)
>
vcs_version.c
;
\
)
>
vcs_version.c
;
\
fi
\
fi
\
...
...
lib/libvarnish/version.c
View file @
25ea4541
...
@@ -36,10 +36,10 @@
...
@@ -36,10 +36,10 @@
#include "libvarnish.h"
#include "libvarnish.h"
void
void
varnish_version
(
const
char
*
progname
)
VCS_Message
(
const
char
*
progname
)
{
{
fprintf
(
stderr
,
"%s (%s-%s revision %s)
\n
"
,
progname
,
fprintf
(
stderr
,
"%s (%s-%s revision %s)
\n
"
,
progname
,
PACKAGE_TARNAME
,
PACKAGE_VERSION
,
vcs_v
ersion
());
PACKAGE_TARNAME
,
PACKAGE_VERSION
,
VCS_V
ersion
());
fprintf
(
stderr
,
fprintf
(
stderr
,
"Copyright (c) 2006-2009 Linpro AS / Verdens Gang AS
\n
"
);
"Copyright (c) 2006-2009 Linpro AS / Verdens Gang AS
\n
"
);
}
}
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