[master] 25ea454 Namespace cleanup: Collect version-related stuff under VCS_
Poul-Henning Kamp
phk at varnish-cache.org
Tue May 31 13:15:04 CEST 2011
commit 25ea45417a5a96cbb3d4643ac73fdae399a2a303
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date: Tue May 31 09:36:36 2011 +0000
Namespace cleanup: Collect version-related stuff under VCS_
diff --git a/bin/varnishd/varnishd.c b/bin/varnishd/varnishd.c
index a6030d4..4a216a9 100644
--- a/bin/varnishd/varnishd.c
+++ b/bin/varnishd/varnishd.c
@@ -495,7 +495,7 @@ main(int argc, char * const *argv)
break;
case 'V':
/* XXX: we should print the ident here */
- varnish_version("varnishd");
+ VCS_Message("varnishd");
exit(0);
case 'x':
#ifdef DIAGNOSTICS
diff --git a/bin/varnishhist/varnishhist.c b/bin/varnishhist/varnishhist.c
index 5ff237a..5772de6 100644
--- a/bin/varnishhist/varnishhist.c
+++ b/bin/varnishhist/varnishhist.c
@@ -334,7 +334,7 @@ main(int argc, char **argv)
while ((o = getopt(argc, argv, VSL_ARGS "Vw:")) != -1) {
switch (o) {
case 'V':
- varnish_version("varnishhist");
+ VCS_Message("varnishhist");
exit(0);
case 'w':
delay = atoi(optarg);
diff --git a/bin/varnishlog/varnishlog.c b/bin/varnishlog/varnishlog.c
index 2064ef9..d0e39d0 100644
--- a/bin/varnishlog/varnishlog.c
+++ b/bin/varnishlog/varnishlog.c
@@ -311,7 +311,7 @@ main(int argc, char * const *argv)
u_flag = 1;
break;
case 'V':
- varnish_version("varnishlog");
+ VCS_Message("varnishlog");
exit(0);
case 'w':
w_arg = optarg;
diff --git a/bin/varnishncsa/varnishncsa.c b/bin/varnishncsa/varnishncsa.c
index dc2d927..39c5cce 100644
--- a/bin/varnishncsa/varnishncsa.c
+++ b/bin/varnishncsa/varnishncsa.c
@@ -757,7 +757,7 @@ main(int argc, char *argv[])
P_arg = optarg;
break;
case 'V':
- varnish_version("varnishncsa");
+ VCS_Message("varnishncsa");
exit(0);
case 'w':
w_arg = optarg;
diff --git a/bin/varnishsizes/varnishsizes.c b/bin/varnishsizes/varnishsizes.c
index 29c218b..8d14d3e 100644
--- a/bin/varnishsizes/varnishsizes.c
+++ b/bin/varnishsizes/varnishsizes.c
@@ -335,7 +335,7 @@ main(int argc, char **argv)
while ((o = getopt(argc, argv, VSL_ARGS "Vw:")) != -1) {
switch (o) {
case 'V':
- varnish_version("varnishsizes");
+ VCS_Message("varnishsizes");
exit(0);
case 'w':
delay = atoi(optarg);
diff --git a/bin/varnishstat/varnishstat.c b/bin/varnishstat/varnishstat.c
index d1c7545..c1408dd 100644
--- a/bin/varnishstat/varnishstat.c
+++ b/bin/varnishstat/varnishstat.c
@@ -209,7 +209,7 @@ main(int argc, char * const *argv)
list_fields(vd);
exit(0);
case 'V':
- varnish_version("varnishstat");
+ VCS_Message("varnishstat");
exit(0);
case 'w':
delay = atoi(optarg);
diff --git a/bin/varnishtop/varnishtop.c b/bin/varnishtop/varnishtop.c
index c98f154..6b39b85 100644
--- a/bin/varnishtop/varnishtop.c
+++ b/bin/varnishtop/varnishtop.c
@@ -333,7 +333,7 @@ main(int argc, char **argv)
}
break;
case 'V':
- varnish_version("varnishtop");
+ VCS_Message("varnishtop");
exit(0);
case 'm':
fprintf(stderr, "-m is not supported\n");
diff --git a/include/libvarnish.h b/include/libvarnish.h
index ee20a54..a1cfaa8 100644
--- a/include/libvarnish.h
+++ b/include/libvarnish.h
@@ -96,14 +96,14 @@ struct timespec TIM_timespec(double t);
struct timeval TIM_timeval(double t);
/* from libvarnish/version.c */
-void varnish_version(const char *);
+void VCS_Message(const char *);
/* from libvarnish/vtmpfile.c */
int vtmpfile(char *);
char *vreadfile(const char *pfx, const char *fn, ssize_t *sz);
char *vreadfd(int fd, ssize_t *sz);
-const char* vcs_version(void);
+const char* VCS_Version(void);
/* Safe printf into a fixed-size buffer */
#define bprintf(buf, fmt, ...) \
diff --git a/lib/libvarnish/Makefile.am b/lib/libvarnish/Makefile.am
index cb6fc37..584a4c3 100644
--- a/lib/libvarnish/Makefile.am
+++ b/lib/libvarnish/Makefile.am
@@ -49,10 +49,9 @@ vcs_version.c: FORCE
echo ' */' ;\
echo '' ;\
echo "#include <libvarnish.h>" ;\
- echo "const char* vcs_version(void)" ;\
+ echo "const char* VCS_Version(void)" ;\
echo "{" ;\
- echo " const char* VCS_Version = \"$$V\";" ;\
- echo " return VCS_Version;" ;\
+ echo " return (\"$$V\");" ;\
echo "}" ;\
) > vcs_version.c ; \
fi \
diff --git a/lib/libvarnish/version.c b/lib/libvarnish/version.c
index 3e1c5ce..f51166b 100644
--- a/lib/libvarnish/version.c
+++ b/lib/libvarnish/version.c
@@ -36,10 +36,10 @@
#include "libvarnish.h"
void
-varnish_version(const char *progname)
+VCS_Message(const char *progname)
{
fprintf(stderr, "%s (%s-%s revision %s)\n", progname,
- PACKAGE_TARNAME, PACKAGE_VERSION, vcs_version());
+ PACKAGE_TARNAME, PACKAGE_VERSION, VCS_Version());
fprintf(stderr,
"Copyright (c) 2006-2009 Linpro AS / Verdens Gang AS\n");
}
More information about the varnish-commit
mailing list