From 7d901becbc4e731a19492afb5a62629acac3a4ff Mon Sep 17 00:00:00 2001 From: Jihoon Jung Date: Thu, 4 Oct 2018 16:53:42 +0900 Subject: [PATCH] apply indentation Signed-off-by: Jihoon Jung --- include/mdg.h | 91 ++++++++++++++--------------- include/mdg_internal.h | 8 +-- src/mdg_dbus.c | 99 +++++++++++++------------------ src/mdg_dbus.h | 7 +-- src/mdg_debug.h | 99 +++++++++++++++---------------- src/mdg_private.h | 96 +++++++++++++++--------------- src/mdg_util.c | 39 ++++++------- src/mdg_util.h | 7 +-- test/common.h | 2 +- test/menu.c | 51 +++++++++------- test/menu.h | 156 ++++++++++++++++++++++++++++--------------------- 11 files changed, 332 insertions(+), 323 deletions(-) diff --git a/include/mdg.h b/include/mdg.h index de144ba..c1deaac 100755 --- a/include/mdg.h +++ b/include/mdg.h @@ -55,21 +55,21 @@ typedef void *mdg_h; * @since_tizen 5.0 */ typedef enum { - MDG_ERROR_NONE = TIZEN_ERROR_NONE, /**< Successful */ - MDG_ERROR_IO_ERROR = TIZEN_ERROR_IO_ERROR, /**< I/O error */ + MDG_ERROR_NONE = TIZEN_ERROR_NONE, /**< Successful */ + MDG_ERROR_IO_ERROR = TIZEN_ERROR_IO_ERROR, /**< I/O error */ MDG_ERROR_INVALID_PARAMETER = TIZEN_ERROR_INVALID_PARAMETER, /**< Invalid parameter */ - MDG_ERROR_OUT_OF_MEMORY = TIZEN_ERROR_OUT_OF_MEMORY, /**< Out of memory */ + MDG_ERROR_OUT_OF_MEMORY = TIZEN_ERROR_OUT_OF_MEMORY, /**< Out of memory */ MDG_ERROR_PERMISSION_DENIED = TIZEN_ERROR_PERMISSION_DENIED, /**< Permission denied */ - MDG_ERROR_NOT_SUPPORTED = TIZEN_ERROR_NOT_SUPPORTED, /**< Not supported */ - MDG_ERROR_OPERATION_FAILED = TIZEN_ERROR_MDG | 0x01, /**< operation failed */ - MDG_ERROR_NO_DATA = TIZEN_ERROR_MDG | 0x02, /**< Data not exists */ - MDG_ERROR_ALREADY_REGISTERED = TIZEN_ERROR_MDG | 0x03, /**< Request already registered */ - MDG_ERROR_IN_PROGRESS = TIZEN_ERROR_MDG | 0x04,/**< operation is in progress */ - MDG_ERROR_COMM_ERROR = TIZEN_ERROR_MDG | 0x05, /**< communication error in lower layer */ - MDG_ERROR_NOT_STARTED = TIZEN_ERROR_MDG | 0x06, /**< Service Not Started */ - MDG_ERROR_DB = TIZEN_ERROR_MDG | 0x07, /**< Internal DB error */ - MDG_ERROR_NOT_PROPER_GROUP = TIZEN_ERROR_MDG | 0x08, /**< Not proper group */ - MDG_ERROR_NOT_PROPER_DEVICE = TIZEN_ERROR_MDG | 0x09, /**< Not proper device */ + MDG_ERROR_NOT_SUPPORTED = TIZEN_ERROR_NOT_SUPPORTED, /**< Not supported */ + MDG_ERROR_OPERATION_FAILED = TIZEN_ERROR_MDG | 0x01, /**< operation failed */ + MDG_ERROR_NO_DATA = TIZEN_ERROR_MDG | 0x02, /**< Data not exists */ + MDG_ERROR_ALREADY_REGISTERED = TIZEN_ERROR_MDG | 0x03, /**< Request already registered */ + MDG_ERROR_IN_PROGRESS = TIZEN_ERROR_MDG | 0x04, /**< operation is in progress */ + MDG_ERROR_COMM_ERROR = TIZEN_ERROR_MDG | 0x05, /**< communication error in lower layer */ + MDG_ERROR_NOT_STARTED = TIZEN_ERROR_MDG | 0x06, /**< Service Not Started */ + MDG_ERROR_DB = TIZEN_ERROR_MDG | 0x07, /**< Internal DB error */ + MDG_ERROR_NOT_PROPER_GROUP = TIZEN_ERROR_MDG | 0x08, /**< Not proper group */ + MDG_ERROR_NOT_PROPER_DEVICE = TIZEN_ERROR_MDG | 0x09, /**< Not proper device */ } mdg_error_e; typedef enum { @@ -146,7 +146,6 @@ int mdg_deinitialize(mdg_h handle); * @} */ - /** * @addtogroup CAPI_NETWORK_MDG_GROUP_MODULE * @{ @@ -158,7 +157,7 @@ int mdg_deinitialize(mdg_h handle); * @since_tizen 5.0 */ typedef enum { - MDG_GROUP_TYPE_LOCAL = 1, /**< Local group */ + MDG_GROUP_TYPE_LOCAL = 1, /**< Local group */ MDG_GROUP_TYPE_REMOTE = 2, /**< Remote grojp */ } mdg_group_type_e; @@ -182,7 +181,7 @@ typedef enum { * @see mdg_group_find() */ typedef bool (*mdg_group_found_cb)(mdg_group_type_e type, - mdg_group_h group, void *user_data); + mdg_group_h group, void *user_data); /** * @brief Called after mdg_group_find() finished. @@ -223,8 +222,8 @@ typedef void (*mdg_group_find_finish_cb)(int result, void *user_data); * */ int mdg_group_find(mdg_h handle, int timeout, - mdg_group_found_cb found_cb, mdg_group_find_finish_cb finish_cb, - void *user_data); + mdg_group_found_cb found_cb, mdg_group_find_finish_cb finish_cb, + void *user_data); /** * @} @@ -326,7 +325,7 @@ typedef bool (*mdg_group_foreach_cb)(mdg_device_h device, void *user_data); * */ int mdg_group_foreach_device(mdg_h handle, mdg_group_h group, - mdg_group_foreach_cb foreach_cb, void *user_data); + mdg_group_foreach_cb foreach_cb, void *user_data); /** * @brief Called after mdg_group_invite_device(). @@ -345,7 +344,7 @@ int mdg_group_foreach_device(mdg_h handle, mdg_group_h group, * @see mdg_group_invite_device() */ typedef void (*mdg_group_invite_device_finish_cb)(int result, - mdg_device_h invited_device, void *user_data); + mdg_device_h invited_device, void *user_data); /** * @brief Called after mdg_group_eject_device(). @@ -394,8 +393,8 @@ typedef void (*mdg_group_eject_device_finish_cb)(int result, void *user_data); * */ int mdg_group_invite_device(mdg_h handle, mdg_group_h group, - mdg_device_h device, char *PIN, - mdg_group_invite_device_finish_cb callback, void *user_data); + mdg_device_h device, char *PIN, + mdg_group_invite_device_finish_cb callback, void *user_data); typedef void (*mdg_invited_event_cb)(mdg_group_h group, void *user_data); int mdg_set_invited_event_cb(mdg_h handle, mdg_invited_event_cb event_cb, void *user_data); @@ -432,9 +431,8 @@ int mdg_unset_ejected_event_cb(mdg_h handle); * */ int mdg_group_eject_device(mdg_h handle, mdg_group_h group, - mdg_device_h device, mdg_group_eject_device_finish_cb callback, - void *user_data); - + mdg_device_h device, mdg_group_eject_device_finish_cb callback, + void *user_data); /** * @} @@ -466,7 +464,7 @@ int mdg_group_eject_device(mdg_h handle, mdg_group_h group, * @see mdg_request_result_callback() */ typedef void (*mdg_request_result_cb)(char *cmd, char *device_id, - unsigned char *arg, int len, int ret, void *user_data); + unsigned char *arg, int len, int ret, void *user_data); typedef void (*mdg_request_channel_list_finish_cb)(char *device_id, char *channel_id, void *user_data); @@ -498,8 +496,8 @@ typedef void (*mdg_request_channel_list_finish_cb)(char *device_id, char *channe * */ int mdg_request_create_group(mdg_h handle, - mdg_device_h device, char *group_name, mdg_request_result_cb cb, - void *user_data); + mdg_device_h device, char *group_name, mdg_request_result_cb cb, + void *user_data); /** * @brief Requests to invite a device to the group. @@ -531,8 +529,8 @@ int mdg_request_create_group(mdg_h handle, * */ int mdg_request_invite_device(mdg_h handle, mdg_group_h group, - mdg_device_h device, char *PIN, mdg_request_result_cb cb, - void *user_data); + mdg_device_h device, char *PIN, mdg_request_result_cb cb, + void *user_data); /** * @brief Requests to eject a device. @@ -561,10 +559,10 @@ int mdg_request_invite_device(mdg_h handle, mdg_group_h group, * */ int mdg_request_eject_device(mdg_h handle, mdg_group_h group, - mdg_device_h device, mdg_request_result_cb cb, void *user_data); + mdg_device_h device, mdg_request_result_cb cb, void *user_data); int mdg_request_channel_list(mdg_h handle, mdg_device_h device, - mdg_request_channel_list_finish_cb finish_cb, void *user_data); + mdg_request_channel_list_finish_cb finish_cb, void *user_data); /** * @} @@ -599,7 +597,7 @@ int mdg_request_channel_list(mdg_h handle, mdg_device_h device, * */ int mdg_group_info_clone(mdg_group_h *dst, - mdg_group_h src); + mdg_group_h src); /** * @brief Destroys the group handle. @@ -677,7 +675,6 @@ int mdg_group_info_get_name(mdg_group_h group, char **name); * @} */ - /** * @addtogroup CAPI_NETWORK_MDG_DEVICE_MODULE * @{ @@ -689,7 +686,7 @@ int mdg_group_info_get_name(mdg_group_h group, char **name); * @since_tizen 5.0 */ typedef enum { - MDG_DEVICE_TYPE_LOCAL = 1, /**< Local device */ + MDG_DEVICE_TYPE_LOCAL = 1, /**< Local device */ MDG_DEVICE_TYPE_REMOTE = 2, /**< Remote device */ } mdg_device_type_e; @@ -730,7 +727,6 @@ typedef bool (*mdg_device_found_cb)(mdg_device_h device, void *user_data); */ typedef void (*mdg_device_find_finish_cb)(int result, void *user_data); - /** * @brief Called after mdg_device_send_data(). * @details Called when the maximum wait time elapsed or after the mdg_device_send_data() @@ -752,7 +748,7 @@ typedef void (*mdg_device_find_finish_cb)(int result, void *user_data); * @see mdg_device_send_data() */ typedef void (*mdg_device_send_data_finish_cb)(int result, mdg_device_h device, - char *channel_id, int msg_id, unsigned char *data, int len, void *user_data); + char *channel_id, int msg_id, unsigned char *data, int len, void *user_data); /** * @brief Gets my local device handle. @@ -796,19 +792,19 @@ int mdg_device_get_local_device(mdg_h handle, mdg_device_h *device); * */ int mdg_device_find(mdg_h handle, int timeout, bool is_invited, - mdg_device_found_cb found_cb, mdg_device_find_finish_cb finish_cb, - void *user_data); + mdg_device_found_cb found_cb, mdg_device_find_finish_cb finish_cb, + void *user_data); typedef void (*mdg_receive_data_cb)(int result, char *device_id, char *channel_id, - int msg_id, unsigned char *data, int len, void *user_data); + int msg_id, unsigned char *data, int len, void *user_data); /* Server Side */ int mdg_device_regist_channel(mdg_h handle, char *channel_id, - mdg_receive_data_cb receive_data_cb, void *user_data); + mdg_receive_data_cb receive_data_cb, void *user_data); /* In 5 seconds */ int mdg_device_send_response(mdg_h handle, char *device_id, char *channel_id, - int msg_id, unsigned char *data, int len); + int msg_id, unsigned char *data, int len); int mdg_device_unregist_channel(mdg_h handle, char *channel_id); @@ -841,8 +837,8 @@ int mdg_device_unregist_channel(mdg_h handle, char *channel_id); * */ int mdg_device_send_data(mdg_h handle, - mdg_device_h device, char *channel_id, unsigned char *data, int len, - mdg_device_send_data_finish_cb finish_cb, void *user_data, int *msg_id); + mdg_device_h device, char *channel_id, unsigned char *data, int len, + mdg_device_send_data_finish_cb finish_cb, void *user_data, int *msg_id); /** * @} @@ -877,7 +873,7 @@ int mdg_device_send_data(mdg_h handle, * */ int mdg_device_info_clone(mdg_device_h *target, - mdg_device_h source); + mdg_device_h source); /** * @brief Destroys the device handle. @@ -925,7 +921,7 @@ int mdg_device_info_destroy(mdg_device_h device); * */ int mdg_device_info_get_device_id(mdg_device_h device, - char **device_id); + char **device_id); /** * @brief Gets model name of the device handle. @@ -981,13 +977,12 @@ int mdg_device_info_is_invited(mdg_device_h device, bool *is_invited); * */ int mdg_device_info_get_type(mdg_device_h device, - mdg_device_type_e *device_type); + mdg_device_type_e *device_type); /** * @} */ - #ifdef __cplusplus } #endif diff --git a/include/mdg_internal.h b/include/mdg_internal.h index 21a9e8e..3df8650 100755 --- a/include/mdg_internal.h +++ b/include/mdg_internal.h @@ -25,24 +25,22 @@ extern "C" { /* File transfer for Client Side */ typedef void (*mdg_send_file_progress_cb)(const char *file_path, long long send_size, - long long total_size, int percent, void *user_data); + long long total_size, int percent, void *user_data); typedef void (*mdg_send_file_finish_cb)(int result, mdg_device_h device, void *user_data); int mdg_device_send_file(mdg_h handle, mdg_device_h device, char *file_path, - mdg_send_file_progress_cb progress_cb, mdg_send_file_finish_cb finish_cb, void *user_data); + mdg_send_file_progress_cb progress_cb, mdg_send_file_finish_cb finish_cb, void *user_data); /* File transfer for Server Side */ typedef void (*mdg_receive_file_cb)(int result, char *device_id, - const char *file_path, void *user_data); + const char *file_path, void *user_data); int mdg_set_receive_file_cb(mdg_h handle, mdg_receive_file_cb receive_cb, void *user_data); int mdg_unset_receive_file_cb(mdg_h handle); int mdg_set_preconfigured_pin(mdg_h handle, char *password); - #ifdef __cplusplus } #endif #endif /* __TIZEN_NETWORK_MULTI_DEVICE_GROUP_MDG_H__ */ - diff --git a/src/mdg_dbus.c b/src/mdg_dbus.c index 556018f..e32dd34 100755 --- a/src/mdg_dbus.c +++ b/src/mdg_dbus.c @@ -15,22 +15,22 @@ * */ -#include -#include -#include #include +#include +#include #include +#include #include -#include #include #include #include #include +#include /* LCOV_EXCL_START */ static void __event_cb(Group *object, - gint event_type, gint ret, GVariant *va, gpointer user_data) + gint event_type, gint ret, GVariant *va, gpointer user_data) { NOTUSED(object); mdg_check_null_ret("user_data", user_data); @@ -42,78 +42,71 @@ static void __event_cb(Group *object, _DBG("Event occured : %d", event_type); switch (event_type) { - case MDG_EVENT_GROUP_FOUND: - { + case MDG_EVENT_GROUP_FOUND: { mdg_group_s *group = NULL; group = mdg_get_group_from_variant(va); if (handle->group_found_cb.found_cb) { handle->group_found_cb.found_cb(group->type, group, - handle->group_found_cb.user_data); + handle->group_found_cb.user_data); } else { _ERR("The callback not exists"); } break; } - case MDG_EVENT_GROUP_FIND_FINISH: - { + case MDG_EVENT_GROUP_FIND_FINISH: { if (handle->group_find_finish_cb.finish_cb) { handle->group_find_finish_cb.finish_cb(ret, - handle->group_find_finish_cb.user_data); + handle->group_find_finish_cb.user_data); } else { _ERR("The callback not exists"); } break; } - case MDG_EVENT_DEVICE_FOUND: - { + case MDG_EVENT_DEVICE_FOUND: { mdg_device_s *device = NULL; device = mdg_get_device_from_variant(va); if (handle->device_found_cb.found_cb) { handle->device_found_cb.found_cb(device, - handle->device_found_cb.user_data); + handle->device_found_cb.user_data); } else { _ERR("The callback not exists"); } break; } - case MDG_EVENT_DEVICE_FIND_FINISH: - { + case MDG_EVENT_DEVICE_FIND_FINISH: { if (handle->device_find_finish_cb.finish_cb) { handle->device_find_finish_cb.finish_cb(ret, - handle->device_find_finish_cb.user_data); + handle->device_find_finish_cb.user_data); } else { _ERR("The callback not exists"); } break; } - case MDG_EVENT_INVITE_DEVICE_FINISH: - { + case MDG_EVENT_INVITE_DEVICE_FINISH: { if (handle->device_invite_finish_cb.finish_cb) { mdg_device_s *device = (mdg_device_s *)(handle->device_invite_finish_cb.device); if (device != NULL) { device->is_invited = true; } handle->device_invite_finish_cb.finish_cb(ret, device, - handle->device_invite_finish_cb.user_data); + handle->device_invite_finish_cb.user_data); } else { _ERR("The callback not exists"); } break; } - case MDG_EVENT_EJECT_DEVICE_FINISH: - { + case MDG_EVENT_EJECT_DEVICE_FINISH: { if (handle->device_eject_finish_cb.finish_cb) { handle->device_eject_finish_cb.finish_cb(ret, - handle->device_eject_finish_cb.user_data); + handle->device_eject_finish_cb.user_data); } else { _ERR("The callback not exists"); } break; } - case MDG_EVENT_SEND_DATA_FINISH: - { + case MDG_EVENT_SEND_DATA_FINISH: { char *device_id; char *channel_id; int msg_id; @@ -124,28 +117,26 @@ static void __event_cb(Group *object, mdg_device_s *device = (mdg_device_s *)(handle->send_data_finish_cb.device); if (handle->send_data_finish_cb.finish_cb) { handle->send_data_finish_cb.finish_cb(ret, device, channel_id, msg_id, data, data_len, - handle->send_data_finish_cb.user_data); + handle->send_data_finish_cb.user_data); } else { _ERR("The callback not exists"); } break; } - case MDG_EVENT_REQ_CHANNEL_LIST_FINISH: - { + case MDG_EVENT_REQ_CHANNEL_LIST_FINISH: { char *device_id; char *channel_id; mdg_get_channel_from_variant(va, &device_id, &channel_id); if (handle->request_channel_list_finish_cb.finish_cb) { handle->request_channel_list_finish_cb.finish_cb(device_id, channel_id, - handle->request_channel_list_finish_cb.user_data); + handle->request_channel_list_finish_cb.user_data); } else { _ERR("The callback not exists"); } break; } - case MDG_EVENT_RECEIVE_DATA: - { + case MDG_EVENT_RECEIVE_DATA: { char *device_id; char *channel_id; int msg_id; @@ -164,25 +155,23 @@ static void __event_cb(Group *object, } if (channel != NULL) - channel->cb(0, device_id, channel_id, msg_id, data, data_len, channel->user_data); + channel->cb(0, device_id, channel_id, msg_id, data, data_len, channel->user_data); break; } - case MDG_EVENT_SEND_FILE_PROGRESS: - { + case MDG_EVENT_SEND_FILE_PROGRESS: { if (handle->send_file_cb.progress_cb) { int percent = 0; long long send_size, total_size; char *file_path; mdg_get_progress_from_variant(va, &file_path, &send_size, &total_size, &percent); handle->send_file_cb.progress_cb(file_path, send_size, total_size, percent, - handle->send_file_cb.user_data); + handle->send_file_cb.user_data); } else { _ERR("The callback not exists"); } break; } - case MDG_EVENT_SEND_FILE_FINISH: - { + case MDG_EVENT_SEND_FILE_FINISH: { if (handle->send_file_cb.finish_cb) { mdg_device_s *device = (mdg_device_s *)(handle->send_file_cb.device); handle->send_file_cb.finish_cb(ret, device, handle->send_file_cb.user_data); @@ -191,21 +180,19 @@ static void __event_cb(Group *object, } break; } - case MDG_EVENT_RECEIVE_FILE: - { + case MDG_EVENT_RECEIVE_FILE: { if (handle->receive_file_cb.receive_cb) { char *device_id; char *file_path; mdg_get_receive_file_from_variant(va, &device_id, &file_path); handle->receive_file_cb.receive_cb(ret, device_id, file_path, - handle->receive_file_cb.user_data); + handle->receive_file_cb.user_data); } else { _ERR("The callback not exists"); } break; } - case MDG_EVENT_INVITED: - { + case MDG_EVENT_INVITED: { mdg_group_s *group = NULL; group = mdg_get_group_from_variant(va); @@ -217,8 +204,7 @@ static void __event_cb(Group *object, } break; } - case MDG_EVENT_EJECTED: - { + case MDG_EVENT_EJECTED: { mdg_group_s *group = NULL; group = mdg_get_group_from_variant(va); @@ -246,8 +232,8 @@ static int _enabler_proxy_init(mdg_manager_s *handle) int ret; handle->enabler_proxy = enabler_proxy_new_for_bus_sync(G_BUS_TYPE_SYSTEM, - G_DBUS_PROXY_FLAGS_NONE, MDG_DBUS_SERVICE, - MDG_DBUS_ENABLER_PATH, NULL, &error); + G_DBUS_PROXY_FLAGS_NONE, MDG_DBUS_SERVICE, + MDG_DBUS_ENABLER_PATH, NULL, &error); if (NULL == handle->enabler_proxy) { /* LCOV_EXCL_START */ if (error != NULL) { @@ -286,7 +272,7 @@ static int _enabler_proxy_init(mdg_manager_s *handle) /* LCOV_EXCL_START */ static void _dbus_name_owner_notify(GObject *object, GParamSpec *pspec, - gpointer *user_data) + gpointer *user_data) { GDBusProxy *proxy = G_DBUS_PROXY(object); gchar *name_owner = g_dbus_proxy_get_name_owner(proxy); @@ -298,7 +284,6 @@ static void _dbus_name_owner_notify(GObject *object, GParamSpec *pspec, if (NULL == name_owner) gdbus_deinitialize(handle); free(name_owner); - } /* LCOV_EXCL_STOP */ @@ -308,12 +293,12 @@ static int _group_proxy_init(mdg_manager_s *handle) GError *error = NULL; handle->group_proxy = group_proxy_new_for_bus_sync( - G_BUS_TYPE_SYSTEM, - G_DBUS_PROXY_FLAGS_NONE, - MDG_DBUS_SERVICE, - MDG_DBUS_GROUP_PATH, - NULL, - &error); + G_BUS_TYPE_SYSTEM, + G_DBUS_PROXY_FLAGS_NONE, + MDG_DBUS_SERVICE, + MDG_DBUS_GROUP_PATH, + NULL, + &error); if (NULL == handle->group_proxy) { /* LCOV_EXCL_START */ if (error != NULL) { @@ -325,7 +310,7 @@ static int _group_proxy_init(mdg_manager_s *handle) } id = g_signal_connect(handle->group_proxy, "notify::g-name-owner", - G_CALLBACK(_dbus_name_owner_notify), handle); + G_CALLBACK(_dbus_name_owner_notify), handle); if (0 == id) { /* LCOV_EXCL_START */ _ERR("g_signal_connect() Fail"); @@ -336,12 +321,11 @@ static int _group_proxy_init(mdg_manager_s *handle) } g_signal_connect(handle->group_proxy, - "event", G_CALLBACK(__event_cb), handle); + "event", G_CALLBACK(__event_cb), handle); return MDG_ERROR_NONE; } - static void _group_proxy_deinit(mdg_manager_s *handle) { g_object_unref(handle->group_proxy); @@ -382,4 +366,3 @@ int gdbus_deinitialize(mdg_manager_s *handle) return ret; } - diff --git a/src/mdg_dbus.h b/src/mdg_dbus.h index 5dcf832..8ba4133 100644 --- a/src/mdg_dbus.h +++ b/src/mdg_dbus.h @@ -21,12 +21,11 @@ #include #ifdef __cplusplus -extern "C" -{ +extern "C" { #endif -#define MDG_DBUS_SERVICE "org.tizen.mdg" /**< For mdg dbus */ -#define MDG_DBUS_GROUP_PATH "/org/tizen/mdg/group" /**< For group dbus */ +#define MDG_DBUS_SERVICE "org.tizen.mdg" /**< For mdg dbus */ +#define MDG_DBUS_GROUP_PATH "/org/tizen/mdg/group" /**< For group dbus */ #define MDG_DBUS_ENABLER_PATH "/org/tizen/mdg/enabler" /**< dbus auto-activation */ int gdbus_initialize(mdg_manager_s *handle); diff --git a/src/mdg_debug.h b/src/mdg_debug.h index 01b1bd4..07087fe 100644 --- a/src/mdg_debug.h +++ b/src/mdg_debug.h @@ -23,14 +23,14 @@ #define NOTUSED(var) (var = var) #define COLOR_BLACK "\033[0;30m" -#define COLOR_RED "\033[0;31m" +#define COLOR_RED "\033[0;31m" #define COLOR_GREEN "\033[0;32m" #define COLOR_BROWN "\033[0;33m" -#define COLOR_BLUE "\033[0;34m" -#define COLOR_PURPLE "\033[0;35m" -#define COLOR_CYAN "\033[0;36m" -#define COLOR_GRAY "\033[0;37m" -#define COLOR_END "\033[0;m" +#define COLOR_BLUE "\033[0;34m" +#define COLOR_PURPLE "\033[0;35m" +#define COLOR_CYAN "\033[0;36m" +#define COLOR_GRAY "\033[0;37m" +#define COLOR_END "\033[0;m" #ifdef LOG_TAG #undef LOG_TAG @@ -38,72 +38,73 @@ #define LOG_TAG "MDG_CAPI" -#define _ERR(fmt, ...) \ - do { \ +#define _ERR(fmt, ...) \ + do { \ LOGE(COLOR_RED fmt COLOR_END, ##__VA_ARGS__); \ } while (0) -#define _INFO(fmt, ...) \ - do { \ +#define _INFO(fmt, ...) \ + do { \ LOGI(COLOR_GREEN fmt COLOR_END, ##__VA_ARGS__); \ } while (0) -#define _WARN(fmt, ...) \ - do { \ +#define _WARN(fmt, ...) \ + do { \ LOGI(COLOR_BROWN fmt COLOR_END, ##__VA_ARGS__); \ } while (0) -#define _DBG(fmt, ...) \ - do { \ +#define _DBG(fmt, ...) \ + do { \ LOGD(fmt, ##__VA_ARGS__); \ } while (0) -#define _BEGIN() \ - do { \ +#define _BEGIN() \ + do { \ LOGD(COLOR_BLUE "BEGIN >>>>" COLOR_END); \ } while (0) -#define _END() \ - do { \ +#define _END() \ + do { \ LOGD(COLOR_BLUE "END <<<<" COLOR_END); \ } while (0) -#define cond_expr_ret(expr, val) \ - do { \ - if (expr) { \ +#define cond_expr_ret(expr, val) \ + do { \ + if (expr) { \ _ERR("[precond fail] expr : %s, ret : %d\n", #expr, val); \ - return (val); \ - } \ + return (val); \ + } \ } while (0) -#define cond_ret(val) \ - do { \ - if (val) { \ +#define cond_ret(val) \ + do { \ + if (val) { \ _ERR("[precond fail] ret : %d\n", val); \ - return (val); \ - } \ + return (val); \ + } \ } while (0) -#define mdg_check_null_ret_error(name, value, error) do { \ - /* LCOV_EXCL_START */ \ - if (G_UNLIKELY(NULL == (value))) { \ - LOGE("%s is NULL", name); \ - return error; \ - } \ - /* LCOV_EXCL_STOP */ \ -} while (FALSE) - -#define mdg_check_null_ret(name, value) do { \ - /* LCOV_EXCL_START */ \ - if (G_UNLIKELY(NULL == (value))) { \ - LOGE("%s is NULL", name); \ - return; \ - } \ - /* LCOV_EXCL_STOP */ \ -} while (FALSE) - - -#define PRT(format, args...) printf("%s:%d() "format, __FUNCTION__, __LINE__, ##args) -#define TC_PRT(format, args...) PRT(format"\n", ##args) +#define mdg_check_null_ret_error(name, value, error) \ + do { \ + /* LCOV_EXCL_START */ \ + if (G_UNLIKELY(NULL == (value))) { \ + LOGE("%s is NULL", name); \ + return error; \ + } \ + /* LCOV_EXCL_STOP */ \ + } while (FALSE) + +#define mdg_check_null_ret(name, value) \ + do { \ + /* LCOV_EXCL_START */ \ + if (G_UNLIKELY(NULL == (value))) { \ + LOGE("%s is NULL", name); \ + return; \ + } \ + /* LCOV_EXCL_STOP */ \ + } while (FALSE) + +#define PRT(format, args...) printf("%s:%d() " format, __FUNCTION__, __LINE__, ##args) +#define TC_PRT(format, args...) PRT(format "\n", ##args) #endif /* __TIZEN_NETWORK_MDG_DEBUG_H__ */ diff --git a/src/mdg_private.h b/src/mdg_private.h index b0d622e..53f2e84 100755 --- a/src/mdg_private.h +++ b/src/mdg_private.h @@ -18,49 +18,50 @@ #ifndef __TIZEN_NETWORK_COMMON_MDG_PRIVATE_H__ #define __TIZEN_NETWORK_COMMON_MDG_PRIVATE_H__ -#include #include +#include #include -#include -#include #include +#include +#include #include #define MDG_FEATURE "http://tizen.org/feature/network.mdg" -#define CHECK_INPUT_PARAMETER(arg) \ - if (arg == NULL) { \ +#define CHECK_INPUT_PARAMETER(arg) \ + if (arg == NULL) { \ mdg_supported("INVALID_PARAMETER"); \ return MDG_ERROR_INVALID_PARAMETER; \ } #if 0 -#define CHECK_FEATURE_SUPPORTED(feature_name) { \ - bool mdg_supported = FALSE; \ - if (!system_info_get_platform_bool(feature_name, &mdg_supported)) { \ - if (mdg_supported == FALSE) { \ - _WARN("Multi Device Group Manager feature is disabled"); \ - return MDG_ERROR_NOT_SUPPORTED; \ - } \ - } else { \ - _ERR("Error - Feature getting from System Info"); \ - return MDG_ERROR_NOT_SUPPORTED; \ - } \ -} +#define CHECK_FEATURE_SUPPORTED(feature_name) \ + { \ + bool mdg_supported = FALSE; \ + if (!system_info_get_platform_bool(feature_name, &mdg_supported)) { \ + if (mdg_supported == FALSE) { \ + _WARN("Multi Device Group Manager feature is disabled"); \ + return MDG_ERROR_NOT_SUPPORTED; \ + } \ + } else { \ + _ERR("Error - Feature getting from System Info"); \ + return MDG_ERROR_NOT_SUPPORTED; \ + } \ + } #else -#define CHECK_FEATURE_SUPPORTED(feature_name) { \ +#define CHECK_FEATURE_SUPPORTED(feature_name) \ + { \ _WARN("[Feature] Should be check !"); \ } #endif - /** * @brief New group found callback structure * @since_tizen 5.0 */ typedef struct _group_found_cb_t { mdg_group_found_cb found_cb; /**< User callback to be called */ - void *user_data; /**< User data pointer */ + void *user_data; /**< User data pointer */ } group_found_cb_t; /** @@ -69,7 +70,7 @@ typedef struct _group_found_cb_t { */ typedef struct _device_found_cb_t { mdg_device_found_cb found_cb; /**< User callback to be called */ - void *user_data; /**< User data pointer */ + void *user_data; /**< User data pointer */ } device_found_cb_t; /** @@ -78,7 +79,7 @@ typedef struct _device_found_cb_t { */ typedef struct _group_find_finish_cb_t { mdg_group_find_finish_cb finish_cb; /**< User callback to be called */ - void *user_data; /**< User data pointer */ + void *user_data; /**< User data pointer */ } group_find_finish_cb_t; /** @@ -106,7 +107,7 @@ typedef struct _device_invite_finish_cb_t { */ typedef struct _device_eject_finish_cb_t { mdg_group_eject_device_finish_cb finish_cb; /**< User callback to be called */ - void *user_data; /**< User data pointer */ + void *user_data; /**< User data pointer */ } device_eject_finish_cb_t; /** @@ -125,14 +126,14 @@ typedef struct _send_data_finish_cb_t { */ typedef struct _send_file_cb_t { mdg_send_file_progress_cb progress_cb; /**< User callback to be called */ - mdg_send_file_finish_cb finish_cb; /**< User callback to be called */ + mdg_send_file_finish_cb finish_cb; /**< User callback to be called */ mdg_device_h device; void *user_data; /**< User data pointer */ } send_file_cb_t; typedef struct _receive_file_cb_t { mdg_receive_file_cb receive_cb; /**< User callback to be called */ - void *user_data; /**< User data pointer */ + void *user_data; /**< User data pointer */ } receive_file_cb_t; /** @@ -141,22 +142,22 @@ typedef struct _receive_file_cb_t { */ typedef struct _request_result_cb_t { mdg_request_result_cb result_cb; /**< User callback to be called */ - void *user_data; /**< User data pointer */ + void *user_data; /**< User data pointer */ } request_result_cb_t; typedef struct _request_channel_list_finish_cb_t { mdg_request_channel_list_finish_cb finish_cb; /**< User callback to be called */ - void *user_data; /**< User data pointer */ + void *user_data; /**< User data pointer */ } request_channel_list_finish_cb_t; typedef struct _invited_event_cb_t { mdg_invited_event_cb invited_event_cb; /**< User callback to be called */ - void *user_data; /**< User data pointer */ + void *user_data; /**< User data pointer */ } invited_event_cb_t; typedef struct _ejected_event_cb_t { mdg_ejected_event_cb ejected_event_cb; /**< User callback to be called */ - void *user_data; /**< User data pointer */ + void *user_data; /**< User data pointer */ } ejected_event_cb_t; /** @@ -164,38 +165,39 @@ typedef struct _ejected_event_cb_t { * @since_tizen 5.0 */ typedef struct _mdg_manager_s { - Group *group_proxy; /**< To receive signal from cmdgd */ - Enabler *enabler_proxy; /**< Enbler proxy */ + Group *group_proxy; /**< To receive signal from cmdgd */ + Enabler *enabler_proxy; /**< Enbler proxy */ GDBusConnection *system_bus; /**< GDBus System Bus */ GSList *channel_cb_list; - group_found_cb_t group_found_cb; /**< When it called after finding a every single group */ - group_find_finish_cb_t group_find_finish_cb; /**< When it called the group finging time is up */ - device_found_cb_t device_found_cb; /**< When it called after finding a every single device */ - device_find_finish_cb_t device_find_finish_cb; /**< When it called the device finging time is up */ - device_invite_finish_cb_t device_invite_finish_cb; /**< When it called after invinting a device done or timeout */ - device_eject_finish_cb_t device_eject_finish_cb; /**< When it called after ejecting the device done or timeout */ - send_data_finish_cb_t send_data_finish_cb; /**< When it called after sending the device done or timeout */ - send_file_cb_t send_file_cb; /**< When it called after sending the device done or timeout */ - receive_file_cb_t receive_file_cb; /**< When it called after sending the device done or timeout */ - request_result_cb_t request_result_cb; /**< When it called after sending private commands or timeout */ + group_found_cb_t group_found_cb; /**< When it called after finding a every single group */ + group_find_finish_cb_t group_find_finish_cb; /**< When it called the group finging time is up */ + device_found_cb_t device_found_cb; /**< When it called after finding a every single device */ + device_find_finish_cb_t device_find_finish_cb; /**< When it called the device finging time is up */ + device_invite_finish_cb_t device_invite_finish_cb; /**< When it called after invinting a device done or timeout */ + device_eject_finish_cb_t device_eject_finish_cb; /**< When it called after ejecting the device done or timeout */ + send_data_finish_cb_t send_data_finish_cb; /**< When it called after sending the device done or timeout */ + send_file_cb_t send_file_cb; /**< When it called after sending the device done or timeout */ + receive_file_cb_t receive_file_cb; /**< When it called after sending the device done or timeout */ + request_result_cb_t request_result_cb; /**< When it called after sending private commands or timeout */ request_channel_list_finish_cb_t request_channel_list_finish_cb; /**< When it called after sending private commands or timeout */ invited_event_cb_t invited_event_cb; ejected_event_cb_t ejected_event_cb; } mdg_manager_s; -#define CHECK_HANDLE_IS_VALID(handle) { \ - if (g_slist_find(handle_list, handle) == NULL) \ - return MDG_ERROR_NO_DATA; \ -} +#define CHECK_HANDLE_IS_VALID(handle) \ + { \ + if (g_slist_find(handle_list, handle) == NULL) \ + return MDG_ERROR_NO_DATA; \ + } /** * @brief The group structure * @since_tizen 5.0 */ typedef struct _mdg_group_s { - char *device_id; /**< Device ID of the device has this group resource */ - char *group_name; /**< Group Name (Friendly name) */ + char *device_id; /**< Device ID of the device has this group resource */ + char *group_name; /**< Group Name (Friendly name) */ mdg_group_type_e type; /**< Mine or Remote */ } mdg_group_s; diff --git a/src/mdg_util.c b/src/mdg_util.c index 7f10160..7ee9a25 100755 --- a/src/mdg_util.c +++ b/src/mdg_util.c @@ -15,10 +15,10 @@ * */ #include -#include #include #include #include +#include mdg_group_s *mdg_get_group_from_variant(GVariant *va) { @@ -31,10 +31,10 @@ mdg_group_s *mdg_get_group_from_variant(GVariant *va) mdg_group_s *group = calloc(1, sizeof(mdg_group_s)); if (NULL == group) { - /* LCOV_EXCL_START */ - _ERR("Memory allocation failed"); - return NULL; - /* LCOV_EXCL_STOP */ + /* LCOV_EXCL_START */ + _ERR("Memory allocation failed"); + return NULL; + /* LCOV_EXCL_STOP */ } g_variant_get(va, "a{sv}", &iter); @@ -72,10 +72,10 @@ mdg_device_s *mdg_get_device_from_variant(GVariant *va) mdg_device_s *device = calloc(1, sizeof(mdg_device_s)); if (NULL == device) { - /* LCOV_EXCL_START */ - _ERR("Memory allocation failed"); - return NULL; - /* LCOV_EXCL_STOP */ + /* LCOV_EXCL_START */ + _ERR("Memory allocation failed"); + return NULL; + /* LCOV_EXCL_STOP */ } g_variant_get(va, "a{sv}", &iter); @@ -130,7 +130,7 @@ void mdg_get_channel_from_variant(GVariant *va, char **device_id, char **channel } void mdg_get_data_from_variant(GVariant *va, char **device_id, char **channel_id, - int *msg_id, unsigned char **data, int *data_len) + int *msg_id, unsigned char **data, int *data_len) { GVariantIter *iter = NULL; const gchar *key; @@ -166,7 +166,7 @@ void mdg_get_data_from_variant(GVariant *va, char **device_id, char **channel_id } void mdg_get_progress_from_variant(GVariant *va, char **file_path, - long long *send_size, long long *total_size, int *percent) + long long *send_size, long long *total_size, int *percent) { GVariantIter *iter = NULL; const gchar *key; @@ -213,21 +213,21 @@ GVariant *mdg_create_variant_device(mdg_device_s *device) builder = g_variant_builder_new(G_VARIANT_TYPE("a{sv}")); g_variant_builder_add(builder, "{sv}", "DeviceID", - g_variant_new_string(device->device_id)); + g_variant_new_string(device->device_id)); g_variant_builder_add(builder, "{sv}", "ModelName", - g_variant_new_string(device->model_name)); + g_variant_new_string(device->model_name)); g_variant_builder_add(builder, "{sv}", "DeviceName", - g_variant_new_string(device->device_name)); + g_variant_new_string(device->device_name)); g_variant_builder_add(builder, "{sv}", "PlatformVer", - g_variant_new_string(device->platform_ver)); + g_variant_new_string(device->platform_ver)); g_variant_builder_add(builder, "{sv}", "VendorID", - g_variant_new_string(device->vendor_id)); + g_variant_new_string(device->vendor_id)); g_variant_builder_add(builder, "{sv}", "Profile", - g_variant_new_string(device->profile)); + g_variant_new_string(device->profile)); g_variant_builder_add(builder, "{sv}", "IsInvited", - g_variant_new_int32(device->is_invited)); + g_variant_new_int32(device->is_invited)); g_variant_builder_add(builder, "{sv}", "Type", - g_variant_new_int32(device->type)); + g_variant_new_int32(device->type)); va = g_variant_builder_end(builder); @@ -235,4 +235,3 @@ GVariant *mdg_create_variant_device(mdg_device_s *device) return va; } - diff --git a/src/mdg_util.h b/src/mdg_util.h index bfead55..c3dde47 100755 --- a/src/mdg_util.h +++ b/src/mdg_util.h @@ -21,8 +21,7 @@ #include #ifdef __cplusplus -extern "C" -{ +extern "C" { #endif GVariant *mdg_create_variant_device(mdg_device_s *device); @@ -30,10 +29,10 @@ mdg_device_s *mdg_get_device_from_variant(GVariant *va); mdg_group_s *mdg_get_group_from_variant(GVariant *va); void mdg_get_channel_from_variant(GVariant *va, char **device_id, char **channel_id); void mdg_get_data_from_variant(GVariant *va, char **device_id, char **channel_id, - int *msg_id, unsigned char **data, int *data_len); + int *msg_id, unsigned char **data, int *data_len); void mdg_get_receive_file_from_variant(GVariant *va, char **device_id, char **file_path); void mdg_get_progress_from_variant(GVariant *va, char **file_path, - long long *send_size, long long *total_size, int *percent); + long long *send_size, long long *total_size, int *percent); #ifdef __cplusplus } diff --git a/test/common.h b/test/common.h index 79f3102..293ebea 100755 --- a/test/common.h +++ b/test/common.h @@ -23,7 +23,7 @@ __BEGIN_DECLS -const char* mdg_error_to_string(mdg_error_e err); +const char *mdg_error_to_string(mdg_error_e err); const char *mdg_group_type_to_string(mdg_group_type_e e); __END_DECLS diff --git a/test/menu.c b/test/menu.c index c217f6b..5ba8dd5 100755 --- a/test/menu.c +++ b/test/menu.c @@ -16,22 +16,22 @@ */ #define _GNU_SOURCE +#include +#include #include #include #include +#include #include -#include -#include #include -#include #include "menu.h" -#define DEFAULT_MENU_MENU "m" -#define DEFAULT_MENU_PREV "p" -#define DEFAULT_MENU_QUIT "q" -#define DEFAULT_MENU_NONE "-" -#define TAB_SPACE " " +#define DEFAULT_MENU_MENU "m" +#define DEFAULT_MENU_PREV "p" +#define DEFAULT_MENU_QUIT "q" +#define DEFAULT_MENU_NONE "-" +#define TAB_SPACE " " struct menu_manager { GQueue *stack; @@ -45,7 +45,6 @@ struct menu_manager { GMainLoop *mainloop; }; - char key_buffer[MENU_DATA_SIZE]; int flag_pid_display = 1; @@ -62,11 +61,14 @@ static void _show_reserved_menu(void) msg(ANSI_COLOR_DARKGRAY HR_SINGLE2 ANSI_COLOR_NORMAL); msg(ANSI_COLOR_DARKGRAY HR_SINGLE2 ANSI_COLOR_NORMAL); msg(ANSI_COLOR_DARKGRAY " [ " ANSI_COLOR_NORMAL "%s" ANSI_COLOR_DARKGRAY - " ] " ANSI_COLOR_NORMAL "Previous menu " , DEFAULT_MENU_PREV); + " ] " ANSI_COLOR_NORMAL "Previous menu ", + DEFAULT_MENU_PREV); msg(ANSI_COLOR_DARKGRAY " [ " ANSI_COLOR_NORMAL "%s" ANSI_COLOR_DARKGRAY - " ] " ANSI_COLOR_NORMAL "Show Menu " , DEFAULT_MENU_MENU); + " ] " ANSI_COLOR_NORMAL "Show Menu ", + DEFAULT_MENU_MENU); msg(ANSI_COLOR_DARKGRAY " [ " ANSI_COLOR_NORMAL "%s" ANSI_COLOR_DARKGRAY - " ] " ANSI_COLOR_NORMAL "Quit " , DEFAULT_MENU_QUIT); + " ] " ANSI_COLOR_NORMAL "Quit ", + DEFAULT_MENU_QUIT); } static void _show_input_ok(void) @@ -79,7 +81,9 @@ static void _show_menu(MManager *m, struct menu_data menu[]) int i = 0; int len = 0; struct menu_data *item; - char title_buf[256] = { 0, }; + char title_buf[256] = { + 0, + }; if (!menu) return; @@ -92,7 +96,7 @@ static void _show_menu(MManager *m, struct menu_data menu[]) if (len > 0) { for (i = 0; i < len; i++) { msgn(ANSI_COLOR_NORMAL " >> " ANSI_COLOR_YELLOW "%s", - (char *)g_queue_peek_nth(m->title_stack, i)); + (char *)g_queue_peek_nth(m->title_stack, i)); } } msg(ANSI_COLOR_NORMAL); @@ -122,8 +126,7 @@ static void _show_menu(MManager *m, struct menu_data menu[]) if (item->callback) item->callback(m, item); } else { - msgn(ANSI_COLOR_DARKGRAY " [" ANSI_COLOR_NORMAL "%3s" - ANSI_COLOR_DARKGRAY "] " ANSI_COLOR_NORMAL, item->key); + msgn(ANSI_COLOR_DARKGRAY " [" ANSI_COLOR_NORMAL "%3s" ANSI_COLOR_DARKGRAY "] " ANSI_COLOR_NORMAL, item->key); } memset(title_buf, 0, 256); @@ -138,7 +141,7 @@ static void _show_menu(MManager *m, struct menu_data menu[]) if (item->data) { msg("%s " ANSI_COLOR_LIGHTBLUE "(%s)" ANSI_COLOR_NORMAL, - title_buf, item->data); + title_buf, item->data); } else if (!g_strcmp0(item->key, "*")) { /* none */ } else { @@ -280,10 +283,12 @@ void *menu_manager_ref_user_data(MManager *mm) } gboolean on_menu_manager_keyboard(GIOChannel *src, GIOCondition con, - gpointer data) + gpointer data) { MManager *mm = data; - char local_buf[MENU_DATA_SIZE + 1] = { 0, }; + char local_buf[MENU_DATA_SIZE + 1] = { + 0, + }; if (fgets(local_buf, MENU_DATA_SIZE, stdin) == NULL) return TRUE; @@ -335,8 +340,12 @@ int is_pid_show() static void _hex_dump(const char *pad, int size, const void *data) { - char buf[255] = {0, }; - char hex[4] = {0, }; + char buf[255] = { + 0, + }; + char hex[4] = { + 0, + }; int i; unsigned char *p; diff --git a/test/menu.h b/test/menu.h index fcfcfc8..29f8031 100755 --- a/test/menu.h +++ b/test/menu.h @@ -20,82 +20,106 @@ __BEGIN_DECLS -#define ANSI_COLOR_NORMAL "\e[0m" - -#define ANSI_COLOR_BLACK "\e[0;30m" -#define ANSI_COLOR_RED "\e[0;31m" -#define ANSI_COLOR_GREEN "\e[0;32m" -#define ANSI_COLOR_BROWN "\e[0;33m" -#define ANSI_COLOR_BLUE "\e[0;34m" -#define ANSI_COLOR_MAGENTA "\e[0;35m" -#define ANSI_COLOR_CYAN "\e[0;36m" -#define ANSI_COLOR_LIGHTGRAY "\e[0;37m" - -#define ANSI_COLOR_DARKGRAY "\e[1;30m" -#define ANSI_COLOR_LIGHTRED "\e[1;31m" -#define ANSI_COLOR_LIGHTGREEN "\e[1;32m" -#define ANSI_COLOR_YELLOW "\e[1;33m" -#define ANSI_COLOR_LIGHTBLUE "\e[1;34m" +#define ANSI_COLOR_NORMAL "\e[0m" + +#define ANSI_COLOR_BLACK "\e[0;30m" +#define ANSI_COLOR_RED "\e[0;31m" +#define ANSI_COLOR_GREEN "\e[0;32m" +#define ANSI_COLOR_BROWN "\e[0;33m" +#define ANSI_COLOR_BLUE "\e[0;34m" +#define ANSI_COLOR_MAGENTA "\e[0;35m" +#define ANSI_COLOR_CYAN "\e[0;36m" +#define ANSI_COLOR_LIGHTGRAY "\e[0;37m" + +#define ANSI_COLOR_DARKGRAY "\e[1;30m" +#define ANSI_COLOR_LIGHTRED "\e[1;31m" +#define ANSI_COLOR_LIGHTGREEN "\e[1;32m" +#define ANSI_COLOR_YELLOW "\e[1;33m" +#define ANSI_COLOR_LIGHTBLUE "\e[1;34m" #define ANSI_COLOR_LIGHTMAGENTA "\e[1;35m" -#define ANSI_COLOR_LIGHTCYAN "\e[1;36m" -#define ANSI_COLOR_WHITE "\e[1;37m" - - -#define msg(fmt, args...) do { fprintf(stdout, fmt "\n", ##args); \ - fflush(stdout); } while (0) -#define msgn(fmt, args...) do { fprintf(stdout, fmt, ##args); \ - fflush(stdout); } while (0) +#define ANSI_COLOR_LIGHTCYAN "\e[1;36m" +#define ANSI_COLOR_WHITE "\e[1;37m" + +#define msg(fmt, args...) \ + do { \ + fprintf(stdout, fmt "\n", ##args); \ + fflush(stdout); \ + } while (0) +#define msgn(fmt, args...) \ + do { \ + fprintf(stdout, fmt, ##args); \ + fflush(stdout); \ + } while (0) /* Bold (red) */ -#define msgr(fmt, args...) do { fprintf(stdout, ANSI_COLOR_RED fmt \ - ANSI_COLOR_NORMAL "\n", ##args); fflush(stdout); } while (0) +#define msgr(fmt, args...) \ + do { \ + fprintf(stdout, ANSI_COLOR_RED fmt ANSI_COLOR_NORMAL "\n", ##args); \ + fflush(stdout); \ + } while (0) /* Bold (green) */ -#define msgb(fmt, args...) do { fprintf(stdout, ANSI_COLOR_LIGHTGREEN fmt \ - ANSI_COLOR_NORMAL "\n", ##args); fflush(stdout); } while (0) +#define msgb(fmt, args...) \ + do { \ + fprintf(stdout, ANSI_COLOR_LIGHTGREEN fmt ANSI_COLOR_NORMAL "\n", ##args); \ + fflush(stdout); \ + } while (0) /* Property message */ -#define msgp(fmt, args...) do { fprintf(stdout, ANSI_COLOR_LIGHTMAGENTA fmt \ - ANSI_COLOR_NORMAL "\n", ##args); fflush(stdout); } while (0) - -#define msgt(n, fmt, args...) do { fprintf(stdout, "\e[%dC" fmt "\n", \ - 3 + ((n) * 2), ##args); fflush(stdout); } while (0) - -#define pmsg(fmt, args...) do { \ - if (is_pid_show()) \ - fprintf(stdout, "(%5d) ", get_tid()); \ - fprintf(stdout, fmt "\n", ##args); fflush(stdout); } while (0) - -#define pmsgb(fmt, args...) do { \ - if (is_pid_show()) \ - fprintf(stdout, "(%5d) ", get_tid()); \ - fprintf(stdout, ANSI_COLOR_LIGHTGREEN fmt \ - ANSI_COLOR_NORMAL "\n", ##args); fflush(stdout); } while (0) - -#define pmsgt(n, fmt, args...) do { \ - if (is_pid_show()) \ - fprintf(stdout, "(%5d) ", get_tid()); \ - fprintf(stdout, "\e[%dC" fmt "\n", \ - 3 + ((n) * 2), ##args); fflush(stdout); } while (0) +#define msgp(fmt, args...) \ + do { \ + fprintf(stdout, ANSI_COLOR_LIGHTMAGENTA fmt ANSI_COLOR_NORMAL "\n", ##args); \ + fflush(stdout); \ + } while (0) + +#define msgt(n, fmt, args...) \ + do { \ + fprintf(stdout, "\e[%dC" fmt "\n", \ + 3 + ((n)*2), ##args); \ + fflush(stdout); \ + } while (0) + +#define pmsg(fmt, args...) \ + do { \ + if (is_pid_show()) \ + fprintf(stdout, "(%5d) ", get_tid()); \ + fprintf(stdout, fmt "\n", ##args); \ + fflush(stdout); \ + } while (0) + +#define pmsgb(fmt, args...) \ + do { \ + if (is_pid_show()) \ + fprintf(stdout, "(%5d) ", get_tid()); \ + fprintf(stdout, ANSI_COLOR_LIGHTGREEN fmt ANSI_COLOR_NORMAL "\n", ##args); \ + fflush(stdout); \ + } while (0) + +#define pmsgt(n, fmt, args...) \ + do { \ + if (is_pid_show()) \ + fprintf(stdout, "(%5d) ", get_tid()); \ + fprintf(stdout, "\e[%dC" fmt "\n", \ + 3 + ((n)*2), ##args); \ + fflush(stdout); \ + } while (0) #define MENU_DATA_SIZE 255 - - /* * Horizontal Line - width: 65 * .12345678901234567890123456789012345678901234567890. */ -#define HR_SINGLE "----------------------------------------" \ - "-------------------------" -#define HR_DOUBLE "========================================" \ - "=========================" -#define HR_SINGLE2 " ---------------------------------------" \ - "------------------------ " - -#define MAX_WIDTH strlen(HR_SINGLE) -#define MAX_TITLE ((MAX_WIDTH) - 10) -#define POS_MORE ((MAX_WIDTH) - 3) +#define HR_SINGLE "----------------------------------------" \ + "-------------------------" +#define HR_DOUBLE "========================================" \ + "=========================" +#define HR_SINGLE2 " ---------------------------------------" \ + "------------------------ " + +#define MAX_WIDTH strlen(HR_SINGLE) +#define MAX_TITLE ((MAX_WIDTH)-10) +#define POS_MORE ((MAX_WIDTH)-3) #define RET_SUCCESS 0 #define RET_FAILURE -1 @@ -109,13 +133,13 @@ struct menu_data { char *data; }; -MManager* menu_manager_new(struct menu_data items[], GMainLoop *mainloop); +MManager *menu_manager_new(struct menu_data items[], GMainLoop *mainloop); int menu_manager_run(MManager *mm); int menu_manager_set_user_data(MManager *mm, void *user_data); -void* menu_manager_ref_user_data(MManager *mm); +void *menu_manager_ref_user_data(MManager *mm); -gboolean on_menu_manager_keyboard(GIOChannel *src, GIOCondition con, - gpointer data); +gboolean on_menu_manager_keyboard(GIOChannel *src, GIOCondition con, + gpointer data); pid_t get_tid(); void hide_pid(); -- 2.7.4