From 4a6a9c80fc875ef67b806f7640b781cc07c6fd8b Mon Sep 17 00:00:00 2001 From: YoungHun Kim Date: Tue, 11 Oct 2016 21:53:22 +0900 Subject: [PATCH] Fix build error of Tizen_Z200/Z300 product and add the api to check message complete or not Change-Id: I90e071287510d502b8804bf88c78acf2706528cc --- CMakeLists.txt | 2 +- include/muse_core.h | 3 +++ include/muse_core_internal.h | 1 + packaging/mused.spec | 2 +- src/muse_core.c | 15 +++++++++++++++ src/muse_core_log.c | 2 ++ 6 files changed, 23 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index e1920cf..786a691 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -35,7 +35,7 @@ FOREACH(flag ${${fw_name}_CFLAGS}) SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} ${flag}") ENDFOREACH(flag) -SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${EXTRA_CFLAGS} -Wall -fPIE -fno-strict-aliasing -Werror -Wformat -Wextra -Wno-array-bounds -Wno-empty-body -Wno-ignored-qualifiers -Wno-unused-parameter -Wshadow -Wwrite-strings -Wswitch-default -Wno-unused-but-set-parameter -Wno-unused-but-set-variable") +SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${EXTRA_CFLAGS} -Wall -fPIE -fno-strict-aliasing -Werror -Wformat -Wextra -Wno-array-bounds -Wno-empty-body -Wno-ignored-qualifiers -Wno-unused-parameter -Wshadow -Wwrite-strings -Wswitch-default -Wno-unused-but-set-parameter -Wno-unused-but-set-variable -Wno-unused-result") SET(CMAKE_C_FLAGS_DEBUG "-O0 -g") IF("${ARCH}" STREQUAL "arm") diff --git a/include/muse_core.h b/include/muse_core.h index 3c5cb7a..84adcc0 100644 --- a/include/muse_core.h +++ b/include/muse_core.h @@ -26,6 +26,8 @@ extern "C" { #endif +#include + #define MUSE_URI_MAX_LENGTH 4096 #define MUSE_MSG_MAX_LENGTH 4096 @@ -56,6 +58,7 @@ int muse_core_client_get_value(muse_module_h module, const char *value_name, int void muse_core_worker_exit(muse_module_h module); const char *muse_core_client_get_temporal_path(void); unsigned int muse_core_get_atomic_uint(void); +bool muse_core_check_msg_complete(char *msg); #ifdef __cplusplus } diff --git a/include/muse_core_internal.h b/include/muse_core_internal.h index 9f31cda..a7806fa 100644 --- a/include/muse_core_internal.h +++ b/include/muse_core_internal.h @@ -77,6 +77,7 @@ extern "C" { #define DISPATCHER_PTR "dispatcher_pointer" #define CMD_DISPATCHER "cmd_dispatcher" #define MUSE_FREE(src) { if (src) {free(src); src = NULL;} } +#define END_DELIM '}' #ifdef __cplusplus } diff --git a/packaging/mused.spec b/packaging/mused.spec index 036d2a6..7cbd042 100644 --- a/packaging/mused.spec +++ b/packaging/mused.spec @@ -1,6 +1,6 @@ Name: mused Summary: A Multimedia Daemon in Tizen Native API -Version: 0.1.17 +Version: 0.1.18 Release: 0 Group: System/Libraries License: Apache-2.0 diff --git a/src/muse_core.c b/src/muse_core.c index 72ecf23..c306c6b 100644 --- a/src/muse_core.c +++ b/src/muse_core.c @@ -561,3 +561,18 @@ unsigned int muse_core_get_atomic_uint(void) return atom; } + +bool muse_core_check_msg_complete(char *msg) +{ + char *ptr = NULL; + + g_return_val_if_fail(msg, FALSE); + + ptr = strrchr(msg, END_DELIM); + if (ptr) { + if (strlen(ptr) == 1) + return true; + } + + return false; +} diff --git a/src/muse_core_log.c b/src/muse_core_log.c index 2ac8248..fbda09c 100644 --- a/src/muse_core_log.c +++ b/src/muse_core_log.c @@ -33,7 +33,9 @@ #include #include #include +#ifndef _GNU_SOURCE #define _GNU_SOURCE +#endif #include #define TUNABLE_CALLER_DEPTH 32 #define U32BITS 0xffffffff -- 2.7.4