Remove violation of coding convention 13/190113/2
authorYu <jiung.yu@samsung.com>
Wed, 19 Sep 2018 12:16:17 +0000 (21:16 +0900)
committerYu <jiung.yu@samsung.com>
Tue, 2 Oct 2018 04:42:44 +0000 (13:42 +0900)
Change-Id: Ib10226ea18cd0d0645c17857602a222f33740628
Signed-off-by: Yu Jiung <jiung.yu@samsung.com>
21 files changed:
src/inm-arping.c
src/inm-congestion-mon.c
src/inm-connman-mgr.c
src/inm-connman-service.c
src/inm-connman-tech.c
src/inm-connman.c
src/inm-dump.c
src/inm-gdbus.c
src/inm-ip-conflict.c
src/inm-manager.c
src/inm-mobileap.c
src/inm-netlink.c
src/inm-reacher.c
src/inm-stc-manager.c
src/inm-supplicant-bss.c
src/inm-supplicant-iface.c
src/inm-supplicant-internal.h
src/inm-supplicant-network.c
src/inm-telephony.c
src/inm-util.c
src/inm-wfd-manager.c

index 21c2a0e567c881c4ad8ff59cced6be535193cded..1bc86501b433c2a862c6cfe19877dcdaa2a55975 100644 (file)
@@ -54,7 +54,7 @@ typedef struct {
        unsigned char arp_tha[ETH_ALEN];
        unsigned char arp_tip[IP_ALEN];
 
-}__attribute__((packed))arp_message_s;
+} __attribute__((packed))arp_message_s;
 
 typedef struct {
        arp_data_s arp_data;
@@ -78,8 +78,8 @@ gpointer cb_user_data;
 GSList *arping_data_list;
 
 static void __stop_arping(GQuark key_id,
-        gpointer value,
-        gpointer user_data);
+               gpointer value,
+               gpointer user_data);
 
 static gboolean __arp_user_timeout_cb(gpointer data)
 {
@@ -144,9 +144,8 @@ gboolean __send_arp(gpointer user_data)
 {
        arping_data_s *arping_data;
        gboolean ret;
-       if (!user_data) {
+       if (!user_data)
                return FALSE;
-       }
 
        arping_data = (arping_data_s *)user_data;
        ret = util_send_arp(&(arping_data->arp_data));
@@ -158,8 +157,8 @@ gboolean __send_arp(gpointer user_data)
 }
 
 static void __start_arping(GQuark key_id,
-        gpointer value,
-        gpointer user_data)
+               gpointer value,
+               gpointer user_data)
 {
        __INM_FUNC_ENTER__;
        arping_data_s *arping_data = (arping_data_s *)value;
@@ -189,8 +188,8 @@ static void __start_arping(GQuark key_id,
 }
 
 static void __stop_arping(GQuark key_id,
-        gpointer value,
-        gpointer user_data)
+               gpointer value,
+               gpointer user_data)
 {
        arping_data_s *arping_data = (arping_data_s *)value;
 
@@ -327,7 +326,6 @@ int inm_arping_stop(gchar *if_name, gchar *target_ip)
 
        gint ret = INM_ARPING_ERROR_NONE;
        arping_data_s *arping_data = NULL;
-       GQuark if_key;
 
        __INM_FUNC_ENTER__;
 
@@ -345,7 +343,7 @@ int inm_arping_stop(gchar *if_name, gchar *target_ip)
        }
 
        if (arping_data->arp_data.sock != -1) {
-               __stop_arping(if_key, arping_data, NULL);
+               __stop_arping(0, arping_data, NULL);
                arping_data->in_progress = FALSE;
        }
        REMOVE_G_SOURCE(arping_data->arp_user_timer_source_id);
index af20450f2e969b994223fe4446fb7f78d864d2de..c8c9c00c631947a6cd2799c0d97b0b66609fb679 100644 (file)
@@ -50,7 +50,7 @@ typedef struct {
        guint timer_source_id;
        inm_congestion_mon_callback cb;
        gpointer cb_user_data;
-}congestion_mon_data_s;
+} congestion_mon_data_s;
 
 congestion_mon_s cong_mon;
 static __thread congestion_mon_data_s *data = NULL;
@@ -85,7 +85,7 @@ static int __inm_check_congestion_status(int *status)
                INM_LOGE("Could not access %s, error:[%s]", NETWORK_CONGESTION_MON, error_buf);
                return -1;
        }
