From: Sage Weil <sage@newdream.net>
Date: Fri, 18 Mar 2011 21:49:28 +0000 (-0700)
Subject: libceph: pull version from new version define
X-Git-Tag: v0.26~96
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=f772a1638498a06f7fc529abccdab1e172fa3a5d;p=ceph.git

libceph: pull version from new version define

Signed-off-by: Sage Weil <sage@newdream.net>
---

diff --git a/src/libceph.cc b/src/libceph.cc
index c56cd93e328a..19f09686dbc1 100644
--- a/src/libceph.cc
+++ b/src/libceph.cc
@@ -11,6 +11,8 @@
 #include "msg/SimpleMessenger.h"
 #include "client/Client.h"
 
+#include "ceph_ver.h"
+
 /* ************* ************* ************* *************
  * C interface
  */
@@ -19,13 +21,13 @@ extern "C" const char *ceph_version(int *pmajor, int *pminor, int *ppatch)
 {
   int major, minor, patch;
 
-  sscanf(VERSION, "%d.%d.%d", &major, &minor, &patch);
+  int n = sscanf(CEPH_GIT_NICE_VER, "%d.%d.%d", &major, &minor, &patch);
   if (pmajor)
-    *pmajor = major;
+    *pmajor = (n >= 1) ? major : 0;
   if (pminor)
-    *pminor = minor;
+    *pminor = (n >= 2) ? minor : 0;
   if (ppatch)
-    *ppatch = patch;
+    *ppatch = (n >= 3) ? patch : 0;
   return VERSION;
 }