From c69625b8c85ade044959d5385f70ba4823d1b217 Mon Sep 17 00:00:00 2001 From: "jy910.yun" Date: Wed, 2 Oct 2013 21:10:40 +0900 Subject: code cleaning change the internal header file name to make it simple revise warning issues Change-Id: Icea301ae95781a5fa73966cf49e17ee2f71c447b Signed-off-by: jy910.yun --- CMakeLists.txt | 3 +- include/common.h | 45 ++++++++++++++++++++++++ include/feedback-internal.h | 44 ------------------------ include/feedback-log.h | 34 ------------------ include/feedback-str.h | 84 --------------------------------------------- include/log.h | 34 ++++++++++++++++++ src/devices.c | 4 +-- src/feedback.c | 7 ++-- src/sound.c | 7 ++-- src/str.c | 81 +++++++++++++++++++++++++++++++++++++++++++ src/vibrator.c | 9 +++-- src/xmlparser.c | 12 +++---- 12 files changed, 179 insertions(+), 185 deletions(-) create mode 100644 include/common.h delete mode 100644 include/feedback-internal.h delete mode 100644 include/feedback-log.h delete mode 100644 include/feedback-str.h create mode 100644 include/log.h create mode 100644 src/str.c diff --git a/CMakeLists.txt b/CMakeLists.txt index 3bcfaa4..69fe1c2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -15,7 +15,8 @@ SET(SRCS src/sound.c src/vibrator.c src/xmlparser.c - src/feedback.c) + src/feedback.c + src/str.c) SET(HEADERS SLP_FEEDBACK_PG.h diff --git a/include/common.h b/include/common.h new file mode 100644 index 0000000..0113c02 --- /dev/null +++ b/include/common.h @@ -0,0 +1,45 @@ +/* + * libfeedback + * Copyright (c) 2012 Samsung Electronics Co., Ltd. + * + * Licensed under the Apache License, Version 2.0 (the License); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + + +#ifndef __COMMON_H__ +#define __COMMON_H__ + +#ifdef __cplusplus +extern "C" { +#endif + +/** + * @file common.h + * @brief This file contains the common information + */ + +#define FEEDBACK_DATA_DIR "/opt/usr/share/feedback" +#define FEEDBACK_ORIGIN_DATA_DIR "/usr/share/feedback" + +#define FEEDBACK_RETRY_CNT 1 + +extern int callstatus; + +extern const char *str_type[]; +extern const char *str_pattern[]; + +#ifdef __cplusplus +} +#endif + +#endif diff --git a/include/feedback-internal.h b/include/feedback-internal.h deleted file mode 100644 index a4f34bd..0000000 --- a/include/feedback-internal.h +++ /dev/null @@ -1,44 +0,0 @@ -/* - * libfeedback - * Copyright (c) 2012 Samsung Electronics Co., Ltd. - * - * Licensed under the Apache License, Version 2.0 (the License); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - - -#ifndef __FEEDBACK_INTERNAL_H__ -#define __FEEDBACK_INTERNAL_H__ - -#include "feedback-ids.h" - -#ifdef __cplusplus -extern "C" { -#endif - -/** - * @file feedback-internal.h - * @brief This file contains the common information - */ - -#define FEEDBACK_DATA_DIR "/opt/usr/share/feedback" -#define FEEDBACK_ORIGIN_DATA_DIR "/usr/share/feedback" - -#define FEEDBACK_RETRY_CNT 1 - -extern int callstatus; - -#ifdef __cplusplus -} -#endif - -#endif //__FEEDBACK_INTERNAL_H__ diff --git a/include/feedback-log.h b/include/feedback-log.h deleted file mode 100644 index f11dfbd..0000000 --- a/include/feedback-log.h +++ /dev/null @@ -1,34 +0,0 @@ -/* - * libfeedback - * Copyright (c) 2012 Samsung Electronics Co., Ltd. - * - * Licensed under the Apache License, Version 2.0 (the License); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - - -#ifndef __FEEDBACK_LOG_H__ -#define __FEEDBACK_LOG_H__ - -#define FEATURE_FEEDBACK_DLOG - -#ifdef FEATURE_FEEDBACK_DLOG - #define LOG_TAG "FEEDBACK" - #include - #define FEEDBACK_LOG(fmt, args...) SLOGD(fmt, ##args) - #define FEEDBACK_ERROR(fmt, args...) SLOGE(fmt, ##args) -#else - #define FEEDBACK_LOG(x, ...) - #define FEEDBACK_ERROR(x, ...) -#endif - -#endif //__FEEDBACK_LOG_H__ diff --git a/include/feedback-str.h b/include/feedback-str.h deleted file mode 100644 index 0e41857..0000000 --- a/include/feedback-str.h +++ /dev/null @@ -1,84 +0,0 @@ -/* - * libfeedback - * Copyright (c) 2012 Samsung Electronics Co., Ltd. - * - * Licensed under the Apache License, Version 2.0 (the License); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - - -#ifndef __FEEDBACK_STR_H__ -#define __FEEDBACK_STR_H__ - -static const char *str_type[] = -{ - "FEEDBACK_TYPE_NONE", - "FEEDBACK_TYPE_SOUND", - "FEEDBACK_TYPE_VIBRATION", - "FEEDBACK_TYPE_END", -}; - -static const char *str_pattern[] = -{ - "FEEDBACK_PATTERN_TAP", - "FEEDBACK_PATTERN_SIP", - "FEEDBACK_PATTERN_SIP_BACKSPACE", - "FEEDBACK_PATTERN_MAX_CHARACTER", - "FEEDBACK_PATTERN_KEY0", - "FEEDBACK_PATTERN_KEY1", - "FEEDBACK_PATTERN_KEY2", - "FEEDBACK_PATTERN_KEY3", - "FEEDBACK_PATTERN_KEY4", - "FEEDBACK_PATTERN_KEY5", - "FEEDBACK_PATTERN_KEY6", - "FEEDBACK_PATTERN_KEY7", - "FEEDBACK_PATTERN_KEY8", - "FEEDBACK_PATTERN_KEY9", - "FEEDBACK_PATTERN_KEY_STAR", - "FEEDBACK_PATTERN_KEY_SHARP", - "FEEDBACK_PATTERN_HOLD", - "FEEDBACK_PATTERN_MULTI_TAP", - "FEEDBACK_PATTERN_HW_TAP", - "FEEDBACK_PATTERN_HW_HOLD", - "FEEDBACK_PATTERN_MESSAGE", - "FEEDBACK_PATTERN_MESSAGE_ON_CALL", - "FEEDBACK_PATTERN_EMAIL", - "FEEDBACK_PATTERN_EMAIL_ON_CALL", - "FEEDBACK_PATTERN_WAKEUP", - "FEEDBACK_PATTERN_WAKEUP_ON_CALL", - "FEEDBACK_PATTERN_SCHEDULE", - "FEEDBACK_PATTERN_SCHEDULE_ON_CALL", - "FEEDBACK_PATTERN_TIMER", - "FEEDBACK_PATTERN_TIMER_ON_CALL", - "FEEDBACK_PATTERN_GENERAL", - "FEEDBACK_PATTERN_GENERAL_ON_CALL", - "FEEDBACK_PATTERN_POWERON", - "FEEDBACK_PATTERN_POWEROFF", - "FEEDBACK_PATTERN_CHARGERCONN", - "FEEDBACK_PATTERN_CHARGERCONN_ON_CALL", - "FEEDBACK_PATTERN_FULLCHARGED", - "FEEDBACK_PATTERN_FULLCHARGED_ON_CALL", - "FEEDBACK_PATTERN_LOWBATT", - "FEEDBACK_PATTERN_LOWBATT_ON_CALL", - "FEEDBACK_PATTERN_LOCK", - "FEEDBACK_PATTERN_UNLOCK", - "FEEDBACK_PATTERN_CALLCONNECT", - "FEEDBACK_PATTERN_DISCALLCONNECT", - "FEEDBACK_PATTERN_MINUTEMINDER", - "FEEDBACK_PATTERN_VIBRATION", - "FEEDBACK_PATTERN_SHUTTER", - "FEEDBACK_PATTERN_LIST_REORDER", - "FEEDBACK_PATTERN_SLIDER_SWEEP", - "FEEDBACK_PATTERN_VOLUME_KEY", -}; - -#endif //__FEEDBACK_STR_H__ diff --git a/include/log.h b/include/log.h new file mode 100644 index 0000000..7237f82 --- /dev/null +++ b/include/log.h @@ -0,0 +1,34 @@ +/* + * libfeedback + * Copyright (c) 2012 Samsung Electronics Co., Ltd. + * + * Licensed under the Apache License, Version 2.0 (the License); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + + +#ifndef __LOG_H__ +#define __LOG_H__ + +#define FEATURE_FEEDBACK_DLOG + +#ifdef FEATURE_FEEDBACK_DLOG + #define LOG_TAG "FEEDBACK" + #include + #define FEEDBACK_LOG(fmt, args...) SLOGD(fmt, ##args) + #define FEEDBACK_ERROR(fmt, args...) SLOGE(fmt, ##args) +#else + #define FEEDBACK_LOG(x, ...) + #define FEEDBACK_ERROR(x, ...) +#endif + +#endif //__LOG_H__ diff --git a/src/devices.c b/src/devices.c index ac7fbbf..970de55 100644 --- a/src/devices.c +++ b/src/devices.c @@ -21,8 +21,8 @@ #include #include "devices.h" -#include "feedback-str.h" -#include "feedback-log.h" +#include "common.h" +#include "log.h" #define DD_LIST_PREPEND(a, b) \ a = g_list_prepend(a, b) diff --git a/src/feedback.c b/src/feedback.c index 1ef742e..5243924 100644 --- a/src/feedback.c +++ b/src/feedback.c @@ -23,9 +23,8 @@ #include #include "feedback.h" -#include "feedback-internal.h" -#include "feedback-str.h" -#include "feedback-log.h" +#include "common.h" +#include "log.h" #include "devices.h" #ifndef API @@ -63,8 +62,6 @@ static feedback_pattern_e get_alert_on_call_key(feedback_pattern_e pattern) API int feedback_initialize() { - int err = -1; - if (binit) return FEEDBACK_ERROR_NONE; diff --git a/src/sound.c b/src/sound.c index 39d9b4b..d903e3a 100644 --- a/src/sound.c +++ b/src/sound.c @@ -27,10 +27,9 @@ #include #include -#include "feedback.h" -#include "feedback-internal.h" -#include "feedback-str.h" -#include "feedback-log.h" +#include "feedback-ids.h" +#include "common.h" +#include "log.h" #include "devices.h" #define FEEDBACK_SOUND_DIR FEEDBACK_DATA_DIR"/sound" diff --git a/src/str.c b/src/str.c new file mode 100644 index 0000000..fb70365 --- /dev/null +++ b/src/str.c @@ -0,0 +1,81 @@ +/* + * libfeedback + * Copyright (c) 2012 Samsung Electronics Co., Ltd. + * + * Licensed under the Apache License, Version 2.0 (the License); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + + +#include + +const char *str_type[] = +{ + "FEEDBACK_TYPE_NONE", + "FEEDBACK_TYPE_SOUND", + "FEEDBACK_TYPE_VIBRATION", + "FEEDBACK_TYPE_END", +}; + +const char *str_pattern[] = +{ + "FEEDBACK_PATTERN_TAP", + "FEEDBACK_PATTERN_SIP", + "FEEDBACK_PATTERN_SIP_BACKSPACE", + "FEEDBACK_PATTERN_MAX_CHARACTER", + "FEEDBACK_PATTERN_KEY0", + "FEEDBACK_PATTERN_KEY1", + "FEEDBACK_PATTERN_KEY2", + "FEEDBACK_PATTERN_KEY3", + "FEEDBACK_PATTERN_KEY4", + "FEEDBACK_PATTERN_KEY5", + "FEEDBACK_PATTERN_KEY6", + "FEEDBACK_PATTERN_KEY7", + "FEEDBACK_PATTERN_KEY8", + "FEEDBACK_PATTERN_KEY9", + "FEEDBACK_PATTERN_KEY_STAR", + "FEEDBACK_PATTERN_KEY_SHARP", + "FEEDBACK_PATTERN_HOLD", + "FEEDBACK_PATTERN_MULTI_TAP", + "FEEDBACK_PATTERN_HW_TAP", + "FEEDBACK_PATTERN_HW_HOLD", + "FEEDBACK_PATTERN_MESSAGE", + "FEEDBACK_PATTERN_MESSAGE_ON_CALL", + "FEEDBACK_PATTERN_EMAIL", + "FEEDBACK_PATTERN_EMAIL_ON_CALL", + "FEEDBACK_PATTERN_WAKEUP", + "FEEDBACK_PATTERN_WAKEUP_ON_CALL", + "FEEDBACK_PATTERN_SCHEDULE", + "FEEDBACK_PATTERN_SCHEDULE_ON_CALL", + "FEEDBACK_PATTERN_TIMER", + "FEEDBACK_PATTERN_TIMER_ON_CALL", + "FEEDBACK_PATTERN_GENERAL", + "FEEDBACK_PATTERN_GENERAL_ON_CALL", + "FEEDBACK_PATTERN_POWERON", + "FEEDBACK_PATTERN_POWEROFF", + "FEEDBACK_PATTERN_CHARGERCONN", + "FEEDBACK_PATTERN_CHARGERCONN_ON_CALL", + "FEEDBACK_PATTERN_FULLCHARGED", + "FEEDBACK_PATTERN_FULLCHARGED_ON_CALL", + "FEEDBACK_PATTERN_LOWBATT", + "FEEDBACK_PATTERN_LOWBATT_ON_CALL", + "FEEDBACK_PATTERN_LOCK", + "FEEDBACK_PATTERN_UNLOCK", + "FEEDBACK_PATTERN_CALLCONNECT", + "FEEDBACK_PATTERN_DISCALLCONNECT", + "FEEDBACK_PATTERN_MINUTEMINDER", + "FEEDBACK_PATTERN_VIBRATION", + "FEEDBACK_PATTERN_SHUTTER", + "FEEDBACK_PATTERN_LIST_REORDER", + "FEEDBACK_PATTERN_SLIDER_SWEEP", + "FEEDBACK_PATTERN_VOLUME_KEY", +}; diff --git a/src/vibrator.c b/src/vibrator.c index 815145d..2e8cfdf 100644 --- a/src/vibrator.c +++ b/src/vibrator.c @@ -27,12 +27,11 @@ #include #include -#include "feedback.h" -#include "feedback-internal.h" -#include "feedback-str.h" -#include "feedback-log.h" -#include "xmlparser.h" +#include "feedback-ids.h" +#include "common.h" +#include "log.h" #include "devices.h" +#include "xmlparser.h" #define FEEDBACK_HAPTIC_DIR FEEDBACK_DATA_DIR"/haptic" #define FEEDBACK_HAPTIC_TOUCH_DIR FEEDBACK_HAPTIC_DIR"/touch" diff --git a/src/xmlparser.c b/src/xmlparser.c index d7d1837..39a7666 100644 --- a/src/xmlparser.c +++ b/src/xmlparser.c @@ -21,9 +21,9 @@ #include #include "xmlparser.h" -#include "feedback-log.h" +#include "log.h" -static const xmlChar* data_str[] = { +static const char* data_str[] = { [XML_LABEL] = "label", [XML_DATA] = "data", }; @@ -57,7 +57,7 @@ static int xml_compare(xmlDocPtr doc, xmlNodePtr cur, const xmlChar* expr) assert(expr); for (node = cur->children; node != NULL; node = node->next) { - if (xmlStrcmp(node->name, data_str[XML_LABEL])) + if (xmlStrcmp(node->name, (const xmlChar*)data_str[XML_LABEL])) continue; key = xmlNodeListGetString(doc, node->children, 1); @@ -105,7 +105,7 @@ struct xmlData *xml_parse(xmlDocPtr doc, xmlNodePtr cur) xmlNodePtr node; struct xmlData *data; char *b64_data; - int len; + unsigned int len; assert(doc); assert(cur); @@ -118,10 +118,10 @@ struct xmlData *xml_parse(xmlDocPtr doc, xmlNodePtr cur) memset(data, 0, sizeof(struct xmlData)); for (node = cur->children; node != NULL; node = node->next) { - if (!xmlStrcmp(node->name, data_str[XML_LABEL])) { + if (!xmlStrcmp(node->name, (const xmlChar*)data_str[XML_LABEL])) { data->label = (char*)xmlNodeListGetString(doc, node->children, 1); FEEDBACK_LOG("label : %s", data->label); - } else if (!xmlStrcmp(node->name, data_str[XML_DATA])) { + } else if (!xmlStrcmp(node->name, (const xmlChar*)data_str[XML_DATA])) { b64_data = (char *)xmlNodeListGetString(doc, node->children, 1); if (b64_data != NULL) { FEEDBACK_LOG("b64_data : %s", b64_data); -- cgit v1.2.3