-       fd = fopen(NETWORK_CONGESTION_MON, "r" );
+       fd = fopen(NETWORK_CONGESTION_MON, "r");
        if (!fd) {
                INM_LOGE("Failed to open file: [%s]", NETWORK_CONGESTION_MON);
                return -1;
@@ -100,9 +100,8 @@ static int __inm_check_congestion_status(int *status)
                if (i == 2) {
                        int j = 0, u = 0;
                        while (j < 10 && u < (int)buf_size) {
-                               if(buffer[u] == ' ') {
+                               if (buffer[u] == ' ')
                                        j++;
-                               }
                                u++;
                        }
 
@@ -116,7 +115,7 @@ static int __inm_check_congestion_status(int *status)
                        strtok_r(token1 , " ", &token2);
                        double retransmit = atof(token1);
 
-                       if(prev_transmit == -1 || transmit < prev_transmit) {
+                       if (prev_transmit == -1 || transmit < prev_transmit) {
                                prev_transmit = transmit;
                                curr_transmit = transmit;
                        } else {
@@ -145,13 +144,12 @@ static int __inm_check_congestion_status(int *status)
 
        INM_LOGI("transmitted %lf retarnsmitted %lf after 10 seconds", tcp_trans_data, tcp_retrans_data);
 
-       if(tcp_retrans_data == 0 && tcp_trans_data == 0) {
+       if (tcp_retrans_data == 0 && tcp_trans_data == 0)
                INM_LOGI("Tcp data is not transmitted yet.");
-       } else if(tcp_trans_data == 0) {
+       else if (tcp_trans_data == 0)
                retrans_rate = (curr_retrans/curr_transmit) * 100;
-       } else {
+       else
                retrans_rate = (tcp_retrans_data/tcp_trans_data) * 100;
-       }
 
        *status = retrans_rate;
        return 0;
@@ -211,7 +209,7 @@ int inm_congestion_monitor_start(inm_congestion_mon_callback cb, void *user_data
                return INM_CONG_MON_INVALID_PARAMETER;
        }
 
-       data = (congestion_mon_data_s*)g_try_malloc0(sizeof(congestion_mon_data_s));
+       data = (congestion_mon_data_s *)g_try_malloc0(sizeof(congestion_mon_data_s));
        if (!data) {
                INM_LOGE("Failed to allocate memory");
                __INM_FUNC_EXIT__;
index ec44beac1a6a9ffaa3a78b1f55652db4da736d66..7cfa697757fc7b8ca8c5925be161311fa54a4ac6 100644 (file)
@@ -165,13 +165,12 @@ static inline void __mgr_get_property(gchar *key, GVariant *value)
                g_variant_get(value, "&s", &state);
                __set_manager_state(state);
 
-       } else if (g_strcmp0(key, "OfflineMode") == 0){
+       } else if (g_strcmp0(key, "OfflineMode") == 0)
                g_variant_get(value, "b", &connman_manager.offline_mode);
-       } else if (g_strcmp0(key, "SessionMode") == 0){
+       else if (g_strcmp0(key, "SessionMode") == 0)
                g_variant_get(value, "b", &connman_manager.session_mode);
-       }  else if (g_strcmp0(key, "AutoConnectMode") == 0){
+       else if (g_strcmp0(key, "AutoConnectMode") == 0)
                g_variant_get(value, "b", &connman_manager.auto_connect_mode);
-       }
 }
 
 static void __mgr_property_changed(GVariant *property)
index 68bf5fa6980e6701e57200b976badc5bd9c91708..b8282f06533339d58a5175d28dd885b386a983c5 100755 (executable)
  * Below security modes are used in infrastructure and ad-hoc mode
  * For now all EAP security mechanisms are provided only in infrastructure mode
  */
-typedef enum
-{
+typedef enum {
        /** Security disabled */
        WLAN_SEC_MODE_NONE = 0x01,
        /** WEP */
@@ -146,8 +145,7 @@ typedef enum
  * @enum wlan_encryption_mode_type_e
  * Below encryption modes are used in infrastructure and ad-hoc mode
  */
-typedef enum
-{
+typedef enum {
        /** Encryption disabled */
        WLAN_ENC_MODE_NONE = 0x01,
        /** WEP */
@@ -336,8 +334,7 @@ typedef struct {
 /**
  * Below structure is used to export essid
  */
-typedef struct
-{
+typedef struct {
        /** ESSID */
        char essid[WLAN_ESSID_LEN+1];
 } net_essid_s;
@@ -347,8 +344,7 @@ typedef struct
  * @remark To see the maximum length of PSK passphrase key.
  * @see wlan_auth_info_t
  */
-typedef struct
-{
+typedef struct {
        /** key value for WPA-PSK or WPA2-PSK */
        gchar pskKey[WLAN_MAX_PSK_PASSPHRASE_LEN + 1];
 } wlan_psk_info_s;
@@ -358,8 +354,7 @@ typedef struct
  * @remark To see the maximum length of WEP key.
  * @see wlan_auth_info_s
  */
-typedef struct
-{
+typedef struct {
        /** key value for WEP */
        gchar wepKey[WLAN_MAX_WEP_KEY_LEN + 1];
 } wlan_wep_info_s;
@@ -368,8 +363,7 @@ typedef struct
  * Below structure is used by EAP
  * @see wlan_auth_info_s
  */
-typedef struct
-{
+typedef struct {
        /** User name */
        gchar username[WLAN_USERNAME_LEN+1];
        /** Password */
@@ -403,8 +397,7 @@ typedef struct
  * At any point of time only one security mechanism is supported
  * @see wlan_sec_info_s
  */
-typedef union
-{
+typedef union {
        /** Wep Authentication */
        wlan_wep_info_s wep;
        /** psk Authentication */
@@ -417,8 +410,7 @@ typedef union
  * This is main security information structure
  * @see connman_wlan_priv_s
  */
-typedef struct
-{
+typedef struct {
        /** security mode type */
        wlan_security_mode_type_e sec_mode;
        /** encryption mode type */
@@ -999,7 +991,7 @@ static inline void __get_name_servers(connman_service_s *service, GVariant *valu
        }
        g_variant_iter_free(iter);
 
-       service->dns_cnt= dns_cnt;
+       service->dns_cnt = dns_cnt;
        service->dns_cnt_v6 = dns_cnt_v6;
 
        inm_gdbus_emit_conn_dns_changed(service->obj_path,
@@ -1029,7 +1021,7 @@ static inline void __get_conf_name_servers(connman_service_s *service, GVariant
        }
        g_variant_iter_free(iter);
 
-       service->dns_cnt= dns_cnt;
+       service->dns_cnt = dns_cnt;
        service->dns_cnt_v6 = dns_cnt_v6;
 }
 
@@ -1861,9 +1853,8 @@ void inm_connman_service_remove(gchar *path, GVariantBuilder *removed)
        }
 
        service = g_hash_table_lookup(service_tbl, path);
-       if (!service) {
+       if (!service)
                return;
-       }
 
        g_variant_builder_add(removed,
                              "o",
@@ -2705,7 +2696,7 @@ void inm_connman_service_change(GVariant *parameters)
        added_builder = g_variant_builder_new(G_VARIANT_TYPE("ao"));
        removed_builder = g_variant_builder_new(G_VARIANT_TYPE("ao"));
 
-       if(!parameters) {
+       if (!parameters) {
                g_variant_builder_unref(added_builder);
                g_variant_builder_unref(removed_builder);
                INM_LOGI("Empty parameters");
@@ -2810,7 +2801,7 @@ connman_service_s *__get_current_service()
        gpointer key, value;
 
        __INM_FUNC_ENTER__;
-       g_hash_table_iter_init (&iter, service_tbl);
+       g_hash_table_iter_init(&iter, service_tbl);
        while (g_hash_table_iter_next(&iter, &key, &value)) {
 
                if (!value)
index 6a1075d1f831d6cde65595f2d43a53c039edad2e..dd97458915369540065c70a0962e21342d78b014 100644 (file)
@@ -152,19 +152,19 @@ static void __destroy_tech_data(gpointer data)
        return;
 }
 
-static void inline __get_powered(GVariant *value, connman_tech_s *tech)
+static inline void __get_powered(GVariant *value, connman_tech_s *tech)
 {
        g_variant_get(value, "b", &(tech->powered));
-       INM_LOGI("Powered %s", (tech->powered)?"On":"Off");
+       INM_LOGI("Powered %s", (tech->powered) ? "On" : "Off");
 }
 
-static void inline __get_connected(GVariant *value, connman_tech_s *tech)
+static inline void __get_connected(GVariant *value, connman_tech_s *tech)
 {
        g_variant_get(value, "b", &(tech->connected));
-       INM_LOGI("%s", (tech->connected)?"Connected":"Not connected");
+       INM_LOGI("%s", (tech->connected) ? "Connected" : "Not connected");
 }
 
-static void inline __get_name(GVariant *value, connman_tech_s *tech)
+static inline void __get_name(GVariant *value, connman_tech_s *tech)
 {
        const gchar *str = NULL;
        g_variant_get(value, "&s", &str);
@@ -175,7 +175,7 @@ static void inline __get_name(GVariant *value, connman_tech_s *tech)
        }
 }
 
-static void inline __get_type(GVariant *value, connman_tech_s *tech)
+static inline void __get_type(GVariant *value, connman_tech_s *tech)
 {
        const gchar *str = NULL;
        g_variant_get(value, "&s", &str);
@@ -186,12 +186,12 @@ static void inline __get_type(GVariant *value, connman_tech_s *tech)
        }
 }
 
-static void inline __get_tethering(GVariant *value, connman_tech_s *tech)
+static inline void __get_tethering(GVariant *value, connman_tech_s *tech)
 {
        g_variant_get(value, "b", &(tech->tethering));
 }
 
-static void inline __tech_get_property(gchar *key, GVariant *value, connman_tech_s *tech)
+static inline void __tech_get_property(gchar *key, GVariant *value, connman_tech_s *tech)
 {
        if (g_strcmp0(key, "Powered") == 0)
                __get_powered(value, tech);
@@ -357,7 +357,7 @@ void inm_connman_tech_remove(GVariant *parameters)
                g_tech_changed_cb(tech_type, CONNMAN_TECH_STATE_UNKNOWN);
        }
 
-       g_hash_table_remove (tech_tbl, path);
+       g_hash_table_remove(tech_tbl, path);
        __INM_FUNC_EXIT__;
        return;
 }
index 46776392728c31156b8170b9c90c340137163ad2..28a14125305474ca0bbd90be6f80ed7b13318c9a 100644 (file)
@@ -62,11 +62,11 @@ connman_mon_s connman_mon;
 
 static void __name_owner_changed_cb(
                const gchar *sender_name,
-        const gchar *object_path,
-        const gchar *interface_name,
-        const gchar *signal_name,
-        GVariant *parameters,
-        gpointer user_data)
+               const gchar *object_path,
+               const gchar *interface_name,
+               const gchar *signal_name,
+               GVariant *parameters,
+               gpointer user_data)
 {
        gchar *name = NULL;
        gchar *old = NULL;
@@ -77,10 +77,8 @@ static void __name_owner_changed_cb(
 
        g_variant_get(parameters, "(&s&s&s)", &name, &old, &new);
 
-       if (g_strcmp0(name, CONNMAN_SERVICE) == 0 && *new == '\0') {
+       if (g_strcmp0(name, CONNMAN_SERVICE) == 0 && *new == '\0')
                INM_LOGI("ConnMan destroyed: name %s, old %s, new %s", name, old, new);
-
-       }
        return;
 }
 
index f6af676edf2a6695aa16784959b18a41bb6c5a09..c79707a964babcc89c5626fd9ddad2652c79563d 100644 (file)
@@ -142,9 +142,8 @@ int inm_dump_start_tcpdump()
                return INM_DUMP_IN_PROGRESS;
        }
 
-       if (!__start_tcpdump()) {
+       if (!__start_tcpdump())
                return INM_DUMP_OPERATION_FAILED;
-       }
 
        INM_LOGI("Successfully started tcpdump and running..");
 
index e809a6d21d5bd3185071fd613187bb75df063a76..748fb9c0698bd15bb1ec78910f6cd5fc9fb4d08a 100644 (file)
@@ -142,70 +142,70 @@ static const gchar inm_manager_introspection_xml[] = {
                "<arg type='a(oa{sv})' name='connections' direction='out'/>"
                "</method>"
                "<method name='GetEthernetCableState'>"
-                "<arg type='b' name='ethernet_cable_state' direction='out'/>"
-                "</method>"
+                       "<arg type='b' name='ethernet_cable_state' direction='out'/>"
+                       "</method>"
                "<method name='GetWifiModuleState'>"
-                "<arg type='b' name='wifi_module_state' direction='out'/>"
-                "</method>"
+                       "<arg type='b' name='wifi_module_state' direction='out'/>"
+                       "</method>"
                "<method name='GetIpConflictState'>"
-                "<arg type='b' name='ip_conflict_state' direction='out'/>"
-                "</method>"
+                       "<arg type='b' name='ip_conflict_state' direction='out'/>"
+                       "</method>"
                "<method name='GetIpConflictDetect'>"
-                "<arg type='b' name='ip_conflict_detect' direction='out'/>"
-                "</method>"
+                       "<arg type='b' name='ip_conflict_detect' direction='out'/>"
+                       "</method>"
                "<method name='SetIpConflictDetect'>"
-                "<arg type='b' name='ip_conflict_detect' direction='in'/>"
-                "</method>"
+                       "<arg type='b' name='ip_conflict_detect' direction='in'/>"
+                       "</method>"
                "<method name='GetTcpdumpState'>"
-                "<arg type='b' name='tcpdump_state' direction='out'/>"
-                "</method>"
+                       "<arg type='b' name='tcpdump_state' direction='out'/>"
+                       "</method>"
                "<method name='SetTcpdumpState'>"
-                "<arg type='b' name='tcpdump_state' direction='in'/>"
-                "</method>"
+                       "<arg type='b' name='tcpdump_state' direction='in'/>"
+                       "</method>"
                "<method name='GetCellularState'>"
-                "<arg type='i' name='cellular_state' direction='out'/>"
-                "</method>"
+                       "<arg type='i' name='cellular_state' direction='out'/>"
+                       "</method>"
                "<method name='GetWifiState'>"
-                "<arg type='i' name='wifi_state' direction='out'/>"
-                "</method>"
+                       "<arg type='i' name='wifi_state' direction='out'/>"
+                       "</method>"
                "<method name='GetEthernetState'>"
-                "<arg type='i' name='ethernet_state' direction='out'/>"
-                "</method>"
+                       "<arg type='i' name='ethernet_state' direction='out'/>"
+                       "</method>"
                "<method name='GetCongestionLevel'>"
-                "<arg type='i' name='congestion_level' direction='out'/>"
-                "</method>"
+                       "<arg type='i' name='congestion_level' direction='out'/>"
+                       "</method>"
                "<method name='GetRetryTxRate'>"
-                "<arg type='i' name='retry_tx_rate' direction='out'/>"
-                "</method>"
+                       "<arg type='i' name='retry_tx_rate' direction='out'/>"
+                       "</method>"
                "<method name='GetChannelInterference'>"
-                "<arg type='d' name='channel_interference' direction='out'/>"
-                "</method>"
+                       "<arg type='d' name='channel_interference' direction='out'/>"
+                       "</method>"
                "<method name='StartArping'>"
-                "<arg type='s' name='target_ip' direction='in'/>"
-                "<arg type='i' name='timeout' direction='in'/>"
-                "</method>"
+                       "<arg type='s' name='target_ip' direction='in'/>"
+                       "<arg type='i' name='timeout' direction='in'/>"
+                       "</method>"
                "<method name='StopArping'>"
-                "<arg type='s' name='target_ip' direction='in'/>"
-                "</method>"
+                       "<arg type='s' name='target_ip' direction='in'/>"
+                       "</method>"
                "<method name='StartCheckGateway'>"
-                "</method>"
+                       "</method>"
                "<method name='StopCheckGateway'>"
-                "</method>"
+                       "</method>"
                "<method name='AddReacherUrl'>"
-                "<arg type='s' name='url' direction='in'/>"
-                "</method>"
+                       "<arg type='s' name='url' direction='in'/>"
+                       "</method>"
                "<method name='RemoveReacherUrl'>"
-                "<arg type='s' name='url' direction='in'/>"
-                "</method>"
+                       "<arg type='s' name='url' direction='in'/>"
+                       "</method>"
                "<method name='StartReacher'>"
-                "<arg type='i' name='type' direction='in'/>"
-                "</method>"
+                       "<arg type='i' name='type' direction='in'/>"
+                       "</method>"
                "<method name='StopReacher'>"
-                "<arg type='i' name='type' direction='in'/>"
-                "</method>"
+                       "<arg type='i' name='type' direction='in'/>"
+                       "</method>"
                "<method name='ReacherIsRunning'>"
-                "<arg type='b' name='is_running' direction='out'/>"
-                "</method>"
+                       "<arg type='b' name='is_running' direction='out'/>"
+                       "</method>"
 /* Test purpose --> */
                "<property type='b' name='WritingAlwaysThrowsError' access='readwrite'/>"
                "<property type='b' name='ReadingAlwaysThrowsError' access='read'/>"
@@ -505,7 +505,7 @@ void __dbus_return_err(int ret, GDBusMethodInvocation *invocation)
        return;
 }
 
-static void inline __handle_get_statistics(GVariant *parameters,
+static inline void __handle_get_statistics(GVariant *parameters,
                                           GDBusMethodInvocation *invocation)
 {
        int connection_type = 0;
@@ -520,7 +520,7 @@ static void inline __handle_get_statistics(GVariant *parameters,
        __INM_FUNC_EXIT__;
 }
 
-static void inline __handle_reset_statistics(GVariant *parameters,
+static inline void __handle_reset_statistics(GVariant *parameters,
                                             GDBusMethodInvocation *invocation)
 {
        int connection_type = 0;
@@ -535,7 +535,7 @@ static void inline __handle_reset_statistics(GVariant *parameters,
        __INM_FUNC_EXIT__;
 }
 
-static void inline __handle_get_current_connection(GVariant *parameters,
+static inline void __handle_get_current_connection(GVariant *parameters,
                                                   GDBusMethodInvocation *invocation)
 {
        GVariant *arg = NULL;
@@ -554,7 +554,7 @@ static void inline __handle_get_current_connection(GVariant *parameters,
        __INM_FUNC_EXIT__;
 }
 
-static void inline __handle_get_connections(GVariant *parameters,
+static inline void __handle_get_connections(GVariant *parameters,
                                            GDBusMethodInvocation *invocation)
 {
        GVariant *arg = NULL;
@@ -573,7 +573,7 @@ static void inline __handle_get_connections(GVariant *parameters,
        __INM_FUNC_EXIT__;
 }
 
-static void inline __handle_get_wifi_module_state(GVariant *parameters,
+static inline void __handle_get_wifi_module_state(GVariant *parameters,
                                                GDBusMethodInvocation *invocation)
 {
        gboolean state = FALSE;
@@ -585,18 +585,18 @@ static void inline __handle_get_wifi_module_state(GVariant *parameters,
        if (ret < 0) {
                INM_LOGI("Failed to get wifi module state");
                __dbus_return_err(INM_MANAGER_ERROR_OPERATION_FAILED, invocation);
-                __INM_FUNC_EXIT__;
-                return;
-        }
+               __INM_FUNC_EXIT__;
+               return;
+       }
 
        arg = g_variant_new("(b)", state);
        DEBUG_G_VARIANT("Sending = ", arg);
        g_dbus_method_invocation_return_value(invocation, arg);
-        __INM_FUNC_EXIT__;
+       __INM_FUNC_EXIT__;
 }
 
-static void inline __handle_get_ethernet_cable_state(GVariant *parameters,
-                                                GDBusMethodInvocation *invocation)
+static inline void __handle_get_ethernet_cable_state(GVariant *parameters,
+               GDBusMethodInvocation *invocation)
 {
        gboolean state = FALSE;
        GVariant *arg = NULL;
@@ -612,13 +612,13 @@ static void inline __handle_get_ethernet_cable_state(GVariant *parameters,
        }
 
        arg = g_variant_new("(b)", state);
-        DEBUG_G_VARIANT("Sending = ", arg);
-        g_dbus_method_invocation_return_value(invocation, arg);
+       DEBUG_G_VARIANT("Sending = ", arg);
+       g_dbus_method_invocation_return_value(invocation, arg);
        __INM_FUNC_EXIT__;
 }
 
-static void inline __handle_get_ip_conflict_state(GVariant *parameters,
-                                                GDBusMethodInvocation *invocation)
+static inline void __handle_get_ip_conflict_state(GVariant *parameters,
+               GDBusMethodInvocation *invocation)
 {
        gboolean state = FALSE;
        GVariant *arg = NULL;
@@ -634,42 +634,42 @@ static void inline __handle_get_ip_conflict_state(GVariant *parameters,
        }
 
        arg = g_variant_new("(b)", state);
-        DEBUG_G_VARIANT("Sending = ", arg);
-        g_dbus_method_invocation_return_value(invocation, arg);
+       DEBUG_G_VARIANT("Sending = ", arg);
+       g_dbus_method_invocation_return_value(invocation, arg);
        __INM_FUNC_EXIT__;
 }
 
-static void inline __handle_get_ip_conflict_detect(GVariant *parameters,
-                                                GDBusMethodInvocation *invocation)
+static inline void __handle_get_ip_conflict_detect(GVariant *parameters,
+               GDBusMethodInvocation *invocation)
 {
-        gboolean state = FALSE;
-        GVariant *arg = NULL;
-        int ret = 0;
+       gboolean state = FALSE;
+       GVariant *arg = NULL;
+       int ret = 0;
 
-        __INM_FUNC_ENTER__;
-        ret = inm_manager_get_ip_conflict_detect(&state);
-        if (ret < 0) {
-                INM_LOGI("Failed to get");
-                __dbus_return_err(INM_MANAGER_ERROR_OPERATION_FAILED, invocation);
-                __INM_FUNC_EXIT__;
-                return;
-        }
+       __INM_FUNC_ENTER__;
+       ret = inm_manager_get_ip_conflict_detect(&state);
+       if (ret < 0) {
+               INM_LOGI("Failed to get");
+               __dbus_return_err(INM_MANAGER_ERROR_OPERATION_FAILED, invocation);
+               __INM_FUNC_EXIT__;
+               return;
+       }
 
-        arg = g_variant_new("(b)", state);
-        DEBUG_G_VARIANT("Sending = ", arg);
-        g_dbus_method_invocation_return_value(invocation, arg);
-        __INM_FUNC_EXIT__;
+       arg = g_variant_new("(b)", state);
+       DEBUG_G_VARIANT("Sending = ", arg);
+       g_dbus_method_invocation_return_value(invocation, arg);
+       __INM_FUNC_EXIT__;
 }
 
-static void inline __handle_set_ip_conflict_detect(GVariant *parameters,
-                                                GDBusMethodInvocation *invocation)
+static inline void __handle_set_ip_conflict_detect(GVariant *parameters,
+               GDBusMethodInvocation *invocation)
 {
        /* TODO */
        return;
 }
 
-static void inline __handle_get_tcpdump_state(GVariant *parameters,
-                                       GDBusMethodInvocation *invocation)
+static inline void __handle_get_tcpdump_state(GVariant *parameters,
+               GDBusMethodInvocation *invocation)
 {
        gboolean state = FALSE;
        GVariant *arg = NULL;
@@ -679,7 +679,7 @@ static void inline __handle_get_tcpdump_state(GVariant *parameters,
        ret = inm_manager_get_tcpdump_state(&state);
        if (ret != INM_MANAGER_ERROR_NONE) {
                INM_LOGI("Failed to get");
-                __dbus_return_err(INM_MANAGER_ERROR_OPERATION_FAILED, invocation);
+               __dbus_return_err(INM_MANAGER_ERROR_OPERATION_FAILED, invocation);
                __INM_FUNC_EXIT__;
                return;
        }
@@ -690,8 +690,8 @@ static void inline __handle_get_tcpdump_state(GVariant *parameters,
        __INM_FUNC_EXIT__;
 }
 
-static void inline __handle_set_tcpdump_state(GVariant *parameters,
-                                       GDBusMethodInvocation *invocation)
+static inline void __handle_set_tcpdump_state(GVariant *parameters,
+               GDBusMethodInvocation *invocation)
 {
        GVariantBuilder *builder = NULL;
        GError *local_error = NULL;
@@ -735,7 +735,7 @@ static void inline __handle_set_tcpdump_state(GVariant *parameters,
        __INM_FUNC_EXIT__;
 }
 
-static void inline __handle_get_cellular_state(GVariant *parameters,
+static inline void __handle_get_cellular_state(GVariant *parameters,
                GDBusMethodInvocation *invocation)
 {
        int state = 0;
@@ -757,8 +757,8 @@ static void inline __handle_get_cellular_state(GVariant *parameters,
        __INM_FUNC_EXIT__;
 }
 
-static void inline __handle_get_wifi_state(GVariant *parameters,
-                                        GDBusMethodInvocation *invocation)
+static inline void __handle_get_wifi_state(GVariant *parameters,
+               GDBusMethodInvocation *invocation)
 {
        int state = 0;
        int ret = 0;
@@ -779,7 +779,7 @@ static void inline __handle_get_wifi_state(GVariant *parameters,
        __INM_FUNC_EXIT__;
 }
 
-static void inline __handle_get_ethernet_state(GVariant *parameters,
+static inline void __handle_get_ethernet_state(GVariant *parameters,
                GDBusMethodInvocation *invocation)
 {
        int state = FALSE;
@@ -795,13 +795,13 @@ static void inline __handle_get_ethernet_state(GVariant *parameters,
                return;
        }
 
-        arg = g_variant_new("(i)", state);
-        DEBUG_G_VARIANT("Sending = ", arg);
-        g_dbus_method_invocation_return_value(invocation, arg);
-        __INM_FUNC_EXIT__;
+       arg = g_variant_new("(i)", state);
+       DEBUG_G_VARIANT("Sending = ", arg);
+       g_dbus_method_invocation_return_value(invocation, arg);
+       __INM_FUNC_EXIT__;
 }
 
-static void inline __handle_get_congestion_level(GVariant *parameters,
+static inline void __handle_get_congestion_level(GVariant *parameters,
                GDBusMethodInvocation *invocation)
 {
        int level = 0;
@@ -823,7 +823,7 @@ static void inline __handle_get_congestion_level(GVariant *parameters,
        __INM_FUNC_EXIT__;
 }
 
-static void inline __handle_get_retry_tx_rate(GVariant *parameters,
+static inline void __handle_get_retry_tx_rate(GVariant *parameters,
                GDBusMethodInvocation *invocation)
 {
        int rate = 0;
@@ -845,7 +845,7 @@ static void inline __handle_get_retry_tx_rate(GVariant *parameters,
        __INM_FUNC_EXIT__;
 }
 
-static void inline __handle_get_channel_interference(GVariant *parameters,
+static inline void __handle_get_channel_interference(GVariant *parameters,
                GDBusMethodInvocation *invocation)
 {
        double ch_interference = 0.0;
@@ -867,7 +867,7 @@ static void inline __handle_get_channel_interference(GVariant *parameters,
        __INM_FUNC_EXIT__;
 }
 
-static void inline __handle_start_arping(GVariant *parameters,
+static inline void __handle_start_arping(GVariant *parameters,
                GDBusMethodInvocation *invocation)
 {
        gchar *target_ip = NULL;
@@ -888,7 +888,7 @@ static void inline __handle_start_arping(GVariant *parameters,
        __INM_FUNC_EXIT__;
 }
 
-static void inline __handle_stop_arping(GVariant *parameters,
+static inline void __handle_stop_arping(GVariant *parameters,
                GDBusMethodInvocation *invocation)
 {
        gchar *target_ip = NULL;
@@ -906,7 +906,7 @@ static void inline __handle_stop_arping(GVariant *parameters,
        __INM_FUNC_EXIT__;
 }
 
-static void inline __handle_start_check_gateway(GVariant *parameters,
+static inline void __handle_start_check_gateway(GVariant *parameters,
                GDBusMethodInvocation *invocation)
 {
        int ret = INM_MANAGER_ERROR_NONE;
@@ -923,7 +923,7 @@ static void inline __handle_start_check_gateway(GVariant *parameters,
        __INM_FUNC_EXIT__;
 }
 
-static void inline __handle_stop_check_gateway(GVariant *parameters,
+static inline void __handle_stop_check_gateway(GVariant *parameters,
                GDBusMethodInvocation *invocation)
 {
        int ret = INM_MANAGER_ERROR_NONE;
@@ -940,7 +940,7 @@ static void inline __handle_stop_check_gateway(GVariant *parameters,
        __INM_FUNC_EXIT__;
 }
 
-static void inline __handle_add_reacher_url(GVariant *parameters,
+static inline void __handle_add_reacher_url(GVariant *parameters,
                GDBusMethodInvocation *invocation)
 {
        const gchar *url = NULL;
@@ -959,7 +959,7 @@ static void inline __handle_add_reacher_url(GVariant *parameters,
        __INM_FUNC_EXIT__;
 }
 
-static void inline __handle_remove_reacher_url(GVariant *parameters,
+static inline void __handle_remove_reacher_url(GVariant *parameters,
                GDBusMethodInvocation *invocation)
 {
        const gchar *url = NULL;
@@ -978,7 +978,7 @@ static void inline __handle_remove_reacher_url(GVariant *parameters,
        __INM_FUNC_EXIT__;
 }
 
-static void inline __handle_start_reacher(GVariant *parameters,
+static inline void __handle_start_reacher(GVariant *parameters,
                GDBusMethodInvocation *invocation)
 {
        int type;
@@ -997,7 +997,7 @@ static void inline __handle_start_reacher(GVariant *parameters,
        __INM_FUNC_EXIT__;
 }
 
-static void inline __handle_stop_reacher(GVariant *parameters,
+static inline void __handle_stop_reacher(GVariant *parameters,
                GDBusMethodInvocation *invocation)
 {
        int type;
@@ -1016,7 +1016,7 @@ static void inline __handle_stop_reacher(GVariant *parameters,
        __INM_FUNC_EXIT__;
 }
 
-static void inline __handle_reacher_is_running(GVariant *parameters,
+static inline void __handle_reacher_is_running(GVariant *parameters,
                GDBusMethodInvocation *invocation)
 {
        gboolean is_running = FALSE;
@@ -1039,13 +1039,13 @@ static void inline __handle_reacher_is_running(GVariant *parameters,
 }
 
 static void __daemon_method_call(GDBusConnection *connection,
-                                 const gchar *sender,
-                                 const gchar *object_path,
-                                 const gchar *interface_name,
-                                 const gchar *method_name,
-                                 GVariant *parameters,
-                                 GDBusMethodInvocation *invocation,
-                                 gpointer user_data)
+               const gchar *sender,
+               const gchar *object_path,
+               const gchar *interface_name,
+               const gchar *method_name,
+               GVariant *parameters,
+               GDBusMethodInvocation *invocation,
+               gpointer user_data)
 {
        if (g_strcmp0(method_name, "GetStatistics") == 0)
                __handle_get_statistics(parameters, invocation);
@@ -1101,7 +1101,7 @@ static void __daemon_method_call(GDBusConnection *connection,
                __handle_reacher_is_running(parameters, invocation);
 }
 
-static inline GVariant *__get_reading_error(const gchar *sender,GError **error)
+static inline GVariant *__get_reading_error(const gchar *sender, GError **error)
 {
        __INM_FUNC_ENTER__;
        inm_error_set_gerror(INM_MANAGER_ERROR_OPERATION_FAILED, error);
@@ -2479,8 +2479,8 @@ int inm_gdbus_unset_stc_manager_bus_watching_callback()
 }
 
 static void __on_bus_acquired(GDBusConnection *connection,
-                              const gchar *name,
-                              gpointer user_data)
+               const gchar *name,
+               gpointer user_data)
 {
        __INM_FUNC_ENTER__;
 
@@ -2492,15 +2492,15 @@ static void __on_bus_acquired(GDBusConnection *connection,
 }
 
 static void __on_name_acquired(GDBusConnection *connection,
-                              const gchar *name,
-                              gpointer user_data)
+               const gchar *name,
+               gpointer user_data)
 {
        INM_LOGI("Bus name [%s] acquired\n", name);
 }
 
 static void __on_name_lost(GDBusConnection *connection,
-                          const gchar *name,
-                          gpointer user_data)
+               const gchar *name,
+               gpointer user_data)
 {
        gdbus_mon.is_bus_aquired = FALSE;
 
index 6a9842ddbe83e1cfa7176bd311dbce1feb72a0e9..6c9d66cc1977fe829d3889b96f119376c4f29be0 100644 (file)
@@ -54,7 +54,7 @@ typedef struct {
        unsigned char arp_tha[ETH_ALEN];
        unsigned char arp_tip[IP_ALEN];
 
-}__attribute__((packed))arp_message_s;
+} __attribute__((packed))arp_message_s;
 
 typedef struct {
        arp_data_s arp_data;
@@ -161,8 +161,8 @@ static inline void __init_ip_conflict_data(ip_conflict_data_s *ip_conflict_data)
        return;
 }
 static void __start_ip_conflict_mon(GQuark key_id,
-        gpointer value,
-        gpointer user_data)
+               gpointer value,
+               gpointer user_data)
 {
        __INM_FUNC_ENTER__;
        ip_conflict_data_s *ip_conflict_data = (ip_conflict_data_s *)value;
@@ -213,8 +213,8 @@ static void __start_ip_conflict_mon(GQuark key_id,
 }
 
 static void __stop_ip_conflict_mon(GQuark key_id,
-        gpointer value,
-        gpointer user_data)
+               gpointer value,
+               gpointer user_data)
 {
        ip_conflict_data_s *ip_conflict_data = (ip_conflict_data_s *)value;
 
index 5564e7cd4981f258c1fb83d41949d984859ac2ab..20ce04752bfb9b3984bf05a6de8aea2211f8acbc 100644 (file)
@@ -43,7 +43,7 @@
 #define IF_NAME_WLAN "wlan0"
 #define IF_NAME_ETH "eth0"
 
-typedef struct{
+typedef struct {
        GMainLoop *loop;
        int congestion_level;
        int retry_tx_rate;
@@ -454,7 +454,7 @@ int inm_manager_remove_reacher_url(const char *url)
        return INM_MANAGER_ERROR_NONE;
 }
 
-static void __reacher_callback (
+static void __reacher_callback(
                inm_reacher_error_e err,
                gboolean found,
                const char *url,
@@ -586,15 +586,14 @@ static inline void __deinit_ip_conflict_detect()
        ip_conflict_unset_callback(IF_NAME_ETH);
        ip_conflict_unset_callback(IF_NAME_WLAN);
 
-       if (ip_conflict_detection_deinit() < 0) {
+       if (ip_conflict_detection_deinit() < 0)
                INM_LOGI("ip conflict detection deinit failed");
-       }
 
        __INM_FUNC_EXIT__;
        return;
 }
 
-static void __arping_cb (gboolean found,
+static void __arping_cb(gboolean found,
                gchar *if_name,
                gchar *ip,
                gboolean is_gateway,
@@ -604,7 +603,7 @@ static void __arping_cb (gboolean found,
                return;
 
        INM_LOGI("arping callback IP : %s is %s", if_name, found ? "Found" : "Not Found");
-       if(is_gateway)
+       if (is_gateway)
                inm_gdbus_emit_gateway_check_result(found, ip);
        else
                inm_gdbus_emit_arping_result(found, ip);
@@ -630,9 +629,8 @@ static inline void __deinit_arping()
        __INM_FUNC_ENTER__;
        inm_arping_unset_callback();
 
-       if (inm_arping_deinit() < 0) {
+       if (inm_arping_deinit() < 0)
                INM_LOGI("arping deinit failed");
-       }
 
        __INM_FUNC_EXIT__;
        return;
@@ -654,9 +652,8 @@ static inline void __deinit_reacher()
 {
        __INM_FUNC_ENTER__;
 
-       if (inm_reacher_deinit() < 0) {
+       if (inm_reacher_deinit() < 0)
                INM_LOGI("reacher deinit failed");
-       }
 
        __INM_FUNC_EXIT__;
        return;
@@ -667,7 +664,7 @@ static void __ethernet_cable_state_changed_cb(char *iface_name, int state, void
 
        is_attached = state == 1;
 
-       INM_LOGI("%s is %s", IF_NAME_ETH, is_attached?"Attached":"Detached");
+       INM_LOGI("%s is %s", IF_NAME_ETH, is_attached ? "Attached" : "Detached");
        inm_gdbus_emit_ethernet_cable_state(is_attached);
 }
 
@@ -678,7 +675,7 @@ static void __wifi_module_state_changed_cb(char *iface_name, int state, void *us
 
        is_attached = state == 1;
 
-       INM_LOGI("%s is %s", IF_NAME_WLAN, is_attached?"Attached":"Detached");
+       INM_LOGI("%s is %s", IF_NAME_WLAN, is_attached ? "Attached" : "Detached");
        inm_gdbus_emit_wifi_module_state(is_attached);
 }
 
@@ -990,37 +987,37 @@ static inline void __deinit_supplicant()
 
 static void __wpasupplicant_watching_cb(gboolean appeared)
 {
-       INM_LOGI("wpasupplicant is %s", appeared?"Enabled":"Disabled");
+       INM_LOGI("wpasupplicant is %s", appeared ? "Enabled" : "Disabled");
        g_inm_manager->is_wpasupplicant_enabled = appeared;
 }
 
 static void __connman_watching_cb(gboolean appeared)
 {
-       INM_LOGI("connman is %s", appeared?"Enabled":"Disabled");
+       INM_LOGI("connman is %s", appeared ? "Enabled" : "Disabled");
        g_inm_manager->is_connman_enabled = appeared;
 }
 
 static void __telephony_watching_cb(gboolean appeared)
 {
-       INM_LOGI("telephony is %s", appeared?"Enabled":"Disabled");
+       INM_LOGI("telephony is %s", appeared ? "Enabled" : "Disabled");
        g_inm_manager->is_telephony_enabled = appeared;
 }
 
 static void __wfd_manager_watching_cb(gboolean appeared)
 {
-       INM_LOGI("wfd_manager is %s", appeared?"Enabled":"Disabled");
+       INM_LOGI("wfd_manager is %s", appeared ? "Enabled" : "Disabled");
        g_inm_manager->is_wfd_manager_enabled = appeared;
 }
 
 static void __mobileap_watching_cb(gboolean appeared)
 {
-       INM_LOGI("mobileap is %s", appeared?"Enabled":"Disabled");
+       INM_LOGI("mobileap is %s", appeared ? "Enabled" : "Disabled");
        g_inm_manager->is_mobileap_enabled = appeared;
 }
 
 static void __stc_manager_watching_cb(gboolean appeared)
 {
-       INM_LOGI("stc_manager is %s", appeared?"Enabled":"Disabled");
+       INM_LOGI("stc_manager is %s", appeared ? "Enabled" : "Disabled");
        g_inm_manager->is_stc_manager_enabled = appeared;
 }
 
@@ -1060,8 +1057,7 @@ static void __gdbus_name_aquired()
                inm_connman_mgr_get_properties();
                inm_connman_mgr_get_technologies();
                inm_connman_mgr_get_services();
-       }
-       else
+       } else
                INM_LOGI("connman is not enabled");
 
        if (inm_gdbus_is_telephony_enabled(&enabled) == 0)
index d021a84ed7bba133193515c532ca8d475fa4e47b..0c9c0c4ec442f7cbe23802407499c62cabff57bd 100644 (file)
@@ -751,7 +751,7 @@ static DECLARE_DBUS_SIGNAL_HANDLER(tether_dhcp_status_cb)
                                strdup(mac_addr), sta);
 
        } else if (g_strcmp0("DhcpLeaseDeleted", event) == 0) {
-               if(g_hash_table_remove(mobileap_mon.tether.sta_info, mac_addr))
+               if (g_hash_table_remove(mobileap_mon.tether.sta_info, mac_addr))
                        INM_LOGI("%s is removed", mac_addr);
        }
 
@@ -888,7 +888,7 @@ static DECLARE_DBUS_SIGNAL_HANDLER(softap_dhcp_status_cb)
                                strdup(mac_addr), sta);
 
        } else if (g_strcmp0("DhcpLeaseDeleted", event) == 0) {
-               if(g_hash_table_remove(mobileap_mon.softap.sta_info, mac_addr))
+               if (g_hash_table_remove(mobileap_mon.softap.sta_info, mac_addr))
                        INM_LOGI("%s is removed", mac_addr);
        }
 
index fb1d144dfc2d7086262a99fec3d276c33f76d76b..c7529f4f43250b09fabfe663ad646f4f08dde027 100644 (file)
@@ -183,7 +183,7 @@ static gboolean __inm_netlink_event(GIOChannel *channel, GIOCondition cond, gpoi
        fd = g_io_channel_unix_get_fd(channel);
 
        length = recvfrom(fd, buf, sizeof(buf), 0,
-                       (struct sockaddr *) &nladdr, &addr_len);
+                       (struct sockaddr *)&nladdr, &addr_len);
        if (length < 0) {
                strerror_r(errno, error_buf, MAX_SIZE_ERROR_BUFFER);
                INM_LOGE("Failed to get netlink message [error: %s]", error_buf);
@@ -282,17 +282,17 @@ static int ack_handler(struct nl_msg *msg, void *arg)
 }
 
 static const char *ht_secondary_offset[4] = {
-        "no secondary",
-        "above",
-        "[reserved!]",
-        "below",
+               "no secondary",
+               "above",
+               "[reserved!]",
+               "below",
 };
 
 struct inmmanager_ie_print {
-        const char *name;
-        void (*print)(inmmanager_mon_data_s *data, const uint8_t type, uint8_t len, const uint8_t *ie);
-        uint8_t minlen, maxlen;
-        uint8_t flags;
+       const char *name;
+       void (*print)(inmmanager_mon_data_s *data, const uint8_t type, uint8_t len, const uint8_t *ie);
+       uint8_t minlen, maxlen;
+       uint8_t flags;
 };
 
 static void __inmmanager_print_ht_op(inmmanager_mon_data_s *data, const uint8_t type, uint8_t len, const uint8_t *ie)
@@ -304,11 +304,14 @@ static const struct inmmanager_ie_print ie_printers[] = {
        [61] = { "HT operation", __inmmanager_print_ht_op, 22, 22, 1, },
 };
 
-static void inmmanager_print_ie(inmmanager_mon_data_s *data, const struct inmmanager_ie_print *p, const uint8_t type,
-                     uint8_t len, const uint8_t *ie)
+static void inmmanager_print_ie(inmmanager_mon_data_s *data,
+               const struct inmmanager_ie_print *p,
+               const uint8_t type,
+               uint8_t len,
+               const uint8_t *ie)
 {
-        if (!p->print)
-                return;
+       if (!p->print)
+               return;
 
        if (len < p->minlen || len > p->maxlen) {
 
@@ -325,7 +328,7 @@ static void inmmanager_print_ie(inmmanager_mon_data_s *data, const struct inmman
                return;
        }
 
-        p->print(data, type, len, ie);
+       p->print(data, type, len, ie);
 }
 
 static void __inmmanager_print_ies(inmmanager_mon_data_s *data, unsigned char *ie, int ielen)
@@ -376,13 +379,11 @@ static double __inmmanager_get_channel_interference(inmmanager_mon_data_s *data)
                return total_intf;
        }
 
-       if (intf_info->htmode == INMMANAGER_HTMODE_HT40) {
+       if (intf_info->htmode == INMMANAGER_HTMODE_HT40)
                n_chans = 2;
-       }
 
-       if (intf_info->htmode == INMMANAGER_HTMODE_HT80) {
+       if (intf_info->htmode == INMMANAGER_HTMODE_HT80)
                n_chans = 4;
-       }
 
        chan = &intf_info->chan[intf_info->home_channel_pos];
        total_intf = chan->intf_factor;
@@ -391,16 +392,14 @@ static double __inmmanager_get_channel_interference(inmmanager_mon_data_s *data)
        for (j = 1; j < n_chans; j++) {
                if (!strcmp(data->sec_chan_offset, "above")) {
                        adj_chan = __inmmanager_find_chan(intf_info, chan->freq + (j * 20));
-                       if (!adj_chan) {
+                       if (!adj_chan)
                                break;
-                       }
                }
 
                if (!strcmp(data->sec_chan_offset, "below")) {
                        adj_chan = __inmmanager_find_chan(intf_info, chan->freq - (j * 20));
-                       if (!adj_chan) {
+                       if (!adj_chan)
                                break;
-                       }
                }
 
                if (adj_chan) {
@@ -594,9 +593,8 @@ static int nl_survey_info(struct nl_msg *msg, void *user_data)
                        INM_LOGI("channel transmit time: %llu ms", ch_tx_time);
                }
 
-               if (survey_info[NL80211_SURVEY_INFO_IN_USE]) {
+               if (survey_info[NL80211_SURVEY_INFO_IN_USE])
                        intf_info->home_channel_pos = intf_info->cur_pos;
-               }
 
                intf_info->chan[intf_info->cur_pos].intf_factor = (((double)(ch_busy_time - ch_tx_time)) / ((double)(ch_active_time - ch_tx_time)));
                intf_info->cur_pos++;
@@ -625,10 +623,10 @@ static int nl_station_info(struct nl_msg* msg, void *user_data)
        };
 
        struct nlattr *rinfo[NL80211_RATE_INFO_MAX + 1];
-        static struct nla_policy rate_policy[NL80211_RATE_INFO_MAX + 1] = {
-                [NL80211_RATE_INFO_40_MHZ_WIDTH] = { .type = NLA_FLAG },
-                [NL80211_RATE_INFO_SHORT_GI] = { .type = NLA_FLAG },
-        };
+       static struct nla_policy rate_policy[NL80211_RATE_INFO_MAX + 1] = {
+                       [NL80211_RATE_INFO_40_MHZ_WIDTH] = { .type = NLA_FLAG },
+                       [NL80211_RATE_INFO_SHORT_GI] = { .type = NLA_FLAG },
+               };
 
        nla_parse(tb, NL80211_ATTR_MAX, genlmsg_attrdata(genlh, 0),
                        genlmsg_attrlen(genlh, 0), NULL);
@@ -785,7 +783,7 @@ static gboolean __inmmanager_send_netlink_cmd(gpointer user_data)
        nl_cb_set(global->cb, NL_CB_FINISH, NL_CB_CUSTOM, finish_handler, &err);
        nl_cb_set(global->cb, NL_CB_ACK, NL_CB_CUSTOM, ack_handler, &err);
 
-       switch(global->cmd) {
+       switch (global->cmd) {
        case NL80211_CMD_GET_SCAN:
                nl_cb_set(global->cb, NL_CB_VALID, NL_CB_CUSTOM, nl_scan_info, user_data);
                break;
index a0c2d9333486d1839c6d05d92e345c769c1308ca..fd29369b90a69231c8700dc8bd0fc068f2d45ce6 100644 (file)
@@ -149,7 +149,7 @@ static int __get_easy_handle_info(conn_info_s *conn)
        easy_handle = conn->p_eh;
        ret = curl_easy_getinfo(easy_handle, CURLINFO_SPEED_DOWNLOAD, &speed);
        /* Check for errors */
-       if(ret != CURLE_OK) {
+       if (ret != CURLE_OK) {
                INM_LOGE("CURLINFO_SPEED_DOWNLOAD() failed: %s",
                                curl_easy_strerror(ret));
                return 0;
@@ -160,7 +160,7 @@ static int __get_easy_handle_info(conn_info_s *conn)
 
        ret = curl_easy_getinfo(easy_handle, CURLINFO_SIZE_DOWNLOAD, &download);
        /* Check for errors */
-       if(ret != CURLE_OK) {
+       if (ret != CURLE_OK) {
                INM_LOGE("CURLINFO_SIZE_DOWNLOAD() failed: %s",
                                curl_easy_strerror(ret));
                return 0;
@@ -171,7 +171,7 @@ static int __get_easy_handle_info(conn_info_s *conn)
 
        ret = curl_easy_getinfo(easy_handle, CURLINFO_NAMELOOKUP_TIME, &namelookup);
        /* Check for errors */
-       if(ret != CURLE_OK) {
+       if (ret != CURLE_OK) {
                INM_LOGE("CURLINFO_NAMELOOKUP_TIME() failed: %s",
                                curl_easy_strerror(ret));
                return 0;
@@ -182,7 +182,7 @@ static int __get_easy_handle_info(conn_info_s *conn)
 
        ret = curl_easy_getinfo(easy_handle, CURLINFO_APPCONNECT_TIME, &connect);
        /* Check for errors */
-       if(ret != CURLE_OK) {
+       if (ret != CURLE_OK) {
                INM_LOGE("CURLINFO_APPCONNECT_TIME() failed: %s",
                                curl_easy_strerror(ret));
                return 0;
@@ -192,7 +192,7 @@ static int __get_easy_handle_info(conn_info_s *conn)
 
        ret = curl_easy_getinfo(easy_handle, CURLINFO_TOTAL_TIME, &total);
        /* Check for errors */
-       if(ret != CURLE_OK) {
+       if (ret != CURLE_OK) {
                INM_LOGE("CURLINFO_TOTAL_TIME() failed: %s",
                                curl_easy_strerror(ret));
                return 0;
@@ -256,7 +256,7 @@ static inline int __add_easy_to_multi(conn_info_s *conn)
        curl_easy_setopt(p_eh, CURLOPT_URL, conn->url);
        ret = curl_multi_add_handle(g_reacher->p_mh, p_eh);
        /* Check for errors */
-       if(ret != CURLE_OK) {
+       if (ret != CURLE_OK) {
                INM_LOGE("curl_multi_add_handle() failed: %s",
                                curl_easy_strerror(ret));
                curl_easy_cleanup(p_eh);
@@ -281,17 +281,15 @@ static inline void __clear_running_mult_data(reacher_data_s *reacher)
 
        sock_data = reacher->current_sock;
        conn_data = reacher->current_conn;
-       if(sock_data && sock_data->source_id) {
+       if (sock_data && sock_data->source_id)
                g_source_remove(sock_data->source_id);
-       }
-
        g_free(sock_data);
        reacher->current_sock = NULL;
 
        __destroy_conn(conn_data);
        reacher->current_conn = NULL;
 
-       if(reacher->timer_source_id) {
+       if (reacher->timer_source_id) {
                g_source_remove(reacher->timer_source_id);
                reacher->timer_source_id = 0;
        }
@@ -346,6 +344,7 @@ static inline void __check_next(reacher_data_s *reacher)
                if (reacher->once && reacher->current_index == URL_CNT) {
                        __clear_running_mult_data(reacher);
                        INM_LOGI("Reached to end");
+                       g_reacher->running = FALSE;
                        return;
                }
                reacher->current_index = (reacher->current_index + 1) % (URL_CNT);
@@ -355,6 +354,7 @@ static inline void __check_next(reacher_data_s *reacher)
                if (reacher->once && reacher->current == NULL) {
                        __clear_running_mult_data(reacher);
                        INM_LOGI("Reached to end");
+                       g_reacher->running = FALSE;
                        return;
                }
                if (reacher->current == NULL)
@@ -375,8 +375,8 @@ static void __check_multi_info(reacher_data_s *reacher)
        CURL *easy_handle;
        CURLcode ret;
 
-       while((msg = curl_multi_info_read(reacher->p_mh, &msgs_left))) {
-               if(msg->msg != CURLMSG_DONE)
+       while ((msg = curl_multi_info_read(reacher->p_mh, &msgs_left))) {
+               if (msg->msg != CURLMSG_DONE)
                        continue;
 
                easy_handle = msg->easy_handle;
@@ -410,7 +410,7 @@ static gboolean __timer_cb(gpointer data)
                        CURL_SOCKET_TIMEOUT,
                        0,
                        &(reacher->active_connection));
-       if(ret != CURLM_OK) {
+       if (ret != CURLM_OK) {
                printf("curl_multi_socket_action() failed: %s",
                                curl_easy_strerror(ret));
                return FALSE;
@@ -431,7 +431,7 @@ static int __update_timeout_cb(CURLM *multi, long timeout_ms, void *user_data)
        timeout.tv_usec = (timeout_ms%1000)*1000;
 
        if (timeout_ms == -1) {
-               if(reacher->timer_source_id) {
+               if (reacher->timer_source_id) {
                        g_source_remove(reacher->timer_source_id);
                        INM_LOGI("delete timer");
                        reacher->timer_source_id = 0;
@@ -464,7 +464,7 @@ static gboolean __event_cb(GIOChannel *ch, GIOCondition condition, gpointer data
                        &(reacher->active_connection));
 
        /* Check for errors */
-       if(ret != CURLM_OK) {
+       if (ret != CURLM_OK) {
                INM_LOGE("curl_multi_socket_action() failed: %s",
                                curl_easy_strerror(ret));
 
@@ -473,7 +473,7 @@ static gboolean __event_cb(GIOChannel *ch, GIOCondition condition, gpointer data
        }
 
        __check_multi_info(reacher);
-       if(reacher->active_connection == 0)
+       if (reacher->active_connection == 0)
                INM_LOGI("last transfer done");
 
        return TRUE;
@@ -482,10 +482,10 @@ static gboolean __event_cb(GIOChannel *ch, GIOCondition condition, gpointer data
 /* Clean up the SockInfo structure */
 static void __destroy_sock(sock_data_s *sock_data)
 {
-       if(!sock_data)
+       if (!sock_data)
                return;
 
-       if(sock_data->source_id)
+       if (sock_data->source_id)
                g_source_remove(sock_data->source_id);
 
        g_free(sock_data);
@@ -504,7 +504,7 @@ static void __set_sock(sock_data_s *sock_data,
        sock_data->sockfd = sock;
        sock_data->action = action;
        sock_data->p_eh = easy_handle;
-       if(sock_data->source_id) {
+       if (sock_data->source_id) {
                g_source_remove(sock_data->source_id);
                sock_data->source_id = 0;
        }
@@ -519,6 +519,8 @@ static void __create_sock(curl_socket_t sock,
                reacher_data_s *reacher)
 {
        sock_data_s *sock_data = g_try_malloc0(sizeof(sock_data_s));
+       if (!sock_data)
+               return;
 
        sock_data->ch = g_io_channel_unix_new(sock);
        __set_sock(sock_data, sock, sock_data->p_eh, action, reacher);
@@ -534,14 +536,14 @@ static int __sock_cb(CURL *easy_handle,
        reacher_data_s *reacher = (reacher_data_s *)user_data;
        sock_data_s *p_sock = (sock_data_s *)sock_data;
 
-       static const char *whatstr[]={ "none", "IN", "OUT", "INOUT", "REMOVE" };
+       static const char *whatstr[] = {"none", "IN", "OUT", "INOUT", "REMOVE"};
 
        INM_LOGI("socket callback: s=%d e=%p what=%s", sock, easy_handle, whatstr[what]);
 
-       if(what == CURL_POLL_REMOVE) {
+       if (what == CURL_POLL_REMOVE) {
                __destroy_sock(p_sock);
        } else {
-               if(!p_sock)
+               if (!p_sock)
                        __create_sock(sock, easy_handle, what, reacher);
                else
                        __set_sock(p_sock, sock, easy_handle, what, reacher);
@@ -628,7 +630,6 @@ int inm_reacher_deinit(void)
                        __INM_FUNC_EXIT__;
                        return INM_REACHER_ERROR_OPERATION_FAILED;
                }
-
                g_reacher->running = FALSE;
        }
 
@@ -637,7 +638,6 @@ int inm_reacher_deinit(void)
        g_reacher->cb_user_data = NULL;
        g_reacher->current = NULL;
        g_reacher->current_index = 0;
-       g_reacher->running = FALSE;
 
        __INM_FUNC_EXIT__;
        return ret;
@@ -727,6 +727,7 @@ int inm_reacher_start(inm_reacher_check_type_e type,
 
        if (g_reacher->running) {
                __INM_FUNC_EXIT__;
+               INM_LOGD("Already running");
                return INM_REACHER_ERROR_IN_PROGRESS;
        }
 
index 225043c1461a90106a434192694342ab6938f2dd..b39e0e122f707f6b250c08053878262ba379df88 100644 (file)
@@ -49,11 +49,11 @@ stc_manager_mon_s stc_manager_mon;
 
 static void __name_owner_changed_cb(
                const gchar *sender_name,
-        const gchar *object_path,
-        const gchar *interface_name,
-        const gchar *signal_name,
-        GVariant *parameters,
-        gpointer user_data);
+               const gchar *object_path,
+               const gchar *interface_name,
+               const gchar *signal_name,
+               GVariant *parameters,
+               gpointer user_data);
 
 static signal_param_s signal_param[] = {
                {
@@ -87,11 +87,11 @@ static signal_param_s signal_param[] = {
 
 static void __name_owner_changed_cb(
                const gchar *sender_name,
-        const gchar *object_path,
-        const gchar *interface_name,
-        const gchar *signal_name,
-        GVariant *parameters,
-        gpointer user_data)
+               const gchar *object_path,
+               const gchar *interface_name,
+               const gchar *signal_name,
+               GVariant *parameters,
+               gpointer user_data)
 {
        gchar *name = NULL;
        gchar *old = NULL;
index 0125c912bda47bcedf4dc357bbba32cbf1d989c4..9e3e02e0996d255e65d3b4d78c8ca6a9fd594857 100644 (file)
@@ -209,7 +209,7 @@ void inm_supplicant_bss_destroy(gpointer data)
        return;
 }
 /*
-static void inline __get_pairwise(GVariant *value, guint *pairwaise)
+static inline void __get_pairwise(GVariant *value, guint *pairwaise)
 {
        GVariantIter *iter = NULL;
        const gchar *str = NULL;
@@ -232,7 +232,7 @@ static void inline __get_pairwise(GVariant *value, guint *pairwaise)
        g_variant_iter_free(iter);
 }
 
-static void inline __get_group(GVariant *value, guint *group)
+static inline void __get_group(GVariant *value, guint *group)
 {
        GVariantIter *iter = NULL;
        const gchar *str = NULL;
@@ -258,7 +258,7 @@ static void inline __get_group(GVariant *value, guint *group)
        g_variant_iter_free(iter);
 }
 
-static void inline __get_key_mgmt(GVariant *value, guint *key_mgmt)
+static inline void __get_key_mgmt(GVariant *value, guint *key_mgmt)
 {
        GVariantIter *iter = NULL;
        const gchar *str = NULL;
@@ -323,22 +323,22 @@ static gboolean __unpack_ays(unsigned char *dst, GVariant *src, int size)
        return res;
 }
 
-static void inline __get_bss_bssid(GVariant *value, supplicant_bss_s *bss)
+static inline void __get_bss_bssid(GVariant *value, supplicant_bss_s *bss)
 {
        __unpack_ays(bss->bssid, value, BSSID_LEN);
 }
 
-static void inline __get_bss_ssid(GVariant *value, supplicant_bss_s *bss)
+static inline void __get_bss_ssid(GVariant *value, supplicant_bss_s *bss)
 {
        __unpack_ays((unsigned char *)bss->ssid, value, SSID_LEN);
 }
 
-static void inline __get_bss_privacy(GVariant *value, supplicant_bss_s *bss)
+static inline void __get_bss_privacy(GVariant *value, supplicant_bss_s *bss)
 {
        g_variant_get(value, "b", &(bss->private));
 }
 
-static void inline __get_bss_mode(GVariant *value, supplicant_bss_s *bss)
+static inline void __get_bss_mode(GVariant *value, supplicant_bss_s *bss)
 {
        const gchar *str = NULL;
        g_variant_get(value, "&s", &str);
@@ -354,17 +354,17 @@ static void inline __get_bss_mode(GVariant *value, supplicant_bss_s *bss)
                bss->mode |= MODE_P2P;
 }
 
-static void inline __get_bss_freq(GVariant *value, supplicant_bss_s *bss)
+static inline void __get_bss_freq(GVariant *value, supplicant_bss_s *bss)
 {
        g_variant_get(value, "q", &(bss->frequency));
 }
 
-static void inline __get_bss_signal(GVariant *value, supplicant_bss_s *bss)
+static inline void __get_bss_signal(GVariant *value, supplicant_bss_s *bss)
 {
        g_variant_get(value, "n", &(bss->signal));
 }
 
-static void inline __get_bss_property(const gchar *key, GVariant *value, supplicant_bss_s *bss)
+static inline void __get_bss_property(const gchar *key, GVariant *value, supplicant_bss_s *bss)
 {
        if (g_strcmp0(key, "BSSID") == 0)
                __get_bss_bssid(value, bss);
index 4d4e504506a2ebcea6be81faac31c56d64bb859e..477f8a07fe8158d799b3f17831d2c04340e59aa3 100644 (file)
@@ -401,7 +401,7 @@ static void __destroy_iface_data(gpointer data)
        return;
 }
 
-static void inline __get_cap_pairwise(GVariant *value, inm_supplicant_iface_s *iface)
+static inline void __get_cap_pairwise(GVariant *value, inm_supplicant_iface_s *iface)
 {
        GVariantIter *iter = NULL;
        const gchar *str = NULL;
@@ -424,7 +424,7 @@ static void inline __get_cap_pairwise(GVariant *value, inm_supplicant_iface_s *i
        g_variant_iter_free(iter);
 }
 
-static void inline __get_cap_group(GVariant *value, inm_supplicant_iface_s *iface)
+static inline void __get_cap_group(GVariant *value, inm_supplicant_iface_s *iface)
 {
        GVariantIter *iter = NULL;
        const gchar *str = NULL;
@@ -450,7 +450,7 @@ static void inline __get_cap_group(GVariant *value, inm_supplicant_iface_s *ifac
        g_variant_iter_free(iter);
 }
 
-static void inline __get_cap_key_mgmt(GVariant *value, inm_supplicant_iface_s *iface)
+static inline void __get_cap_key_mgmt(GVariant *value, inm_supplicant_iface_s *iface)
 {
        GVariantIter *iter = NULL;
        const gchar *str = NULL;
@@ -487,7 +487,7 @@ static void inline __get_cap_key_mgmt(GVariant *value, inm_supplicant_iface_s *i
        g_variant_iter_free(iter);
 }
 
-static void inline __get_cap_proto(GVariant *value, inm_supplicant_iface_s *iface)
+static inline void __get_cap_proto(GVariant *value, inm_supplicant_iface_s *iface)
 {
        GVariantIter *iter = NULL;
        const gchar *str = NULL;
@@ -509,7 +509,7 @@ static void inline __get_cap_proto(GVariant *value, inm_supplicant_iface_s *ifac
        g_variant_iter_free(iter);
 }
 
-static void inline __get_cap_auth_alg(GVariant *value, inm_supplicant_iface_s *iface)
+static inline void __get_cap_auth_alg(GVariant *value, inm_supplicant_iface_s *iface)
 {
        GVariantIter *iter = NULL;
        const gchar *str = NULL;
@@ -533,7 +533,7 @@ static void inline __get_cap_auth_alg(GVariant *value, inm_supplicant_iface_s *i
        g_variant_iter_free(iter);
 }
 
-static void inline __get_cap_scan(GVariant *value, inm_supplicant_iface_s *iface)
+static inline void __get_cap_scan(GVariant *value, inm_supplicant_iface_s *iface)
 {
        GVariantIter *iter = NULL;
        const gchar *str = NULL;
@@ -557,7 +557,7 @@ static void inline __get_cap_scan(GVariant *value, inm_supplicant_iface_s *iface
        g_variant_iter_free(iter);
 }
 
-static void inline __get_cap_mode(GVariant *value, inm_supplicant_iface_s *iface)
+static inline void __get_cap_mode(GVariant *value, inm_supplicant_iface_s *iface)
 {
        GVariantIter *iter = NULL;
        const gchar *str = NULL;
@@ -581,7 +581,7 @@ static void inline __get_cap_mode(GVariant *value, inm_supplicant_iface_s *iface
 
        g_variant_iter_free(iter);
 }
-static void inline __get_iface_capabilities(GVariant *value, inm_supplicant_iface_s *iface)
+static inline void __get_iface_capabilities(GVariant *value, inm_supplicant_iface_s *iface)
 {
        GVariantIter *iter = NULL;
        const gchar *key = NULL;
@@ -611,7 +611,7 @@ static void inline __get_iface_capabilities(GVariant *value, inm_supplicant_ifac
        g_variant_iter_free(iter);
 }
 
-static void inline __get_iface_state(GVariant *value, inm_supplicant_iface_s *iface)
+static inline void __get_iface_state(GVariant *value, inm_supplicant_iface_s *iface)
 {
        const gchar *str = NULL;
 
@@ -641,14 +641,14 @@ static void inline __get_iface_state(GVariant *value, inm_supplicant_iface_s *if
        INM_LOGI("state [%s]", str);
 }
 
-static void inline __get_iface_scanning(GVariant *value, inm_supplicant_iface_s *iface)
+static inline void __get_iface_scanning(GVariant *value, inm_supplicant_iface_s *iface)
 {
        g_variant_get(value, "b", &(iface->scanning));
 
-       INM_LOGI("%s", (iface->scanning)?"Scanning":"Not scanning");
+       INM_LOGI("%s", (iface->scanning) ? "Scanning" : "Not scanning");
 }
 
-static void inline __get_iface_ifname(GVariant *value, inm_supplicant_iface_s *iface)
+static inline void __get_iface_ifname(GVariant *value, inm_supplicant_iface_s *iface)
 {
        const gchar *str = NULL;
 
@@ -658,7 +658,7 @@ static void inline __get_iface_ifname(GVariant *value, inm_supplicant_iface_s *i
        INM_LOGI("state [%s]", str);
 }
 
-static void inline __get_iface_current_bss(GVariant *value, inm_supplicant_iface_s *iface)
+static inline void __get_iface_current_bss(GVariant *value, inm_supplicant_iface_s *iface)
 {
        const gchar *path = NULL;
        gpointer bss = NULL;
@@ -683,7 +683,7 @@ static void inline __get_iface_current_bss(GVariant *value, inm_supplicant_iface
        __INM_FUNC_EXIT__;
 }
 
-static void inline __get_iface_bsss(GVariant *value, inm_supplicant_iface_s *iface)
+static inline void __get_iface_bsss(GVariant *value, inm_supplicant_iface_s *iface)
 {
        GVariantIter *iter = NULL;
        const gchar *obj = NULL;
@@ -701,7 +701,7 @@ static void inline __get_iface_bsss(GVariant *value, inm_supplicant_iface_s *ifa
        g_variant_iter_free(iter);
 }
 
-static void inline __get_iface_current_network(GVariant *value, inm_supplicant_iface_s *iface)
+static inline void __get_iface_current_network(GVariant *value, inm_supplicant_iface_s *iface)
 {
        const gchar *obj = NULL;
 
@@ -719,7 +719,7 @@ static void inline __get_iface_current_network(GVariant *value, inm_supplicant_i
        return;
 }
 
-static void inline __get_iface_property(const gchar *key, GVariant *value, inm_supplicant_iface_s *iface)
+static inline void __get_iface_property(const gchar *key, GVariant *value, inm_supplicant_iface_s *iface)
 {
        if (g_strcmp0(key, "Capabilities") == 0)
                __get_iface_capabilities(value, iface);
@@ -745,7 +745,7 @@ static void inline __get_iface_property(const gchar *key, GVariant *value, inm_s
 */
 }
 
-static void inline __get_iface_property_without_bss(const gchar *key, GVariant *value, inm_supplicant_iface_s *iface)
+static inline void __get_iface_property_without_bss(const gchar *key, GVariant *value, inm_supplicant_iface_s *iface)
 {
        INM_LOGI("Prop %s", key);
        if (g_strcmp0(key, "Capabilities") == 0)
@@ -1440,8 +1440,8 @@ int inm_supplicant_iface_get_iface(gchar *iface_name, inm_supplicant_iface_s **i
                return INM_SUPPLICANT_ERROR_NOT_INITIALIZED;
 
 
-       g_hash_table_iter_init (&iter, g_supplicant_iface_tbl);
-       while (g_hash_table_iter_next (&iter, &key, &value)) {
+       g_hash_table_iter_init(&iter, g_supplicant_iface_tbl);
+       while (g_hash_table_iter_next(&iter, &key, &value)) {
                iface_data = (inm_supplicant_iface_s *)value;
                if (iface_data == NULL)
                        continue;
index d70b064b72b3b7b80e7573c25e355e3ffcf2cf25..d1c93feb4ec6c5630d4582a602a0189dd834fe13 100644 (file)
@@ -142,7 +142,7 @@ typedef enum {
        P2P_ROLE_NONE,
        P2P_ROLE_GC,
        P2P_ROLE_GO,
-}p2p_role_e;
+} p2p_role_e;
 
 int inm_supplicant_get_eap_methods(unsigned int *eap_methods);
 int inm_supplicant_get_capabilities(unsigned int *capabilities);
index d0400d304699413ff0d35c0a76c733d3ccb3ec76..7fb53819a2ca67de7b0381a9047a9330e0127164 100644 (file)
@@ -74,14 +74,14 @@ static method_param_s get_net_property_method_param = {
                .parameters = NULL,
 };
 
-static void inline __get_network_enabled(GVariant *value, supplicant_network_s *net)
+static inline void __get_network_enabled(GVariant *value, supplicant_network_s *net)
 {
        g_variant_get(value, "b", &(net->enable));
 
-       INM_LOGI("Network %s", (net->enable)?"Enabled":"Disabled");
+       INM_LOGI("Network %s", (net->enable) ? "Enabled" : "Disabled");
 }
 
-static void inline __get_network_property(const gchar *key, GVariant *value, supplicant_network_s *net)
+static inline void __get_network_property(const gchar *key, GVariant *value, supplicant_network_s *net)
 {
        __INM_FUNC_ENTER__;
 
index 19d60c9c26b4bf0aa2fc7020c6b6d058f6baf94d..478ddd4f43713e0d82ea4d012f34b2e6ec273870 100644 (file)
@@ -51,8 +51,7 @@ enum {
 /**
  * Below structure is used to export profile name
  */
-typedef struct
-{
+typedef struct {
        /** Profile name */
        gchar profile_name[INM_PROFILE_NAME_LEN_MAX + 1];
 } inm_profile_name_s;
index c0abe26980fab332ef26d56b6e6725c40659b083..78718996b3a177d79d480b020b50c81443defa6e 100644 (file)
@@ -79,7 +79,7 @@ typedef struct {
        unsigned char arp_tha[ETH_ALEN];
        unsigned char arp_tip[IP_ALEN];
 
-}__attribute__((packed))arp_message_s;
+} __attribute__((packed))arp_message_s;
 
 static void __print_mac(guchar *mac)
 {
@@ -163,7 +163,7 @@ static int __get_iface_info(char *if_name, int *if_index, unsigned char *hw_addr
                return -1;
        }
 
-       if (ioctl(sock, SIOCGIFHWADDR, &ifr) <0) {
+       if (ioctl(sock, SIOCGIFHWADDR, &ifr) < 0) {
                strerror_r(errno, err_str, 128);
                INM_LOGE("errno[%d]: %s\n", errno, err_str);
                __INM_FUNC_EXIT__;
index c28061785e95e364668b65356cce197241aa7c98..75cdc782b7b27d25832ff02b83cfb46f3c7c912b 100644 (file)
@@ -110,67 +110,67 @@ wfd_manager_mon_s wfd_manager_mon;
 
 static void __name_owner_changed_cb(
                const gchar *sender_name,
-        const gchar *object_path,
-        const gchar *interface_name,
-        const gchar *signal_name,
-        GVariant *parameters,
-        gpointer user_data);
+               const gchar *object_path,
+               const gchar *interface_name,
+               const gchar *signal_name,
+               GVariant *parameters,
+               gpointer user_data);
 
 static void __activation_cb(
                const gchar *sender_name,
-        const gchar *object_path,
-        const gchar *interface_name,
-        const gchar *signal_name,
-        GVariant *parameters,
-        gpointer user_data);
+               const gchar *object_path,
+               const gchar *interface_name,
+               const gchar *signal_name,
+               GVariant *parameters,
+               gpointer user_data);
 
 static void __deactivation_cb(
                const gchar *sender_name,
-        const gchar *object_path,
-        const gchar *interface_name,
-        const gchar *signal_name,
-        GVariant *parameters,
-        gpointer user_data);
+               const gchar *object_path,
+               const gchar *interface_name,
+               const gchar *signal_name,
+               GVariant *parameters,
+               gpointer user_data);
 
 static void __group_created_cb(
                const gchar *sender_name,
-        const gchar *object_path,
-        const gchar *interface_name,
-        const gchar *signal_name,
-        GVariant *parameters,
-        gpointer user_data);
+               const gchar *object_path,
+               const gchar *interface_name,
+               const gchar *signal_name,
+               GVariant *parameters,
+               gpointer user_data);
 
 static void __group_destroyed_cb(
                const gchar *sender_name,
-        const gchar *object_path,
-        const gchar *interface_name,
-        const gchar *signal_name,
-        GVariant *parameters,
-        gpointer user_data);
+               const gchar *object_path,
+               const gchar *interface_name,
+               const gchar *signal_name,
+               GVariant *parameters,
+               gpointer user_data);
 
 static void __connection_cb(
                const gchar *sender_name,
-        const gchar *object_path,
-        const gchar *interface_name,
-        const gchar *signal_name,
-        GVariant *parameters,
-        gpointer user_data);
+               const gchar *object_path,
+               const gchar *interface_name,
+               const gchar *signal_name,
+               GVariant *parameters,
+               gpointer user_data);
 
 static void __peer_ip_assigned_cb(
                const gchar *sender_name,
-        const gchar *object_path,
-        const gchar *interface_name,
-        const gchar *signal_name,
-        GVariant *parameters,
-        gpointer user_data);
+               const gchar *object_path,
+               const gchar *interface_name,
+               const gchar *signal_name,
+               GVariant *parameters,
+               gpointer user_data);
 
 static void __disconnection_cb(
                const gchar *sender_name,
-        const gchar *object_path,
-        const gchar *interface_name,
-        const gchar *signal_name,
-        GVariant *parameters,
-        gpointer user_data);
+               const gchar *object_path,
+               const gchar *interface_name,
+               const gchar *signal_name,
+               GVariant *parameters,
+               gpointer user_data);
 
 static signal_param_s signal_param[] = {
                {
@@ -337,11 +337,11 @@ static gboolean __unpack_ays(unsigned char *dst, GVariant *src, int size)
 
 static void __name_owner_changed_cb(
                const gchar *sender_name,
-        const gchar *object_path,
-        const gchar *interface_name,
-        const gchar *signal_name,
-        GVariant *parameters,
-        gpointer user_data)
+               const gchar *object_path,
+               const gchar *interface_name,
+               const gchar *signal_name,
+               GVariant *parameters,
+               gpointer user_data)
 {
        gchar *name = NULL;
        gchar *old = NULL;
@@ -656,7 +656,7 @@ static inline void __reset_wfd_manager_group_info()
 
 static inline void __clear_wfd_manager_info()
 {
-       if(wfd_manager_mon.connected_peer) {
+       if (wfd_manager_mon.connected_peer) {
                g_hash_table_remove_all(wfd_manager_mon.connected_peer);
                g_hash_table_unref(wfd_manager_mon.connected_peer);
                wfd_manager_mon.connected_peer = NULL;
@@ -673,11 +673,11 @@ static inline void __clear_wfd_manager_info()
 
 static void __activation_cb(
                const gchar *sender_name,
-        const gchar *object_path,
-        const gchar *interface_name,
-        const gchar *signal_name,
-        GVariant *parameters,
-        gpointer user_data)
+               const gchar *object_path,
+               const gchar *interface_name,
+               const gchar *signal_name,
+               GVariant *parameters,
+               gpointer user_data)
 {
        __INM_FUNC_ENTER__;
 
@@ -694,11 +694,11 @@ static void __activation_cb(
 
 static void __deactivation_cb(
                const gchar *sender_name,
-        const gchar *object_path,
-        const gchar *interface_name,
-        const gchar *signal_name,
-        GVariant *parameters,
-        gpointer user_data)
+               const gchar *object_path,
+               const gchar *interface_name,
+               const gchar *signal_name,
+               GVariant *parameters,
+               gpointer user_data)
 {
        __INM_FUNC_ENTER__;
 
@@ -710,11 +710,11 @@ static void __deactivation_cb(
 
 static void __group_created_cb(
                const gchar *sender_name,
-        const gchar *object_path,
-        const gchar *interface_name,
-        const gchar *signal_name,
-        GVariant *parameters,
-        gpointer user_data)
+               const gchar *object_path,
+               const gchar *interface_name,
+               const gchar *signal_name,
+               GVariant *parameters,
+               gpointer user_data)
 {
        __INM_FUNC_ENTER__;
 
@@ -727,15 +727,15 @@ static void __group_created_cb(
 
 static void __group_destroyed_cb(
                const gchar *sender_name,
-        const gchar *object_path,
-        const gchar *interface_name,
-        const gchar *signal_name,
-        GVariant *parameters,
-        gpointer user_data)
+               const gchar *object_path,
+               const gchar *interface_name,
+               const gchar *signal_name,
+               GVariant *parameters,
+               gpointer user_data)
 {
        __INM_FUNC_ENTER__;
 
-       if(wfd_manager_mon.connected_peer) {
+       if (wfd_manager_mon.connected_peer) {
                g_hash_table_remove_all(wfd_manager_mon.connected_peer);
                g_hash_table_unref(wfd_manager_mon.connected_peer);
                wfd_manager_mon.connected_peer = NULL;
@@ -889,11 +889,11 @@ static inline gboolean __is_connected(GVariant *parameters)
 
 static void __connection_cb(
                const gchar *sender_name,
-        const gchar *object_path,
-        const gchar *interface_name,
-        const gchar *signal_name,
-        GVariant *parameters,
-        gpointer user_data)
+               const gchar *object_path,
+               const gchar *interface_name,
+               const gchar *signal_name,
+               GVariant *parameters,
+               gpointer user_data)
 {
        __INM_FUNC_ENTER__;
 
@@ -913,11 +913,11 @@ static void __connection_cb(
 
 static void __peer_ip_assigned_cb(
                const gchar *sender_name,
-        const gchar *object_path,
-        const gchar *interface_name,
-        const gchar *signal_name,
-        GVariant *parameters,
-        gpointer user_data)
+               const gchar *object_path,
+               const gchar *interface_name,
+               const gchar *signal_name,
+               GVariant *parameters,
+               gpointer user_data)
 {
        wfd_peer_s *peer;
        gchar *peer_mac = NULL;
@@ -951,11 +951,11 @@ static void __peer_ip_assigned_cb(
 
 static void __disconnection_cb(
                const gchar *sender_name,
-        const gchar *object_path,
-        const gchar *interface_name,
-        const gchar *signal_name,
-        GVariant *parameters,
-        gpointer user_data)
+               const gchar *object_path,
+               const gchar *interface_name,
+               const gchar *signal_name,
+               GVariant *parameters,
+               gpointer user_data)
 {
        gint ret = 0;
        gint state = 0;
@@ -963,7 +963,7 @@ static void __disconnection_cb(
        __INM_FUNC_ENTER__;
 
        g_variant_get(parameters, "(ii&s)", &ret, &state, &peer_mac);
-       if(!g_hash_table_remove(wfd_manager_mon.connected_peer, peer_mac)) {
+       if (!g_hash_table_remove(wfd_manager_mon.connected_peer, peer_mac)) {
                INM_LOGI("there's no peer [%s]", peer_mac);
                __INM_FUNC_EXIT__;
                return;