From 7b737733bad72da1bf2d08b3c6271007699749e9 Mon Sep 17 00:00:00 2001
From: Simon Fels <morphis@gravedo.de>
Date: Fri, 5 May 2017 18:36:58 +0200
Subject: [PATCH] Rework version string initialization

---
 src/anbox/build/version.cpp | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/src/anbox/build/version.cpp b/src/anbox/build/version.cpp
index 38298c6..07576e9 100644
--- a/src/anbox/build/version.cpp
+++ b/src/anbox/build/version.cpp
@@ -18,16 +18,21 @@
 #include "anbox/build/version.h"
 #include "anbox/utils.h"
 
+#include <cstring>
+
 namespace anbox {
 namespace build {
+static std::string init_version_string() {
+  std::string v;
+  if (!version_suffix || std::strlen(version_suffix) == 0)
+    v = utils::string_format("%d", version_major);
+  else
+    v = utils::string_format("%d-%s", version_major, version_suffix);
+  return v;
+}
+
 std::string print_version() {
-  static std::string v;
-  if (v.empty()) {
-    if (version_suffix.empty())
-      v = utils::string_format("%d", version_major);
-    else
-      v = utils::string_format("%d-%s", version_major, version_suffix);
-  }
+  static const std::string v{init_version_string()};
   return v;
 }
 }  // namespace build