diff options
| author | Jaehyun Kim <jeik01.kim@samsung.com> | 2019-10-08 01:22:58 +0000 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@review.ap-northeast-2.compute.internal> | 2019-10-08 01:22:58 +0000 |
| commit | 7faed0b1146d8ac6f637420e360193f1796ad598 (patch) | |
| tree | 798afac374a4ef8486fda7e9bc8fb5a88e1e14dc | |
| parent | a0f324b387847f5b13b59ace15de5ecb48f25e1a (diff) | |
| parent | 2367010ab69cc69e609ab275541838be289f531f (diff) | |
| download | connman-7faed0b1146d8ac6f637420e360193f1796ad598.tar.gz connman-7faed0b1146d8ac6f637420e360193f1796ad598.tar.bz2 connman-7faed0b1146d8ac6f637420e360193f1796ad598.zip | |
Merge "Remove unwanted NULL check for service in append_properties()" into tizen
| -rw-r--r-- | packaging/connman.spec | 2 | ||||
| -rw-r--r-- | src/service.c | 12 |
2 files changed, 6 insertions, 8 deletions
diff --git a/packaging/connman.spec b/packaging/connman.spec index a2774df4..f4fa2a99 100644 --- a/packaging/connman.spec +++ b/packaging/connman.spec @@ -5,7 +5,7 @@ Name: connman Version: 1.37 -Release: 34 +Release: 35 License: GPL-2.0+ Summary: Connection Manager Url: http://connman.net diff --git a/src/service.c b/src/service.c index 34de494a..966417f9 100644 --- a/src/service.c +++ b/src/service.c @@ -3446,18 +3446,16 @@ static void append_properties(DBusMessageIter *dict, dbus_bool_t limited, #if defined TIZEN_EXT unsigned int frequency = 0U; - if (service && service->network) { - frequency = connman_network_get_frequency(service->network); - connman_dbus_dict_append_basic(dict, "Frequency", - DBUS_TYPE_UINT16, &frequency); - } - unsigned char *wifi_vsie; unsigned int wifi_vsie_len; GSList *vsie_list = NULL; - if (service->network) + if (service->network) { + frequency = connman_network_get_frequency(service->network); + connman_dbus_dict_append_basic(dict, "Frequency", + DBUS_TYPE_UINT16, &frequency); vsie_list = (GSList *)connman_network_get_vsie_list(service->network); + } if (vsie_list) { GSList *list; |