X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fopenxc-utils.cpp;h=bbea968d105b6385386c5a3cbaeee6646bc5ee87;hb=2e93fc880e497ac553111ba27f2de4b44ea94027;hp=5f001d41507b1fe179f5683b7cb9a96c6eb5481e;hpb=cddc9c28e3e1a242e55f68c9971d0710ada30e9f;p=apps%2Fagl-service-can-low-level.git

diff --git a/src/openxc-utils.cpp b/src/openxc-utils.cpp
index 5f001d41..bbea968d 100644
--- a/src/openxc-utils.cpp
+++ b/src/openxc-utils.cpp
@@ -16,11 +16,6 @@
  * limitations under the License.
  */
 
-#include <string>
-#include <json-c/json.h>
-#include <sys/timeb.h>
-
-#include "openxc.pb.h"
 #include "openxc-utils.hpp"
 
 openxc_VehicleMessage build_VehicleMessage_with_SimpleMessage(openxc_DynamicField_Type type, const openxc_SimpleMessage& message)
@@ -101,6 +96,15 @@ openxc_DynamicField build_DynamicField(bool value)
 	return d;
 }
 
+openxc_SimpleMessage get_simple_message(const openxc_VehicleMessage& v_msg)
+{
+	if (v_msg.has_simple_message)
+		return v_msg.simple_message;
+	
+	openxc_SimpleMessage s_msg = { false, "", false, build_DynamicField(false), false, build_DynamicField(false)};
+	return s_msg;
+}
+
 void jsonify_DynamicField(const openxc_DynamicField& field, json_object* value)
 {
 	if(field.has_numeric_value)
@@ -111,22 +115,15 @@ void jsonify_DynamicField(const openxc_DynamicField& field, json_object* value)
 		json_object_object_add(value, "value", json_object_new_string(field.string_value));
 }
 
-openxc_SimpleMessage get_simple_message(const openxc_VehicleMessage& v_msg)
+bool jsonify_simple(const openxc_SimpleMessage& s_msg, json_object* json)
 {
-	if (v_msg.has_simple_message)
-		return v_msg.simple_message;
-}
-
-json_object* jsonify_simple(const openxc_SimpleMessage& s_msg)
-{
-	json_object *json;
-	json = nullptr;
-
 	if(s_msg.has_name)
 	{
 		json = json_object_new_object();
 		json_object_object_add(json, "name", json_object_new_string(s_msg.name));
 		jsonify_DynamicField(s_msg.value, json);
+		return true;
 	}
-	return json;
+	json_object_object_add(json, "error", json_object_new_string("openxc_SimpleMessage doesn't have name'"));
+	return false;
 }
\ No newline at end of file