Remove unaffected comparison

diff --git a/src/wifi-aware-gdbus.c b/src/wifi-aware-gdbus.c
index 7cb7cbddb723e14811cebfe6b036abc43f4779f2..ce116fd78683500aa9cc657c2d2bd3be4c06f3bf 100644 (file)
--- a/src/wifi-aware-gdbus.c
+++ b/src/wifi-aware-gdbus.c
@@ -269,14 +269,17 @@ static GVariant *__create_publish_request_param(int client_id, wifi_aware_publis
        g_variant_builder_add(builder, "{sv}", "ttl", g_variant_new("q", req->ttl));
        g_variant_builder_add(builder, "{sv}", "publish_type", g_variant_new("y", req->publish_type));
        g_variant_builder_add(builder, "{sv}", "service_name", g_variant_new("s", req->service_name));
-       if (req->specific_info_len > 0 && req->specific_info != NULL) {
-               g_variant_builder_add(builder, "{sv}", "specific_info_len", g_variant_new("q", req->specific_info_len));
-               g_variant_builder_add(builder, "{sv}", "specific_info", __pack_byte_array(req->specific_info, req->specific_info_len));
-       }
-       if (req->match_filter_len > 0 && req->match_filter != NULL) {
-               g_variant_builder_add(builder, "{sv}", "match_filter_len", g_variant_new("q", req->match_filter_len));
-               g_variant_builder_add(builder, "{sv}", "match_filter", __pack_byte_array(req->match_filter, req->match_filter_len));
-       }
+
+       g_variant_builder_add(builder, "{sv}", "specific_info_len", g_variant_new("q", req->specific_info_len));
+       if (req->specific_info_len > 0)
+               g_variant_builder_add(builder, "{sv}", "specific_info",
+                               __pack_byte_array(req->specific_info, req->specific_info_len));
+
+       g_variant_builder_add(builder, "{sv}", "match_filter_len", g_variant_new("q", req->match_filter_len));
+       if (req->match_filter_len > 0)
+               g_variant_builder_add(builder, "{sv}", "match_filter",
+                               __pack_byte_array(req->match_filter, req->match_filter_len));
+
        g_variant_builder_add(builder, "{sv}", "enable_ranging", g_variant_new("b", req->enable_ranging));
 
        params = g_variant_new("(ia{sv})", client_id, builder);
@@ -299,14 +302,17 @@ static GVariant *__create_update_publish_request_param(int client_id,
        g_variant_builder_add(builder, "{sv}", "ttl", g_variant_new("q", req->ttl));
        g_variant_builder_add(builder, "{sv}", "publish_type", g_variant_new("y", req->publish_type));
        g_variant_builder_add(builder, "{sv}", "service_name", g_variant_new("s", req->service_name));
-       if (req->specific_info_len > 0 && req->specific_info != NULL) {
-               g_variant_builder_add(builder, "{sv}", "specific_info_len", g_variant_new("q", req->specific_info_len));
-               g_variant_builder_add(builder, "{sv}", "specific_info", __pack_byte_array(req->specific_info, req->specific_info_len));
-       }
-       if (req->match_filter_len > 0 && req->match_filter != NULL) {
-               g_variant_builder_add(builder, "{sv}", "match_filter_len", g_variant_new("q", req->match_filter_len));
-               g_variant_builder_add(builder, "{sv}", "match_filter", __pack_byte_array(req->match_filter, req->match_filter_len));
-       }
+
+       g_variant_builder_add(builder, "{sv}", "specific_info_len", g_variant_new("q", req->specific_info_len));
+       if (req->specific_info_len > 0)
+               g_variant_builder_add(builder, "{sv}", "specific_info",
+                               __pack_byte_array(req->specific_info, req->specific_info_len));
+
+       g_variant_builder_add(builder, "{sv}", "match_filter_len", g_variant_new("q", req->match_filter_len));
+       if (req->match_filter_len > 0)
+               g_variant_builder_add(builder, "{sv}", "match_filter",
+                               __pack_byte_array(req->match_filter, req->match_filter_len));
+
        g_variant_builder_add(builder, "{sv}", "enable_ranging", g_variant_new("b", req->enable_ranging));
 
        params = g_variant_new("(iqa{sv})", client_id, pub_id, builder);
@@ -323,14 +329,16 @@ static GVariant *__create_subscribe_request_param(int client_id, wifi_aware_subs
        g_variant_builder_add(builder, "{sv}", "ttl", g_variant_new("q", req->ttl));
        g_variant_builder_add(builder, "{sv}", "subscribe_type", g_variant_new("y", req->subscribe_type));
        g_variant_builder_add(builder, "{sv}", "service_name", g_variant_new("s", req->service_name));
-       if (req->specific_info_len > 0 && req->specific_info != NULL) {
-               g_variant_builder_add(builder, "{sv}", "specific_info_len", g_variant_new("q", req->specific_info_len));
-               g_variant_builder_add(builder, "{sv}", "specific_info", __pack_byte_array(req->specific_info, req->specific_info_len));
-       }
-       if (req->match_filter_len > 0 && req->match_filter != NULL) {
-               g_variant_builder_add(builder, "{sv}", "match_filter_len", g_variant_new("q", req->match_filter_len));
-               g_variant_builder_add(builder, "{sv}", "match_filter", __pack_byte_array(req->match_filter, req->match_filter_len));
-       }
+
+       g_variant_builder_add(builder, "{sv}", "specific_info_len", g_variant_new("q", req->specific_info_len));
+       if (req->specific_info_len > 0)
+               g_variant_builder_add(builder, "{sv}", "specific_info",
+                               __pack_byte_array(req->specific_info, req->specific_info_len));
+
+       g_variant_builder_add(builder, "{sv}", "match_filter_len", g_variant_new("q", req->match_filter_len));
+       if (req->match_filter_len > 0)
+               g_variant_builder_add(builder, "{sv}", "match_filter",
+                               __pack_byte_array(req->match_filter, req->match_filter_len));
 
        params = g_variant_new("(ia{sv})", client_id, builder);
        g_variant_builder_unref(builder);
@@ -352,14 +360,16 @@ static GVariant *__create_update_subscribe_request_param(int client_id,
        g_variant_builder_add(builder, "{sv}", "ttl", g_variant_new("q", req->ttl));
        g_variant_builder_add(builder, "{sv}", "subscribe_type", g_variant_new("y", req->subscribe_type));
        g_variant_builder_add(builder, "{sv}", "service_name", g_variant_new("s", req->service_name));
-       if (req->specific_info_len > 0 && req->specific_info != NULL) {
-               g_variant_builder_add(builder, "{sv}", "specific_info_len", g_variant_new("q", req->specific_info_len));
-               g_variant_builder_add(builder, "{sv}", "specific_info", __pack_byte_array(req->specific_info, req->specific_info_len));
-       }
-       if (req->match_filter_len > 0 && req->match_filter != NULL) {
-               g_variant_builder_add(builder, "{sv}", "match_filter_len", g_variant_new("q", req->match_filter_len));
-               g_variant_builder_add(builder, "{sv}", "match_filter", __pack_byte_array(req->match_filter, req->match_filter_len));
-       }
+
+       g_variant_builder_add(builder, "{sv}", "specific_info_len", g_variant_new("q", req->specific_info_len));
+       if (req->specific_info_len > 0)
+               g_variant_builder_add(builder, "{sv}", "specific_info",
+                               __pack_byte_array(req->specific_info, req->specific_info_len));
+
+       g_variant_builder_add(builder, "{sv}", "match_filter_len", g_variant_new("q", req->match_filter_len));
+       if (req->match_filter_len > 0)
+               g_variant_builder_add(builder, "{sv}", "match_filter",
+                               __pack_byte_array(req->match_filter, req->match_filter_len));
 
        params = g_variant_new("(iqa{sv})", client_id, sub_id, builder);
        g_variant_builder_unref(builder);

diff --git a/test/wifi-aware-test.c b/test/wifi-aware-test.c
index fa2815ad48a88d806de7fa331c341ec8e843b92b..d3cd5af2edb8c345f219f4abef5b0c76e42b9fca 100644 (file)
--- a/test/wifi-aware-test.c
+++ b/test/wifi-aware-test.c
@@ -490,13 +490,13 @@ static void __set_publish_config(wifi_aware_publish_h publish)
        printf("Do you set Match Filter(0-No, 1-Yes): ");
        ret = scanf("%d", &set_mf);
        if (set_mf == 1) {
-               len = __set_match_filter(match_filter);
-               if (len < 0 || len >= MAX_MATCH_FILTER_LEN) {
+               int n = __set_match_filter(match_filter);
+               if (n < 0 || n >= MAX_MATCH_FILTER_LEN) {
                        printf("Not set match filter\n");
                        return;
                }
-               __print_match_filter(match_filter, len);
-               ret = wifi_aware_publish_set_match_filter(publish, match_filter, len);
+               __print_match_filter(match_filter, n);
+               ret = wifi_aware_publish_set_match_filter(publish, match_filter, n);
                if (ret != WIFI_AWARE_ERROR_NONE)
                        return;
        }
@@ -700,12 +700,12 @@ static void __set_subscribe_config(wifi_aware_subscribe_h subscribe)
        printf("Do you set Match Filter(0-No, 1-Yes): ");
        ret = scanf("%d", &set_mf);
        if (set_mf == 1) {
-               len = __set_match_filter(match_filter);
-               if (len < 0 || len >= MAX_MATCH_FILTER_LEN) {
+               int n = __set_match_filter(match_filter);
+               if (n < 0 || n >= MAX_MATCH_FILTER_LEN) {
                        printf("Not set match filter\n");
                        return;
                }
-               ret = wifi_aware_subscribe_set_match_filter(subscribe, match_filter, len);
+               ret = wifi_aware_subscribe_set_match_filter(subscribe, match_filter, n);
                if (ret != WIFI_AWARE_ERROR_NONE)
                        return;
        }