X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=common-src%2Fversuff.c;h=03e6183d2c3d5f32baa2002d5aadf61fb9cd5e06;hb=2627875b7d18858bc1f9f7652811e4d8c15a23eb;hp=ff229612b3d7476ac14c0ecfff2c3cfc05cb9319;hpb=3ab887b9bc819a846c75dd7f2ee5d41fac22b19f;p=debian%2Famanda

diff --git a/common-src/versuff.c b/common-src/versuff.c
index ff22961..03e6183 100644
--- a/common-src/versuff.c
+++ b/common-src/versuff.c
@@ -1,6 +1,6 @@
 /*
  * Amanda, The Advanced Maryland Automatic Network Disk Archiver
- * Copyright (c) 1991-1998 University of Maryland at College Park
+ * Copyright (c) 1991-1999 University of Maryland at College Park
  * All Rights Reserved.
  *
  * Permission to use, copy, modify, distribute, and sell this software and its
@@ -24,7 +24,7 @@
  * file named AUTHORS, in the root directory of this distribution.
  */
 /*
- * $Id: versuff.c.in,v 1.6.4.1.4.1 2001/07/20 19:37:20 jrjackson Exp $
+ * $Id: versuff.c.in,v 1.12 2006/05/25 01:47:12 johnfranks Exp $
  *
  * provide amanda version number and suffix appended to program names
  */
@@ -32,43 +32,22 @@
 #include "version.h"
 
 const int   VERSION_MAJOR   = 2;
-const int   VERSION_MINOR   = 4;
-const int   VERSION_PATCH   = 4;
-const char *const VERSION_COMMENT = "p3";
+const int   VERSION_MINOR   = 6;
+const int   VERSION_PATCH   = 1;
+const char *const VERSION_COMMENT = "";
 
-char *
-versionsuffix()
+const char *
+versionsuffix(void)
 {
 #ifdef USE_VERSION_SUFFIXES
-	static char *vsuff = NULL;
-
-	if(vsuff) return vsuff;			/* been here once already */
-
-	vsuff = stralloc2("-", version());
-	malloc_mark(vsuff);
-	return vsuff;
+    return "-2.6.1";
 #else
-	return "";
+    return "";
 #endif
 }
 
-char *
-version()
+const char *
+version(void)
 {
-	static char *vsuff = NULL;
-	char major_str[NUM_STR_SIZE];
-	char minor_str[NUM_STR_SIZE];
-	char patch_str[NUM_STR_SIZE];
-
-	if(vsuff) return vsuff;			/* been here once already */
-
-	ap_snprintf(major_str, sizeof(major_str), "%d", VERSION_MAJOR);
-	ap_snprintf(minor_str, sizeof(minor_str), "%d", VERSION_MINOR);
-	ap_snprintf(patch_str, sizeof(patch_str), "%d", VERSION_PATCH);
-
-	vsuff = vstralloc(major_str, ".", minor_str, ".", patch_str,
-			  VERSION_COMMENT,
-			  NULL);
-	malloc_mark(vsuff);
-	return vsuff;
+    return "2.6.1";
 }