summaryrefslogtreecommitdiffstats
path: root/cpukit
diff options
context:
space:
mode:
authorSebastian Huber <sebastian.huber@embedded-brains.de>2019-09-06 14:31:32 +0200
committerSebastian Huber <sebastian.huber@embedded-brains.de>2019-09-09 07:04:53 +0200
commiteaa415b2c7e3105a055d56d8ef4b0f2fccb44d59 (patch)
treed6e052ff293a5173c6df1ed29096086574d807a5 /cpukit
parentc331bdc7776b45f2f684565180df66ccbf5928f1 (diff)
downloadrtems-eaa415b2c7e3105a055d56d8ef4b0f2fccb44d59.tar.bz2
rtems: Make rtems_version_control_key() safer
Return the empty string instead of a NULL pointer if no version key is available.
Diffstat (limited to 'cpukit')
-rw-r--r--cpukit/include/rtems/version.h9
-rw-r--r--cpukit/sapi/src/version.c2
2 files changed, 7 insertions, 4 deletions
diff --git a/cpukit/include/rtems/version.h b/cpukit/include/rtems/version.h
index d8c1206d91..30dd70cc21 100644
--- a/cpukit/include/rtems/version.h
+++ b/cpukit/include/rtems/version.h
@@ -60,10 +60,13 @@ int rtems_version_revision( void );
/**
* @brief Returns the version control key for the current version of code that
- * has been built. The key is specific to the version control system being used
- * and allows the built version to be identified.
+ * has been built.
*
- * @retval int The version's version control key.
+ * The key is specific to the version control system being used and allows the
+ * built version to be identified.
+ *
+ * @return The version control key or the empty string if no version control
+ * key is available.
*/
const char *rtems_version_control_key( void );
diff --git a/cpukit/sapi/src/version.c b/cpukit/sapi/src/version.c
index e1e7705863..065a45c005 100644
--- a/cpukit/sapi/src/version.c
+++ b/cpukit/sapi/src/version.c
@@ -58,6 +58,6 @@ const char *rtems_version_control_key( void )
#ifdef RTEMS_VERSION_VC_KEY
return RTEMS_VERSION_VC_KEY;
#else
- return NULL;
+ return "";
#endif
}