From 439521f48695f24092f48aab5e81b80ea0a69253 Mon Sep 17 00:00:00 2001 From: "chleun.moon" Date: Fri, 1 Apr 2016 10:44:44 +0900 Subject: [PATCH] Applied code conventions Change-Id: Ic59c8977f353aa3300fccae62bdf26ee088297fd Signed-off-by: cheoleun --- doc/nsd_doc.h | 2 +- include/dns-sd.h | 6 +-- include/ssdp.h | 12 +++--- src/dns-sd/dns-sd-util.h | 10 ++--- src/dns-sd/dns-sd.c | 58 ++++++++++++------------- src/ssdp/ssdp-util.h | 22 +++++----- src/ssdp/ssdp.c | 101 +++++++++++++++++++------------------------ test/dns-sd-test.c | 26 ++++++------ test/ssdp-browse-test.c | 13 +++--- test/ssdp-register-test.c | 23 +++++----- test/ssdp-test.c | 106 +++++++++++++++++++++++----------------------- 11 files changed, 180 insertions(+), 199 deletions(-) diff --git a/doc/nsd_doc.h b/doc/nsd_doc.h index ff92501..bd72d67 100644 --- a/doc/nsd_doc.h +++ b/doc/nsd_doc.h @@ -33,7 +33,7 @@ * You should stop browsing if you do not need it anymore. * @section CAPI_NETWORK_SSDP_MODULE_FEATURE Related Features * This API is related with the following features:\n - * - http://tizen.org/feature/network.service_discovery.ssdp + * - http://tizen.org/feature/network.service_discovery.ssdp * * It is recommended to design feature related codes in your application for reliability.\n * diff --git a/include/dns-sd.h b/include/dns-sd.h index f573030..f5784f8 100644 --- a/include/dns-sd.h +++ b/include/dns-sd.h @@ -21,8 +21,7 @@ extern "C" { * @brief Enumeration for Network Service Discovery DNSSD error code. * @since_tizen 3.0 */ -typedef enum -{ +typedef enum { DNSSD_ERROR_NONE = TIZEN_ERROR_NONE, /**< Successful */ DNSSD_ERROR_OUT_OF_MEMORY = TIZEN_ERROR_OUT_OF_MEMORY, /**< Out of memory*/ DNSSD_ERROR_INVALID_OPERATION = TIZEN_ERROR_INVALID_OPERATION, /**< Invalid operation */ @@ -40,8 +39,7 @@ typedef enum * @brief Enumeration for Network Service Discovery DNSSD browse state. * @since_tizen 3.0 */ -typedef enum -{ +typedef enum { DNSSD_SERVICE_STATE_AVAILABLE, /**sd_ref; record_client = reg->record_ref; - if(NULL == record_client) { + if (NULL == record_client) { DNSSD_LOGE("Invalid DNS SD Client"); __DNSSD_LOG_FUNC_EXIT__; return DNSSD_ERROR_INVALID_PARAMETER; @@ -518,7 +518,7 @@ int dnssd_service_unset_record(dnssd_service_h local_service, ret = DNSServiceRemoveRecord(sd_ref, record_client, local_handle->flags); - if(ret < 0) { + if (ret < 0) { DNSSD_LOGE("Failed to Remove Record for DNS Service, error[%s]", //LCOV_EXCL_LINE dnssd_error_to_string(ret)); //LCOV_EXCL_LINE __DNSSD_LOG_FUNC_EXIT__; //LCOV_EXCL_LINE @@ -629,7 +629,7 @@ int dnssd_register_local_service(dnssd_service_h local_service, local_handle->service_type, local_handle->domain, NULL, reg->port, 1, "", __dnssd_register_reply_cb, NULL); - if(ret < 0) { + if (ret < 0) { DNSSD_LOGE("Failed to register for dns service, error[%s]", //LCOV_EXCL_LINE dnssd_error_to_string(ret)); //LCOV_EXCL_LINE __DNSSD_LOG_FUNC_EXIT__; //LCOV_EXCL_LINE @@ -676,7 +676,7 @@ int dnssd_deregister_local_service(dnssd_service_h local_service) } sd_ref = local_handle->sd_ref; - if(NULL == sd_ref) { + if (NULL == sd_ref) { DNSSD_LOGE("Invalid DNS SD Client"); __DNSSD_LOG_FUNC_EXIT__; return DNSSD_ERROR_INVALID_PARAMETER; @@ -687,7 +687,7 @@ int dnssd_deregister_local_service(dnssd_service_h local_service) if (record_client) { ret = DNSServiceRemoveRecord(sd_ref, record_client, local_handle->flags); - if(ret < 0) //LCOV_EXCL_LINE + if (ret < 0) //LCOV_EXCL_LINE DNSSD_LOGE("Failed to Remove Record for DNS Service, " //LCOV_EXCL_LINE "error[%s]", dnssd_error_to_string(ret)); //LCOV_EXCL_LINE else //LCOV_EXCL_LINE @@ -714,7 +714,7 @@ static void __dnssd_getaddrinfo_reply_cb(DNSServiceRef sd_ref, dnssd_found_cb callback; void *data; - if(user_data == NULL) { + if (user_data == NULL) { DNSSD_LOGD("Invalid found handle"); __DNSSD_LOG_FUNC_EXIT__; return; @@ -731,7 +731,7 @@ static void __dnssd_getaddrinfo_reply_cb(DNSServiceRef sd_ref, local_handle->flags); dnssd_handle = __dnssd_check_handle_validity(found->browse_handler); - if(dnssd_handle == NULL) { + if (dnssd_handle == NULL) { DNSSD_LOGD("Invalid browse handle"); __DNSSD_LOG_FUNC_EXIT__; return; @@ -783,7 +783,7 @@ static int __dnssd_getaddrinfo(dnssd_handle_s *dnssd_handle, unsigned int flags, char *save_str = NULL; int dns_protocol = kDNSServiceProtocol_IPv4 | kDNSServiceProtocol_IPv6; - if(dnssd_handle == NULL) { + if (dnssd_handle == NULL) { DNSSD_LOGD("Invalid browse handle"); __DNSSD_LOG_FUNC_EXIT__; return DNSSD_ERROR_OUT_OF_MEMORY; @@ -798,7 +798,7 @@ static int __dnssd_getaddrinfo(dnssd_handle_s *dnssd_handle, unsigned int flags, domain = strtok_r(NULL, ".", &save_str); local_handle = g_try_malloc0(FOUND_SIZE); - if(local_handle == NULL) { + if (local_handle == NULL) { DNSSD_LOGD("g_try_malloc failed"); g_free(name); __DNSSD_LOG_FUNC_EXIT__; @@ -811,14 +811,14 @@ static int __dnssd_getaddrinfo(dnssd_handle_s *dnssd_handle, unsigned int flags, local_handle->service_handler = (unsigned int)local_handle & 0xffffffff; g_strlcpy(local_handle->domain, domain, sizeof(local_handle->domain)); local_handle->if_index = if_index; - local_handle->flags= flags; - if(dnssd_handle->service_type) + local_handle->flags = flags; + if (dnssd_handle->service_type) local_handle->service_type = g_strdup(dnssd_handle->service_type); found->browse_handler = dnssd_handle->service_handler; found->service_name = g_strdup(name); g_free(name); - if(txt_record != NULL) { + if (txt_record != NULL) { found->txt_record = g_strdup(txt_record); found->txt_len = txt_len; } @@ -836,7 +836,7 @@ static int __dnssd_getaddrinfo(dnssd_handle_s *dnssd_handle, unsigned int flags, ret = DNSServiceGetAddrInfo(sd_ref, flags, if_index, dns_protocol, host_name, __dnssd_getaddrinfo_reply_cb, local_handle); - if(ret < 0) { + if (ret < 0) { DNSSD_LOGE("Failed to GetAddrInfo, error[%s]", dnssd_error_to_string(ret)); return ret; @@ -891,7 +891,7 @@ static int __dnssd_resolve_dns_service(dnssd_handle_s *dnssd_handle, ret = DNSServiceResolve(sd_ref, flags, if_index, service_name, type, domain, __dnssd_resolve_reply_cb, data); - if(ret < 0) { + if (ret < 0) { DNSSD_LOGE("Failed to Resolve DNS Service, error[%s]", dnssd_error_to_string(ret)); __DNSSD_LOG_FUNC_EXIT__; @@ -959,7 +959,7 @@ static void __dnssd_broswe_reply_cb(DNSServiceRef sd_ref, unsigned int flags, for (list = dnssd_handle_list; list; list = list->next) { dnssd_handle = (dnssd_handle_s *) list->data; - if(dnssd_handle == NULL) + if (dnssd_handle == NULL) continue; if (dnssd_handle->sd_ref == sd_ref) { @@ -1026,7 +1026,7 @@ int dnssd_start_browsing_service(const char *service_type, return DNSSD_ERROR_NOT_INITIALIZED; //LCOV_EXCL_LINE } - if(dnssd_service == NULL || service_type == NULL || + if (dnssd_service == NULL || service_type == NULL || __dnssd_check_handle_validity(*dnssd_service) != NULL) { DNSSD_LOGE("Invalid Parameter"); __DNSSD_LOG_FUNC_EXIT__; @@ -1064,7 +1064,7 @@ int dnssd_start_browsing_service(const char *service_type, local_handle->if_index, local_handle->service_type, local_handle->domain, __dnssd_broswe_reply_cb, NULL); - if(ret < 0) { + if (ret < 0) { DNSSD_LOGE("Failed to browse for dns service, error[%s]", //LCOV_EXCL_LINE dnssd_error_to_string(ret)); //LCOV_EXCL_LINE g_free(local_handle->service_type); //LCOV_EXCL_LINE @@ -1093,12 +1093,12 @@ static void __dnssd_remove_found_service(gpointer data, gpointer user_data) found_handle = (dnssd_handle_s *)data; handler = (dnssd_service_h *)user_data; - if(found_handle->op_type != DNSSD_TYPE_FOUND) + if (found_handle->op_type != DNSSD_TYPE_FOUND) return; //LCOV_EXCL_START found_data = GET_FOUND_DATA_P(found_handle); - if(found_data->browse_handler != *handler) + if (found_data->browse_handler != *handler) return; DNSSD_LOGD("handle [0x%x]", found_handle->service_handler); @@ -1148,7 +1148,7 @@ int dnssd_stop_browsing_service(dnssd_browser_h dnssd_service) } sd_ref = local_handle->sd_ref; - if(NULL == sd_ref) { + if (NULL == sd_ref) { DNSSD_LOGE("Invalid DNS SD Client"); //LCOV_EXCL_LINE __DNSSD_LOG_FUNC_EXIT__; //LCOV_EXCL_LINE return DNSSD_ERROR_INVALID_PARAMETER; //LCOV_EXCL_LINE @@ -1241,16 +1241,16 @@ int dnssd_service_get_name(dnssd_service_h dnssd_service, char **service_name) return DNSSD_ERROR_SERVICE_NOT_FOUND; } - if(local_handle->op_type == DNSSD_TYPE_FOUND) { + if (local_handle->op_type == DNSSD_TYPE_FOUND) { dnssd_found_data_s *found = NULL; //LCOV_EXCL_LINE found = GET_FOUND_DATA_P(local_handle); //LCOV_EXCL_LINE *service_name = g_strdup(found->service_name); //LCOV_EXCL_LINE - } else if(local_handle->op_type == DNSSD_TYPE_REGISTER) { + } else if (local_handle->op_type == DNSSD_TYPE_REGISTER) { dnssd_register_data_s *reg = NULL; reg = GET_REG_DATA_P(local_handle); *service_name = g_strdup(reg->service_name); } else { - *service_name = NULL; + *service_name = NULL; DNSSD_LOGD("Invalid DNS SD service"); __DNSSD_LOG_FUNC_EXIT__; return DNSSD_ERROR_INVALID_PARAMETER; @@ -1292,7 +1292,7 @@ int dnssd_service_get_ip(dnssd_service_h dnssd_service, char **ip_v4_address, return DNSSD_ERROR_SERVICE_NOT_FOUND; } - if(local_handle->op_type != DNSSD_TYPE_FOUND) { + if (local_handle->op_type != DNSSD_TYPE_FOUND) { DNSSD_LOGD("Invalid DNS SD Service"); __DNSSD_LOG_FUNC_EXIT__; return DNSSD_ERROR_INVALID_PARAMETER; @@ -1346,11 +1346,11 @@ int dnssd_service_get_port(dnssd_service_h dnssd_service, int *port) return DNSSD_ERROR_SERVICE_NOT_FOUND; } - if(local_handle->op_type == DNSSD_TYPE_FOUND) { + if (local_handle->op_type == DNSSD_TYPE_FOUND) { dnssd_found_data_s *found = NULL; //LCOV_EXCL_LINE found = GET_FOUND_DATA_P(local_handle); //LCOV_EXCL_LINE *port = found->port; //LCOV_EXCL_LINE - } else if(local_handle->op_type == DNSSD_TYPE_REGISTER) { + } else if (local_handle->op_type == DNSSD_TYPE_REGISTER) { dnssd_register_data_s *reg = NULL; reg = GET_REG_DATA_P(local_handle); *port = reg->port; @@ -1394,7 +1394,7 @@ int dnssd_service_get_all_txt_record(dnssd_service_h dnssd_service, return DNSSD_ERROR_INVALID_PARAMETER; } - if(local_handle->op_type == DNSSD_TYPE_FOUND) { + if (local_handle->op_type == DNSSD_TYPE_FOUND) { dnssd_found_data_s *found = NULL; //LCOV_EXCL_LINE found = GET_FOUND_DATA_P(local_handle); //LCOV_EXCL_LINE diff --git a/src/ssdp/ssdp-util.h b/src/ssdp/ssdp-util.h index 3a54117..b0d1fd7 100644 --- a/src/ssdp/ssdp-util.h +++ b/src/ssdp/ssdp-util.h @@ -44,33 +44,33 @@ #endif /* USE_DLOG */ -#define NETWORK_SERVICE_DISCOVERY_FEATURE "http://tizen.org/feature/network.service_discovery" +#define NETWORK_SERVICE_DISCOVERY_FEATURE "http://tizen.org/feature/network.service_discovery" #if 0 #define CHECK_FEATURE_SUPPORTED(feature_name)\ do {\ bool feature_supported = FALSE;\ - if(!system_info_get_platform_bool(feature_name, &feature_supported)){\ - if(feature_supported == FALSE){\ + if (!system_info_get_platform_bool(feature_name, &feature_supported)) {\ + if (feature_supported == FALSE) {\ LOGE("%s feature is disabled", feature_name);\ return NSD_ERROR_NOT_SUPPORTED;\ - }\ + } \ } else {\ LOGE("Error - Feature getting from System Info");\ return NSD_ERROR_OPERATION_FAILED;\ - }\ - }while(0) + } \ + } while (0) #else #define CHECK_FEATURE_SUPPORTED(feature_name) #endif #define GLIST_ITER_START(arg_list, elem) \ - GList *temp = NULL; \ - temp = g_list_first(arg_list); \ - while (temp) {\ - elem = temp->data;\ - temp = g_list_next(temp); \ + GList *temp = NULL; \ + temp = g_list_first(arg_list); \ + while (temp) {\ + elem = temp->data;\ + temp = g_list_next(temp); \ #define GLIST_ITER_END() } diff --git a/src/ssdp/ssdp.c b/src/ssdp/ssdp.c index d716e1b..9ad0d85 100644 --- a/src/ssdp/ssdp.c +++ b/src/ssdp/ssdp.c @@ -15,7 +15,7 @@ */ /***************************************************************************** - * Standard headers + * Standard headers *****************************************************************************/ #include @@ -23,7 +23,7 @@ #include /***************************************************************************** - * System headers + * System headers *****************************************************************************/ #include #include @@ -32,14 +32,14 @@ #include /***************************************************************************** - * Network Service Discovery headers + * Network Service Discovery headers *****************************************************************************/ #include "ssdp.h" #include "ssdp-util.h" /***************************************************************************** - * Macros and Typedefs + * Macros and Typedefs *****************************************************************************/ typedef enum { @@ -75,16 +75,15 @@ typedef struct { /***************************************************************************** - * Global Variables + * Global Variables *****************************************************************************/ static __thread gboolean g_is_gssdp_init; static __thread GSSDPClient *g_gssdp_client = NULL; static __thread GList *g_ssdp_local_services = NULL; static __thread GHashTable *g_found_ssdp_services = NULL; -//static __thread GList *g_ssdp_browsers; TODO /***************************************************************************** - * Local Functions Definition + * Local Functions Definition *****************************************************************************/ /** @@ -96,11 +95,11 @@ static void __g_list_free_service(gpointer data, gpointer user_data) ssdp_service_s *service = NULL; service = (ssdp_service_s *)data; - if(service == NULL) + if (service == NULL) return; - if(service->origin == SSDP_SERVICE_STATE_NOT_REGISTERED) + if (service->origin == SSDP_SERVICE_STATE_NOT_REGISTERED) SSDP_LOGE("Free not registered service"); - else if(service->origin == SSDP_SERVICE_STATE_REGISTERED) + else if (service->origin == SSDP_SERVICE_STATE_REGISTERED) SSDP_LOGE("Free registered service"); else if (service->origin == SSDP_SERVICE_STATE_BROWSED) SSDP_LOGE("Free browsed service"); @@ -118,22 +117,16 @@ static void __g_list_free_service(gpointer data, gpointer user_data) * free a remote service */ //LCOV_EXCL_START -static void __g_hash_free_service(gpointer key, gpointer value, +static void __g_hash_free_service(gpointer key, gpointer value, gpointer user_data) { ssdp_service_s *service = NULL; service = (ssdp_service_s *)value; - if(service == NULL) + if (service == NULL) return; - /* - if(service->resource_group != NULL && service->resource_id != 0) - gssdp_resource_group_remove_resource(service->resource_group, service->resource_id); - - if(service->resource_browser != NULL) - g_object_unref (service->resource_browser); - */ - if(service->origin == SSDP_SERVICE_STATE_REGISTERED) + + if (service->origin == SSDP_SERVICE_STATE_REGISTERED) SSDP_LOGE("Free registered service"); else if (service->origin == SSDP_SERVICE_STATE_BROWSED) SSDP_LOGE("Free browsed service"); @@ -158,10 +151,10 @@ static void __g_hash_remove_related_services(gpointer key, gpointer value, int browse_id = *((unsigned int *)user_data); service = (ssdp_service_s *)value; - if(service == NULL) + if (service == NULL) return; - if(service->browser_id != browse_id) + if (service->browser_id != browse_id) return; SSDP_LOGD("Free found service"); @@ -173,7 +166,7 @@ static void __g_hash_remove_related_services(gpointer key, gpointer value, } //LCOV_EXCL_STOP -static ssdp_service_s *__ssdp_find_local_service(GList *services, +static ssdp_service_s *__ssdp_find_local_service(GList *services, unsigned int handler) { __SSDP_LOG_FUNC_ENTER__; @@ -184,8 +177,7 @@ static ssdp_service_s *__ssdp_find_local_service(GList *services, if (service && service->service_handler == handler) { SSDP_LOGD("target [%s]", service->target); break; - } - else { + } else { service = NULL; } } @@ -193,7 +185,7 @@ static ssdp_service_s *__ssdp_find_local_service(GList *services, return service; } -static ssdp_service_s *__ssdp_find_local_service_with_usn(GList *services, +static ssdp_service_s *__ssdp_find_local_service_with_usn(GList *services, const char* usn) { __SSDP_LOG_FUNC_ENTER__; @@ -204,8 +196,7 @@ static ssdp_service_s *__ssdp_find_local_service_with_usn(GList *services, if (service && !g_strcmp0(service->usn, usn)) { SSDP_LOGD("USN [%s]", service->usn); break; - } - else { + } else { service = NULL; } } @@ -213,7 +204,7 @@ static ssdp_service_s *__ssdp_find_local_service_with_usn(GList *services, return service; } -static ssdp_service_s *__ssdp_find_local_service_with_url(GList *services, +static ssdp_service_s *__ssdp_find_local_service_with_url(GList *services, const char* url) { __SSDP_LOG_FUNC_ENTER__; @@ -224,8 +215,7 @@ static ssdp_service_s *__ssdp_find_local_service_with_url(GList *services, if (service && !g_strcmp0(service->url, url)) { SSDP_LOGD("URL [%s]", service->url); break; - } - else { + } else { service = NULL; } } @@ -234,7 +224,7 @@ static ssdp_service_s *__ssdp_find_local_service_with_url(GList *services, } //LCOV_EXCL_START -static void __g_hash_find_remote_service(gpointer key, gpointer value, +static void __g_hash_find_remote_service(gpointer key, gpointer value, gpointer user_data) { ssdp_service_s *service = NULL; @@ -242,20 +232,20 @@ static void __g_hash_find_remote_service(gpointer key, gpointer value, service = (ssdp_service_s *)value; data = (foreach_hash_user_data_s *)user_data; - if(service == NULL || data == NULL) + if (service == NULL || data == NULL) return; if (service->origin != SSDP_SERVICE_STATE_FOUND) return; - if(service->service_handler == data->service_id) + if (service->service_handler == data->service_id) data->service = service; return; } //LCOV_EXCL_STOP -static ssdp_service_s *__ssdp_find_remote_service(GHashTable *services, +static ssdp_service_s *__ssdp_find_remote_service(GHashTable *services, unsigned int handler) { foreach_hash_user_data_s user_data; @@ -270,7 +260,7 @@ static ssdp_service_s *__ssdp_find_remote_service(GHashTable *services, //LCOV_EXCL_START static void -__ssdp_res_available_cb (GSSDPResourceBrowser *resource_browser, +__ssdp_res_available_cb(GSSDPResourceBrowser *resource_browser, const char *usn, GList *urls, gpointer user_data) { __SSDP_LOG_FUNC_ENTER__; @@ -302,7 +292,7 @@ __ssdp_res_available_cb (GSSDPResourceBrowser *resource_browser, for (l = urls; l != NULL; l = l->next) { ptr = temp_url; g_strlcpy(ptr, (char*)l->data, strlen((char *)l->data) + 1); - ptr+=strlen((char *)l->data); + ptr += strlen((char *)l->data); } found_service = g_hash_table_lookup(g_found_ssdp_services, usn); @@ -331,7 +321,7 @@ __ssdp_res_available_cb (GSSDPResourceBrowser *resource_browser, found_service->origin = SSDP_SERVICE_STATE_FOUND; SSDP_LOGD("added service [%u]", found_service->service_handler); - g_hash_table_insert(g_found_ssdp_services, + g_hash_table_insert(g_found_ssdp_services, found_service->usn, found_service); SSDP_LOGD("Hash tbl size [%d]", g_hash_table_size(g_found_ssdp_services)); @@ -349,7 +339,7 @@ __ssdp_res_available_cb (GSSDPResourceBrowser *resource_browser, //LCOV_EXCL_START static void -__ssdp_res_unavailable_cb (GSSDPResourceBrowser *resource_browser, +__ssdp_res_unavailable_cb(GSSDPResourceBrowser *resource_browser, const char *usn, GList *urls, gpointer user_data) { __SSDP_LOG_FUNC_ENTER__; @@ -402,7 +392,7 @@ int ssdp_initialize() return SSDP_ERROR_NONE; } - g_gssdp_client = gssdp_client_new (NULL, NULL, &gerror); + g_gssdp_client = gssdp_client_new(NULL, NULL, &gerror); if (gerror) { SSDP_LOGE("Error creating the GSSDP client: %s\n", gerror->message); @@ -567,7 +557,7 @@ int ssdp_service_set_usn(ssdp_service_h local_service, const char* usn) SSDP_LOGE("Already registered"); return SSDP_ERROR_INVALID_PARAMETER; } - + if (__ssdp_find_local_service_with_usn(g_ssdp_local_services, usn) != NULL) { SSDP_LOGE("Duplicate USN"); return SSDP_ERROR_INVALID_PARAMETER; @@ -645,7 +635,7 @@ int ssdp_service_get_target(ssdp_service_h ssdp_service, char **target) service = __ssdp_find_local_service(g_ssdp_local_services, ssdp_service); if (service == NULL) - service = __ssdp_find_remote_service(g_found_ssdp_services, + service = __ssdp_find_remote_service(g_found_ssdp_services, ssdp_service); if (service == NULL || service->target == NULL) { @@ -660,7 +650,7 @@ int ssdp_service_get_target(ssdp_service_h ssdp_service, char **target) __SSDP_LOG_FUNC_EXIT__; return SSDP_ERROR_OUT_OF_MEMORY; //LCOV_EXCL_LINE } - + __SSDP_LOG_FUNC_EXIT__; return status; } @@ -686,7 +676,7 @@ int ssdp_service_get_usn(ssdp_service_h ssdp_service, char **usn) service = __ssdp_find_local_service(g_ssdp_local_services, ssdp_service); if (service == NULL) - service = __ssdp_find_remote_service(g_found_ssdp_services, + service = __ssdp_find_remote_service(g_found_ssdp_services, ssdp_service); if (service == NULL || service->usn == NULL) { @@ -727,7 +717,7 @@ int ssdp_service_get_url(ssdp_service_h ssdp_service, char **url) service = __ssdp_find_local_service(g_ssdp_local_services, ssdp_service); if (service == NULL) - service = __ssdp_find_remote_service(g_found_ssdp_services, + service = __ssdp_find_remote_service(g_found_ssdp_services, ssdp_service); if (service == NULL || service->url == NULL) { @@ -789,7 +779,7 @@ int ssdp_register_local_service(ssdp_service_h local_service, return SSDP_ERROR_INVALID_PARAMETER; } - service->resource_group = gssdp_resource_group_new (g_gssdp_client); + service->resource_group = gssdp_resource_group_new(g_gssdp_client); if (service->resource_group == NULL) { SSDP_LOGE("Resource group is NULL"); return SSDP_ERROR_OPERATION_FAILED; @@ -810,7 +800,7 @@ int ssdp_register_local_service(ssdp_service_h local_service, service->registered_cb = cb; service->cb_user_data = user_data; - gssdp_resource_group_set_available (service->resource_group, TRUE); + gssdp_resource_group_set_available(service->resource_group, TRUE); SSDP_LOGD("Now service is available [%u]", local_service); SSDP_LOGD("Resource group id is [%d]\n", service->resource_id); @@ -856,14 +846,14 @@ int ssdp_deregister_local_service(ssdp_service_h local_service) service->registered_cb = NULL; service->cb_user_data = NULL; - gssdp_resource_group_set_available (service->resource_group, FALSE); + gssdp_resource_group_set_available(service->resource_group, FALSE); SSDP_LOGD("Now service is unavailable [%u]", local_service); __SSDP_LOG_FUNC_EXIT__; return status; } -int ssdp_start_browsing_service(const char* target, ssdp_browser_h* ssdp_browser, +int ssdp_start_browsing_service(const char* target, ssdp_browser_h* ssdp_browser, ssdp_found_cb found_cb, void *user_data) { __SSDP_LOG_FUNC_ENTER__; @@ -894,8 +884,7 @@ GLIST_ITER_START(g_ssdp_local_services, browser) if (!strncmp(target, browser->target, strlen(target)) && browser->origin == SSDP_SERVICE_STATE_BROWSED) { SSDP_LOGD("Browsing request is already registered"); - } - else { + } else { browser = NULL; } GLIST_ITER_END() @@ -943,10 +932,8 @@ GLIST_ITER_END() /* Set properties */ browser->origin = SSDP_SERVICE_STATE_BROWSED; g_ssdp_local_services = g_list_append(g_ssdp_local_services, browser); - } - else { - if (!(gssdp_resource_browser_rescan(browser->resource_browser))) - { + } else { + if (!(gssdp_resource_browser_rescan(browser->resource_browser))) { SSDP_LOGE("Failed to request rescan"); __SSDP_LOG_FUNC_EXIT__; return SSDP_ERROR_OPERATION_FAILED; @@ -981,9 +968,9 @@ int ssdp_stop_browsing_service(ssdp_browser_h ssdp_browser) return SSDP_ERROR_SERVICE_NOT_FOUND; } - gssdp_resource_browser_set_active (browser->resource_browser, FALSE); + gssdp_resource_browser_set_active(browser->resource_browser, FALSE); - g_object_unref (browser->resource_browser); + g_object_unref(browser->resource_browser); browser->found_cb = NULL; browser->cb_user_data = NULL; diff --git a/test/dns-sd-test.c b/test/dns-sd-test.c index 849d785..3dc88f6 100644 --- a/test/dns-sd-test.c +++ b/test/dns-sd-test.c @@ -33,7 +33,7 @@ static bool test_get_user_string(const char *msg, char *buf, int buf_size) break; } - buf[i]='\0'; + buf[i] = '\0'; return true; } @@ -115,7 +115,7 @@ int test_dnssd_initialize() printf("Initialize DNS SD CAPI\n"); rv = dnssd_initialize(); - if(rv != DNSSD_ERROR_NONE) { + if (rv != DNSSD_ERROR_NONE) { printf("Failed to Initialize DNS SD CAPI [%s]\n", dnssd_error_to_string(rv)); return 0; @@ -130,7 +130,7 @@ int test_dnssd_deinitialize() printf("De-Initialize DNS SD CAPI\n"); rv = dnssd_deinitialize(); - if(rv != DNSSD_ERROR_NONE) { + if (rv != DNSSD_ERROR_NONE) { printf("Failed to De-Initialize DNS SD CAPI [%s]\n", dnssd_error_to_string(rv)); return 0; @@ -244,7 +244,7 @@ int test_dnssd_deregister_local_service() rv = scanf("%u", &service); rv = dnssd_deregister_local_service(service); - if(rv != DNSSD_ERROR_NONE) { + if (rv != DNSSD_ERROR_NONE) { printf("Failed to deregister dns service, error [%s]\n", dnssd_error_to_string(rv)); return 0; @@ -445,14 +445,14 @@ static void dnssd_browse_reply(dnssd_service_state_e service_state, char *type = NULL; rv = dnssd_service_get_name(remote_service, &name); - if(rv == DNSSD_ERROR_NONE && name != NULL) + if (rv == DNSSD_ERROR_NONE && name != NULL) printf("Service Name : %s\n", name); rv = dnssd_service_get_type(remote_service, &type); - if(rv == DNSSD_ERROR_NONE && type != NULL) + if (rv == DNSSD_ERROR_NONE && type != NULL) printf("Service Type : %s\n", type); - if(service_state == DNSSD_SERVICE_STATE_AVAILABLE) { + if (service_state == DNSSD_SERVICE_STATE_AVAILABLE) { char *ip_v4_address = NULL; char *ip_v6_address = NULL; char *txt_record = NULL; @@ -460,10 +460,10 @@ static void dnssd_browse_reply(dnssd_service_state_e service_state, int port = 0; rv = dnssd_service_get_ip(remote_service, &ip_v4_address, &ip_v6_address); - if(rv == DNSSD_ERROR_NONE) { - if(ip_v4_address) + if (rv == DNSSD_ERROR_NONE) { + if (ip_v4_address) printf("IPv4 Address : %s\n", ip_v4_address); - if(ip_v6_address) + if (ip_v6_address) printf("IPv6 Address : %s\n", ip_v6_address); } @@ -513,7 +513,7 @@ int test_dnssd_stop_browsing_service() rv = scanf("%u", &service); rv = dnssd_stop_browsing_service(service); - if(rv != DNSSD_ERROR_NONE) { + if (rv != DNSSD_ERROR_NONE) { printf("Failed to stop browse dns service %s\n", dnssd_error_to_string(rv)); return 0; @@ -607,7 +607,7 @@ int test_thread(GIOChannel *source, GIOCondition condition, gpointer data) int main(int argc, char **argv) { GMainLoop *mainloop; - mainloop = g_main_loop_new (NULL, FALSE); + mainloop = g_main_loop_new(NULL, FALSE); GIOChannel *channel = g_io_channel_unix_new(0); g_io_add_watch(channel, (G_IO_IN|G_IO_ERR|G_IO_HUP|G_IO_NVAL), @@ -615,7 +615,7 @@ int main(int argc, char **argv) printf("Test Thread created...\n"); - g_main_loop_run (mainloop); + g_main_loop_run(mainloop); printf("Test Application Terminated\n"); g_main_loop_unref(mainloop); diff --git a/test/ssdp-browse-test.c b/test/ssdp-browse-test.c index 1b88165..f333bfc 100644 --- a/test/ssdp-browse-test.c +++ b/test/ssdp-browse-test.c @@ -28,7 +28,7 @@ void test_found_cb(ssdp_service_state_e state, ssdp_service_h ssdp_service, void printf("service handler: %u\n", ssdp_service); ssdp_service_get_usn(ssdp_service, &usn); ssdp_service_get_url(ssdp_service, &url); - printf("state: %s\n", state==SSDP_SERVICE_STATE_AVAILABLE?"AVAILABLE":"UNAVAILABE"); + printf("state: %s\n", state == SSDP_SERVICE_STATE_AVAILABLE ? "AVAILABLE" : "UNAVAILABE"); printf("usn: %s\n", usn); printf("url: %s\n", url); __FUNC_EXIT__; @@ -42,22 +42,21 @@ int main(int argc, char *argv[]) char *target = "upnp:rootdevice"; /* Initialize required subsystems */ -#if !GLIB_CHECK_VERSION(2,35,0) +#if !GLIB_CHECK_VERSION(2, 35, 0) g_type_init(); #endif - if (ssdp_initialize() == 0) { + if (ssdp_initialize() == 0) printf(MAKE_GREEN"Initialized"RESET_COLOR"\n"); - } - if (ssdp_start_browsing_service(target, &browser_id, &test_found_cb, NULL) == 0) { + + if (ssdp_start_browsing_service(target, &browser_id, &test_found_cb, NULL) == 0) printf(MAKE_GREEN"Start browsing"RESET_COLOR"\n"); - } /* Crate the GLIB main loop */ main_loop = g_main_loop_new(NULL, FALSE); /* Run the main loop */ - g_main_loop_run (main_loop); + g_main_loop_run(main_loop); g_main_loop_unref(main_loop); diff --git a/test/ssdp-register-test.c b/test/ssdp-register-test.c index 1699e7e..c83caac 100644 --- a/test/ssdp-register-test.c +++ b/test/ssdp-register-test.c @@ -40,31 +40,30 @@ int main(int argc, char *argv[]) /* Initialize required subsystems */ -#if !GLIB_CHECK_VERSION(2,35,0) +#if !GLIB_CHECK_VERSION(2, 35, 0) g_type_init(); #endif - if (ssdp_initialize() == 0) { + if (ssdp_initialize() == 0) printf(MAKE_GREEN"Initialized"RESET_COLOR"\n"); - } - if (ssdp_create_local_service(target, &serv_id) == 0) { + + if (ssdp_create_local_service(target, &serv_id) == 0) printf(MAKE_GREEN"Create service. Type: %s, handle: %u "RESET_COLOR"\n", target, serv_id); - } - if (ssdp_service_set_usn(serv_id, usn) == 0) { + + if (ssdp_service_set_usn(serv_id, usn) == 0) printf(MAKE_GREEN"Set USN %s"RESET_COLOR"\n", usn); - } - if (ssdp_service_set_url(serv_id, url) == 0) { + + if (ssdp_service_set_url(serv_id, url) == 0) printf(MAKE_GREEN"Set URL %s"RESET_COLOR"\n", url); - } - if (ssdp_register_local_service(serv_id, &test_registered_cb, NULL) == 0) { + + if (ssdp_register_local_service(serv_id, &test_registered_cb, NULL) == 0) printf(MAKE_GREEN"Start registering"RESET_COLOR"\n"); - } /* Crate the GLIB main loop */ main_loop = g_main_loop_new(NULL, FALSE); /* Run the main loop */ - g_main_loop_run (main_loop); + g_main_loop_run(main_loop); g_main_loop_unref(main_loop); diff --git a/test/ssdp-test.c b/test/ssdp-test.c index 7f3988f..0022801 100644 --- a/test/ssdp-test.c +++ b/test/ssdp-test.c @@ -24,12 +24,12 @@ void __ssdp_available_cb (ssdp_service_state_e state, const char *usn, const char *urls, void *user_data) { - printf(MAKE_GREEN"cb %s "RESET_COLOR"\n", __func__ ); - if(state == SSDP_SERIVCE_AVAILABLE) { + printf(MAKE_GREEN"cb %s "RESET_COLOR"\n", __func__); + if (state == SSDP_SERIVCE_AVAILABLE) { printf("usn : [%s]\n", usn); printf("url : [%s]\n", urls); } - else if(state == SSDP_SERIVCE_UNAVAILABLE) { + else if (state == SSDP_SERIVCE_UNAVAILABLE) { printf("service unavailable\n"); } } @@ -37,16 +37,16 @@ void __ssdp_available_cb (ssdp_service_state_e state, void __foreach_ssdp_found_cb (const char *target, const char *usn, const char *urls, void *user_data) { - printf(MAKE_GREEN"\ncb %s "RESET_COLOR"\n", __func__ ); + printf(MAKE_GREEN"\ncb %s "RESET_COLOR"\n", __func__); - if(target) + if (target) printf("target [%s]\n", target); - if(usn) + if (usn) printf("usn [%s]\n", usn); - if(urls) + if (urls) printf("urls [%s]\n", urls); - printf(MAKE_GREEN"Success %s "RESET_COLOR"\n", __func__ ); + printf(MAKE_GREEN"Success %s "RESET_COLOR"\n", __func__); __FUNC_EXIT__; return; } @@ -58,8 +58,8 @@ int test_ssdp_initialize() int rv = 0; rv = ssdp_initialize(); - if(rv == 0) { - printf(MAKE_GREEN"Success %s "RESET_COLOR"\n", __func__ ); + if (rv == 0) { + printf(MAKE_GREEN"Success %s "RESET_COLOR"\n", __func__); __FUNC_EXIT__; return 1; } @@ -75,8 +75,8 @@ int test_ssdp_deinitialize() int rv = 0; rv = ssdp_deinitialize(); - if(rv == 0) { - printf(MAKE_GREEN"Success %s "RESET_COLOR"\n", __func__ ); + if (rv == 0) { + printf(MAKE_GREEN"Success %s "RESET_COLOR"\n", __func__); __FUNC_EXIT__; return 1; } @@ -94,7 +94,7 @@ int test_ssdp_create_service() ssdp_service_h serv_id; printf("\nEnter target: (Example : upnp:rootdevice)"); - if(scanf("%255ms", &target) < 1) + if (scanf("%255ms", &target) < 1) return -1; @@ -102,8 +102,8 @@ int test_ssdp_create_service() g_free(target); printf("service handler %u\n", serv_id); - if(rv == 0) { - printf(MAKE_GREEN"Success %s "RESET_COLOR"\n", __func__ ); + if (rv == 0) { + printf(MAKE_GREEN"Success %s "RESET_COLOR"\n", __func__); return 1; } @@ -119,12 +119,12 @@ int test_ssdp_destroy_service() ssdp_service_h serv_id = 0; printf("\nEnter service id: "); - if(scanf("%u", &serv_id) < 1) + if (scanf("%u", &serv_id) < 1) return -1; rv = ssdp_destroy_local_service(serv_id); - if(rv == 0) { - printf(MAKE_GREEN"Success %s "RESET_COLOR"\n", __func__ ); + if (rv == 0) { + printf(MAKE_GREEN"Success %s "RESET_COLOR"\n", __func__); __FUNC_EXIT__; return 1; } @@ -142,17 +142,17 @@ int test_ssdp_set_usn() ssdp_service_h serv_id = 0; printf("\nEnter service id: "); - if(scanf("%u", &serv_id) < 1) + if (scanf("%u", &serv_id) < 1) return -1; printf("\nEnter usn: (Example : uuid:1234abcd-12ab-12ab-12ab-1234567abc12::upnp:rootdevice)"); - if(scanf("%255ms", &usn) < 1) + if (scanf("%255ms", &usn) < 1) return -1; rv = ssdp_service_set_usn(serv_id, usn); g_free(usn); - if(rv == 0) { - printf(MAKE_GREEN"Success %s "RESET_COLOR"\n", __func__ ); + if (rv == 0) { + printf(MAKE_GREEN"Success %s "RESET_COLOR"\n", __func__); __FUNC_EXIT__; return 1; } @@ -170,17 +170,17 @@ int test_ssdp_set_url() ssdp_service_h serv_id = 0; printf("\nEnter service id: "); - if(scanf("%u", &serv_id) < 1) + if (scanf("%u", &serv_id) < 1) return -1; printf("\nEnter url: (Example : http://192.168.0.110/)"); - if(scanf("%255ms", &url) < 1) + if (scanf("%255ms", &url) < 1) return -1; rv = ssdp_service_set_url(serv_id, url); g_free(url); - if(rv == 0) { - printf(MAKE_GREEN"Success %s "RESET_COLOR"\n", __func__ ); + if (rv == 0) { + printf(MAKE_GREEN"Success %s "RESET_COLOR"\n", __func__); __FUNC_EXIT__; return 1; } @@ -198,14 +198,14 @@ int test_ssdp_get_target() ssdp_service_h serv_id = 0; printf("\nEnter service id: "); - if(scanf("%u", &serv_id) < 1) + if (scanf("%u", &serv_id) < 1) return -1; rv = ssdp_service_get_target(serv_id, &target); - if(rv == 0) { + if (rv == 0) { printf("target [%s]\n", target); g_free(target); - printf(MAKE_GREEN"Success %s "RESET_COLOR"\n", __func__ ); + printf(MAKE_GREEN"Success %s "RESET_COLOR"\n", __func__); __FUNC_EXIT__; return 1; } @@ -223,14 +223,14 @@ int test_ssdp_get_usn() ssdp_service_h serv_id = 0; printf("\nEnter service id: "); - if(scanf("%u", &serv_id) < 1) + if (scanf("%u", &serv_id) < 1) return -1; rv = ssdp_service_get_usn(serv_id, &usn); - if(rv == 0) { + if (rv == 0) { printf("usn [%s]\n", usn); g_free(usn); - printf(MAKE_GREEN"Success %s "RESET_COLOR"\n", __func__ ); + printf(MAKE_GREEN"Success %s "RESET_COLOR"\n", __func__); return 1; } @@ -246,14 +246,14 @@ int test_ssdp_get_url() ssdp_service_h serv_id = 0; printf("\nEnter service id: "); - if(scanf("%u", &serv_id) < 1) + if (scanf("%u", &serv_id) < 1) return -1; rv = ssdp_service_get_url(serv_id, &url); - if(rv == 0) { + if (rv == 0) { printf("url [%s]\n", url); g_free(url); - printf(MAKE_GREEN"Success %s "RESET_COLOR"\n", __func__ ); + printf(MAKE_GREEN"Success %s "RESET_COLOR"\n", __func__); __FUNC_EXIT__; return 1; } @@ -279,7 +279,7 @@ void test_found_cb(ssdp_service_state_e state, ssdp_service_h ssdp_service, void printf("service handler: %u\n", ssdp_service); ssdp_service_get_usn(ssdp_service, &usn); ssdp_service_get_url(ssdp_service, &url); - printf("state: %s\n", state==SSDP_SERVICE_STATE_AVAILABLE?"AVAILABLE":"UNAVAILABE"); + printf("state: %s\n", state == SSDP_SERVICE_STATE_AVAILABLE ? "AVAILABLE" : "UNAVAILABE"); printf("usn: %s\n", usn); printf("url: %s\n", url); __FUNC_EXIT__; @@ -292,12 +292,12 @@ int test_ssdp_register_service() ssdp_service_h serv_id = 0; printf("\nEnter service id: "); - if(scanf("%u", &serv_id) < 1) + if (scanf("%u", &serv_id) < 1) return -1; rv = ssdp_register_local_service(serv_id, &test_registered_cb, NULL); - if(rv == 0) { - printf(MAKE_GREEN"Success %s "RESET_COLOR"\n", __func__ ); + if (rv == 0) { + printf(MAKE_GREEN"Success %s "RESET_COLOR"\n", __func__); __FUNC_EXIT__; return 1; } @@ -314,12 +314,12 @@ int test_ssdp_deregister_service() ssdp_service_h serv_id = 0; printf("\nEnter service id: "); - if(scanf("%u", &serv_id) < 1) + if (scanf("%u", &serv_id) < 1) return -1; rv = ssdp_deregister_local_service(serv_id); - if(rv == 0) { - printf(MAKE_GREEN"Success %s "RESET_COLOR"\n", __func__ ); +if (rv == 0) { + printf(MAKE_GREEN"Success %s "RESET_COLOR"\n", __func__); __FUNC_EXIT__; return 1; } @@ -337,13 +337,13 @@ int test_ssdp_service_browse() char *target = NULL; printf("\nEnter target: (Example : upnp:rootdevice)"); - if(scanf("%255ms", &target) < 1) + if (scanf("%255ms", &target) < 1) return -1; rv = ssdp_start_browsing_service(target, &browser_id, &test_found_cb, NULL); g_free(target); - if(rv == 0) { - printf(MAKE_GREEN"Success %s "RESET_COLOR"\n", __func__ ); + if (rv == 0) { + printf(MAKE_GREEN"Success %s "RESET_COLOR"\n", __func__); __FUNC_EXIT__; return 1; } @@ -360,12 +360,12 @@ int test_ssdp_service_stop_browse() ssdp_browser_h browser_id = 0; printf("\nEnter browser id: "); - if(scanf("%u", &browser_id) < 1) + if (scanf("%u", &browser_id) < 1) return -1; rv = ssdp_stop_browsing_service(browser_id); - if(rv == 0) { - printf(MAKE_GREEN"Success %s "RESET_COLOR"\n", __func__ ); + if (rv == 0) { + printf(MAKE_GREEN"Success %s "RESET_COLOR"\n", __func__); __FUNC_EXIT__; return 1; } @@ -383,12 +383,12 @@ int test_ssdp_foreach_found() ssdp_service_h serv_id = 0; printf("\nEnter service id: "); - if(scanf("%u", &serv_id) < 1) + if (scanf("%u", &serv_id) < 1) return -1; rv = ssdp_service_foreach_found(serv_id, __foreach_ssdp_found_cb, NULL); - if(rv == 0) { - printf(MAKE_GREEN"Success %s "RESET_COLOR"\n", __func__ ); + if (rv == 0) { + printf(MAKE_GREEN"Success %s "RESET_COLOR"\n", __func__); __FUNC_EXIT__; return 1; } @@ -500,7 +500,7 @@ int main(int argc, char *argv[]) int ret = -1; /* Initialize required subsystems */ -#if !GLIB_CHECK_VERSION(2,35,0) +#if !GLIB_CHECK_VERSION(2, 35, 0) g_type_init(); #endif @@ -515,7 +515,7 @@ int main(int argc, char *argv[]) main_loop = g_main_loop_new(NULL, FALSE); /* Run the main loop */ - g_main_loop_run (main_loop); + g_main_loop_run(main_loop); g_main_loop_unref(main_loop); -- 2.7.4