mirrors/recycled-ni-libstb-hal
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-libstb-hal.git synced 2025-08-26 15:02:43 +02:00
Code Issues Packages Projects Releases Wiki Activity

version_hal: simplify methodes

Browse Source 
adopt method names similar to cs name convention


Origin commit data
------------------
Branch: master
Commit: c2f169364b
Author: Thilo Graf <dbt@novatux.de>
Date: 2019-01-02 (Wed, 02 Jan 2019)



------------------
This commit was generated by Migit
This commit is contained in:
Thilo Graf
2019-01-02 21:27:55 +01:00
committed by vanhofen
parent 93e2415828
commit ba29dae050
2 changed files with 39 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
common/version_hal.cpp
View File

@@ -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
}

20
include/version_hal.h
View File

@@ -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__