From cc5fcb99d5d27f3918114a10b075ba0327e76994 Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Wed, 7 Jul 2010 08:24:13 -0700 Subject: [PATCH] ceph: drop version from ceph_fs.h, use autoconf VERSION macro instead There's no reason to define this in the code anymore. Since the kernel side doesn't use it it just confuses matters. Signed-off-by: Sage Weil --- src/include/ceph_fs.h | 14 -------------- src/libceph.cc | 21 ++++++++++++--------- 2 files changed, 12 insertions(+), 23 deletions(-) diff --git a/src/include/ceph_fs.h b/src/include/ceph_fs.h index 25dcf15817d8b..bf7dea673237c 100644 --- a/src/include/ceph_fs.h +++ b/src/include/ceph_fs.h @@ -15,20 +15,6 @@ #include "msgr.h" #include "rados.h" -/* - * Ceph release version - */ -#define CEPH_VERSION_MAJOR 0 -#define CEPH_VERSION_MINOR 20 -#define CEPH_VERSION_PATCH 0 - -#define CEPH_STRINGIFY_(x) #x -#define CEPH_STRINGIFY(x) CEPH_STRINGIFY_(x) -#define CEPH_MAKE_VERSION(x, y, z) CEPH_STRINGIFY(x) "." CEPH_STRINGIFY(y) \ - "." CEPH_STRINGIFY(z) -#define CEPH_VERSION CEPH_MAKE_VERSION(CEPH_VERSION_MAJOR, \ - CEPH_VERSION_MINOR, CEPH_VERSION_PATCH) - /* * subprotocol versions. when specific messages types or high-level * protocols change, bump the affected components. we keep rev diff --git a/src/libceph.cc b/src/libceph.cc index a67dfb49c3709..b308807a31c7b 100644 --- a/src/libceph.cc +++ b/src/libceph.cc @@ -14,15 +14,18 @@ * C interface */ -extern "C" const char *ceph_version(int *major, int *minor, int *patch) -{ - if (major) - *major = CEPH_VERSION_MAJOR; - if (minor) - *minor = CEPH_VERSION_MINOR; - if (patch) - *patch = CEPH_VERSION_PATCH; - return CEPH_VERSION; +extern "C" const char *ceph_version(int *pmajor, int *pminor, int *ppatch) +{ + int major, minor, patch; + + sscanf(VERSION, "%d.%d.%d", &major, &minor, &patch); + if (pmajor) + *pmajor = major; + if (pminor) + *pminor = minor; + if (ppatch) + *ppatch = patch; + return VERSION; } static Mutex ceph_client_mutex("ceph_client"); -- 2.39.5