Send connman mailing list submissions to
[email protected]
To subscribe or unsubscribe via the World Wide Web, visit
https://lists.01.org/mailman/listinfo/connman
or, via email, send a message with subject or body 'help' to
[email protected]
You can reach the person managing the list at
[email protected]
When replying, please edit your Subject line so it is more specific
than "Re: Contents of connman digest..."
Today's Topics:
1. [PATCH] p2p: 'scan p2p' causes stop autoscan even after scan
p2p finishes (Vasyl Vavrychuk)
2. [PATCH] consmetics: remove redundant returns at the end of
functions that return void (Vasyl Vavrychuk)
----------------------------------------------------------------------
Message: 1
Date: Tue, 28 Aug 2018 03:04:01 +0300
From: Vasyl Vavrychuk <[email protected]>
To: [email protected], Daniel Wagner <[email protected]>
Subject: [PATCH] p2p: 'scan p2p' causes stop autoscan even after scan
p2p finishes
Message-ID: <[email protected]>
---
plugins/wifi.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/plugins/wifi.c b/plugins/wifi.c
index ef8f435..abc9b8a 100644
--- a/plugins/wifi.c
+++ b/plugins/wifi.c
@@ -1784,7 +1784,7 @@ static gboolean p2p_find_stop(gpointer data)
connman_device_set_scanning(device, CONNMAN_SERVICE_TYPE_P2P, false);
connman_device_unref(device);
- reset_autoscan(device);
+ start_autoscan(device);
return FALSE;
}
--
2.7.4
------------------------------
Message: 2
Date: Tue, 28 Aug 2018 13:03:52 +0300
From: Vasyl Vavrychuk <[email protected]>
To: [email protected], Daniel Wagner <[email protected]>
Subject: [PATCH] consmetics: remove redundant returns at the end of
functions that return void
Message-ID: <[email protected]>
Another purpose of this change is making coded to have a same style.
Previous at some functions there was redundant returns and at some no.
If this returns will be in the end of all void functions it will produce
a lot of noise while reading code.
---
client/commands.c | 6 ------
gdhcp/common.c | 6 ------
gsupplicant/supplicant.c | 1 -
plugins/wifi.c | 2 --
src/config.c | 1 -
src/inet.c | 2 --
src/network.c | 1 -
src/ntp.c | 1 -
src/provider.c | 2 --
src/service.c | 1 -
src/technology.c | 6 ------
src/timeserver.c | 6 ------
12 files changed, 35 deletions(-)
diff --git a/client/commands.c b/client/commands.c
index 05b9316..bf3531f 100644
--- a/client/commands.c
+++ b/client/commands.c
@@ -792,8 +792,6 @@ static void move_before_append_args(DBusMessageIter *iter,
void *user_data)
dbus_message_iter_append_basic(iter,
DBUS_TYPE_OBJECT_PATH, &path);
-
- return;
}
static int cmd_service_move_before(char *args[], int num,
@@ -852,8 +850,6 @@ static void move_after_append_args(DBusMessageIter *iter,
void *user_data)
dbus_message_iter_append_basic(iter,
DBUS_TYPE_OBJECT_PATH, &path);
-
- return;
}
static int cmd_service_move_after(char *args[], int num,
@@ -1930,8 +1926,6 @@ static void session_create_append_dict(DBusMessageIter
*iter, void *user_data)
index += append.values;
}
-
- return;
}
static void session_create_append(DBusMessageIter *iter, void *user_data)
diff --git a/gdhcp/common.c b/gdhcp/common.c
index 27f14dd..8f7a65c 100644
--- a/gdhcp/common.c
+++ b/gdhcp/common.c
@@ -297,8 +297,6 @@ void dhcp_add_option_uint32(struct dhcp_packet *packet,
uint8_t code,
put_be32(data, option + OPT_DATA);
dhcp_add_binary_option(packet, option);
-
- return;
}
void dhcp_add_option_uint16(struct dhcp_packet *packet, uint8_t code,
@@ -314,8 +312,6 @@ void dhcp_add_option_uint16(struct dhcp_packet *packet,
uint8_t code,
put_be16(data, option + OPT_DATA);
dhcp_add_binary_option(packet, option);
-
- return;
}
void dhcp_add_option_uint8(struct dhcp_packet *packet, uint8_t code,
@@ -331,8 +327,6 @@ void dhcp_add_option_uint8(struct dhcp_packet *packet,
uint8_t code,
option[OPT_DATA] = data;
dhcp_add_binary_option(packet, option);
-
- return;
}
void dhcp_init_header(struct dhcp_packet *packet, char type)
diff --git a/gsupplicant/supplicant.c b/gsupplicant/supplicant.c
index 5246c80..0cb621b 100644
--- a/gsupplicant/supplicant.c
+++ b/gsupplicant/supplicant.c
@@ -1501,7 +1501,6 @@ static void interface_network_added(DBusMessageIter
*iter, void *user_data)
static void interface_network_removed(DBusMessageIter *iter, void *user_data)
{
SUPPLICANT_DBG("");
- return;
}
static char *create_name(unsigned char *ssid, int ssid_len)
diff --git a/plugins/wifi.c b/plugins/wifi.c
index ef8f435..1288c15 100644
--- a/plugins/wifi.c
+++ b/plugins/wifi.c
@@ -2732,8 +2732,6 @@ static void ap_create_fail(GSupplicantInterface
*interface)
g_free(wifi->tethering_param);
wifi->tethering_param = NULL;
}
-
- return;
}
static unsigned char calculate_strength(GSupplicantNetwork *supplicant_network)
diff --git a/src/config.c b/src/config.c
index 4178ea8..07ae64e 100644
--- a/src/config.c
+++ b/src/config.c
@@ -1703,7 +1703,6 @@ void connman_config_free_entries(struct
connman_config_entry **entries)
}
g_free(entries);
- return;
}
bool __connman_config_address_provisioned(const char *address,
diff --git a/src/inet.c b/src/inet.c
index f6d9e9a..8337949 100644
--- a/src/inet.c
+++ b/src/inet.c
@@ -2523,8 +2523,6 @@ out:
data->callback(addr, index, data->user_data);
g_free(data);
-
- return;
}
/*
diff --git a/src/network.c b/src/network.c
index dd3f238..47a239c 100644
--- a/src/network.c
+++ b/src/network.c
@@ -844,7 +844,6 @@ static void receive_refresh_rs_reply(struct
nd_router_advert *reply,
network->router_solicit_refresh_count = 0;
connman_network_unref(network);
- return;
}
int __connman_network_refresh_rs_ipv6(struct connman_network *network,
diff --git a/src/ntp.c b/src/ntp.c
index 44320fc..db2ad01 100644
--- a/src/ntp.c
+++ b/src/ntp.c
@@ -580,7 +580,6 @@ err:
close(nd->transmit_fd);
nd->cb(false, nd->user_data);
- return;
}
int __connman_ntp_start(char *server, __connman_ntp_cb_t callback,
diff --git a/src/provider.c b/src/provider.c
index 9c71a20..892d0fb 100644
--- a/src/provider.c
+++ b/src/provider.c
@@ -745,8 +745,6 @@ static void provider_service_changed(struct connman_service
*service,
DBG("disconnect %p index %d", provider, vpn_index);
connman_provider_disconnect(provider);
-
- return;
}
static struct connman_notifier provider_notifier = {
diff --git a/src/service.c b/src/service.c
index 326bfa3..4f11bd9 100644
--- a/src/service.c
+++ b/src/service.c
@@ -4211,7 +4211,6 @@ void __connman_service_set_provider_pending(struct
connman_service *service,
}
service->provider_pending = msg;
- return;
}
static void check_pending_msg(struct connman_service *service)
diff --git a/src/technology.c b/src/technology.c
index f25be12..bd2e06a 100644
--- a/src/technology.c
+++ b/src/technology.c
@@ -196,8 +196,6 @@ done:
__connman_storage_save_global(keyfile);
g_key_file_free(keyfile);
-
- return;
}
static void tethering_changed(struct connman_technology *technology)
@@ -435,8 +433,6 @@ done:
g_free(identifier);
g_key_file_free(keyfile);
-
- return;
}
bool __connman_technology_get_offlinemode(void)
@@ -474,8 +470,6 @@ static void connman_technology_save_offlinemode(void)
}
g_key_file_free(keyfile);
-
- return;
}
static bool connman_technology_load_offlinemode(void)
diff --git a/src/timeserver.c b/src/timeserver.c
index f9467a2..4752aa3 100644
--- a/src/timeserver.c
+++ b/src/timeserver.c
@@ -75,8 +75,6 @@ static void save_timeservers(char **servers)
__connman_storage_save_global(keyfile);
g_key_file_free(keyfile);
-
- return;
}
static char **load_timeservers(void)
@@ -161,8 +159,6 @@ static void timeserver_sync_start(void)
resolv_id = g_resolv_lookup_hostname(resolv, ts_current,
resolv_result, NULL);
-
- return;
}
static gboolean timeserver_sync_restart(gpointer user_data)
@@ -214,8 +210,6 @@ static void sync_next()
resolv_id = g_resolv_lookup_hostname(resolv, ts_current,
resolv_result, NULL);
-
- return;
}
GSList *__connman_timeserver_add_list(GSList *server_list,
--
2.7.4
------------------------------
Subject: Digest Footer
_______________________________________________
connman mailing list
[email protected]
https://lists.01.org/mailman/listinfo/connman
------------------------------
End of connman Digest, Vol 34, Issue 18
***************************************
