From da0d4290a3a6be525426592aa6d7b36376f9d378 Mon Sep 17 00:00:00 2001
From: Thilo Graf <dbt@novatux.de>
Date: Wed, 2 Jan 2019 17:24:10 +0100
Subject: [PATCH] version_hal: simplify methodes

adopt method names similar to cs name convention
---
 common/version_hal.cpp | 56 ++++++++++++++++++++----------------------
 include/version_hal.h  | 20 +++++++++------
 2 files changed, 39 insertions(+), 37 deletions(-)

diff --git a/common/version_hal.cpp b/common/version_hal.cpp
index a1542d3..d1a5729 100644
--- a/common/version_hal.cpp
+++ b/common/version_hal.cpp
@@ -19,37 +19,33 @@
 #include <version_hal.h>
 
 
-std::string getPackageVersion()
+void hal_get_lib_version(hal_libversion_t *ver)
 {
-	return PACKAGE_VERSION;
-}
+	if (!ver)
+		return;
 
-int getPackageVersionMajor()
-{
-	return PACKAGE_VERSION_MAJOR;
-}
+	//init struct
+	*ver = {"",0,0,0,"","",""};
 
-int getPackageVersionMinor()
-{
-	return PACKAGE_VERSION_MINOR;
-}
-
-int getPackageVersionMicro()
-{
-	return PACKAGE_VERSION_MICRO;
-}
-
-std::string getPackagenName()
-{
-	return PACKAGE_NAME;
-}
-
-std::string getPackageString()
-{
-	return PACKAGE_STRING;
-}
-
-std::string getPackageVersionGit()
-{
-	return PACKAGE_VERSION_GIT;
+#ifdef VERSION
+	ver->vVersion = VERSION;
+#endif
+#ifdef PACKAGE_VERSION_MAJOR
+	ver->vMajor = PACKAGE_VERSION_MAJOR;
+#endif
+#ifdef PACKAGE_VERSION_MAJOR
+	ver->vMinor = PACKAGE_VERSION_MINOR;
+#endif
+#ifdef PACKAGE_VERSION_MINOR
+	ver->vPatch = PACKAGE_VERSION_MICRO;
+#endif
+#ifdef PACKAGE_NAME
+	ver->vName = PACKAGE_NAME;
+#endif
+#ifdef PACKAGE_STRING
+	ver->vStr = PACKAGE_STRING;
+#endif
+#ifdef PACKAGE_VERSION_GIT
+	ver->vGitDescribe = PACKAGE_VERSION_GIT;
+#endif
 }
diff --git a/include/version_hal.h b/include/version_hal.h
index d0eda52..8bad457 100644
--- a/include/version_hal.h
+++ b/include/version_hal.h
@@ -3,13 +3,19 @@
 
 #include <string>
 
-std::string getPackageVersion();
-int getPackageVersionMajor();
-int getPackageVersionMinor();
-int getPackageVersionMicro();
-std::string getPackagenName();
-std::string getPackageString();
-std::string getPackageVersionGit();
+// library version functions
+typedef struct hal_libversion_t
+{
+	std::string	vVersion;
+	int			vMajor;
+	int			vMinor;
+	int			vPatch;;
+	std::string	vName;
+	std::string	vStr;
+	std::string	vGitDescribe;
+} hal_libversion_struct_t;
+
+void hal_get_lib_version(hal_libversion_t *ver);
 
 
 #endif //__VERSION_HAL_H__