Namespace cleanup: Collect version-related stuff under VCS_

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

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);

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;

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;

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);

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);

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");

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, ...)						\

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 \

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");
 }