[telepathy-idle/master] Don't explicitly return void in void functions.
elaine
elaine.xiong at sun.com
Sat Aug 29 07:12:08 PDT 2009
Sun's C compiler doesn't support this. This is a slightly modified
version of the patch on fd.o #22958, removing redundant returns at the
end of functions.
Signed-off-by: Will Thompson <will.thompson at collabora.co.uk>
---
src/idle-connection.c | 2 +-
src/idle-muc-channel.c | 8 ++++----
src/idle-parser.c | 3 ++-
src/idle-ssl-server-connection.c | 32 +++++++++++++++++++++-----------
4 files changed, 28 insertions(+), 17 deletions(-)
diff --git a/src/idle-connection.c b/src/idle-connection.c
index 10613b4..e5ee62a 100644
--- a/src/idle-connection.c
+++ b/src/idle-connection.c
@@ -743,7 +743,7 @@ static void _send_with_priority(IdleConnection *conn, const gchar *msg, guint pr
}
void idle_connection_send(IdleConnection *conn, const gchar *msg) {
- return _send_with_priority(conn, msg, SERVER_CMD_NORMAL_PRIORITY);
+ _send_with_priority(conn, msg, SERVER_CMD_NORMAL_PRIORITY);
}
gsize
diff --git a/src/idle-muc-channel.c b/src/idle-muc-channel.c
index 02cc1e2..e85274d 100644
--- a/src/idle-muc-channel.c
+++ b/src/idle-muc-channel.c
@@ -962,15 +962,15 @@ static void _network_member_left(IdleMUCChannel *chan, TpHandle leaver, TpHandle
}
void idle_muc_channel_part(IdleMUCChannel *chan, TpHandle leaver, const gchar *message) {
- return _network_member_left(chan, leaver, leaver, message, TP_CHANNEL_GROUP_CHANGE_REASON_NONE);
+ _network_member_left(chan, leaver, leaver, message, TP_CHANNEL_GROUP_CHANGE_REASON_NONE);
}
void idle_muc_channel_kick(IdleMUCChannel *chan, TpHandle kicked, TpHandle kicker, const gchar *message) {
- return _network_member_left(chan, kicked, kicker, message, TP_CHANNEL_GROUP_CHANGE_REASON_KICKED);
+ _network_member_left(chan, kicked, kicker, message, TP_CHANNEL_GROUP_CHANGE_REASON_KICKED);
}
void idle_muc_channel_quit(IdleMUCChannel *chan, TpHandle quitter, const gchar *message) {
- return _network_member_left(chan, quitter, quitter, message, TP_CHANNEL_GROUP_CHANGE_REASON_OFFLINE);
+ _network_member_left(chan, quitter, quitter, message, TP_CHANNEL_GROUP_CHANGE_REASON_OFFLINE);
}
void idle_muc_channel_invited(IdleMUCChannel *chan, TpHandle inviter) {
@@ -1409,7 +1409,7 @@ static void send_join_request(IdleMUCChannel *obj, const gchar *password) {
}
void idle_muc_channel_join_attempt(IdleMUCChannel *obj) {
- return send_join_request(obj, NULL);
+ send_join_request(obj, NULL);
}
static gboolean send_invite_request(IdleMUCChannel *obj, TpHandle handle, GError **error) {
diff --git a/src/idle-parser.c b/src/idle-parser.c
index 93c330d..684686c 100644
--- a/src/idle-parser.c
+++ b/src/idle-parser.c
@@ -242,7 +242,8 @@ void idle_parser_receive(IdleParser *parser, const gchar *msg) {
}
void idle_parser_add_handler(IdleParser *parser, IdleParserMessageCode code, IdleParserMessageHandler handler, gpointer user_data) {
- return idle_parser_add_handler_with_priority(parser, code, handler, user_data, IDLE_PARSER_HANDLER_PRIORITY_DEFAULT);
+ idle_parser_add_handler_with_priority(parser, code, handler, user_data, IDLE_PARSER_HANDLER_PRIORITY_DEFAULT);
+ return;
}
static gint _message_handler_closure_priority_compare(gconstpointer a, gconstpointer b) {
diff --git a/src/idle-ssl-server-connection.c b/src/idle-ssl-server-connection.c
index c3ab01b..e8af32c 100644
--- a/src/idle-ssl-server-connection.c
+++ b/src/idle-ssl-server-connection.c
@@ -350,8 +350,10 @@ static void ssl_async_connecting_finished_cb(IdleSSLServerConnection *conn, gboo
int status;
int opt;
- if (!success)
- return ssl_conn_change_state(conn, SERVER_CONNECTION_STATE_NOT_CONNECTED, SERVER_CONNECTION_STATE_REASON_ERROR);
+ if (!success) {
+ ssl_conn_change_state(conn, SERVER_CONNECTION_STATE_NOT_CONNECTED, SERVER_CONNECTION_STATE_REASON_ERROR);
+ return;
+ }
priv->io_chan = priv->connect_data->io_chan;
priv->connect_data->io_chan = NULL;
@@ -377,35 +379,40 @@ static void ssl_async_connecting_finished_cb(IdleSSLServerConnection *conn, gboo
if (!ctx) {
IDLE_DEBUG("failed to get SSL context object");
- return ssl_async_connecting_finished_cb(conn, FALSE);
+ ssl_async_connecting_finished_cb(conn, FALSE);
+ return;
}
priv->ssl = SSL_new(ctx);
if (!priv->ssl) {
IDLE_DEBUG("failed to create SSL object");
- return ssl_async_connecting_finished_cb(conn, FALSE);
+ ssl_async_connecting_finished_cb(conn, FALSE);
+ return;
}
status = SSL_set_fd(priv->ssl, fd);
if (!status) {
IDLE_DEBUG("failed to set SSL socket");
- return ssl_async_connecting_finished_cb(conn, FALSE);
+ ssl_async_connecting_finished_cb(conn, FALSE);
+ return;
}
status = SSL_connect(priv->ssl);
if (status <= 0) {
IDLE_DEBUG("SSL_connect failed with status %i (error %i)", status, SSL_get_error(priv->ssl, status));
- return ssl_async_connecting_finished_cb(conn, FALSE);
+ ssl_async_connecting_finished_cb(conn, FALSE);
+ return;
}
cert = SSL_get_peer_certificate(priv->ssl);
if (!cert) {
IDLE_DEBUG("failed to get SSL peer certificate");
- return ssl_async_connecting_finished_cb(conn, FALSE);
+ ssl_async_connecting_finished_cb(conn, FALSE);
+ return;
}
/* TODO sometime in the future implement certificate verification */
@@ -459,7 +466,8 @@ static void ssl_do_connect(AsyncConnectData *data) {
if (fd == -1) {
IDLE_DEBUG("failed: %s", g_strerror(errno));
- return data->finished_cb(data->conn, FALSE);
+ data->finished_cb(data->conn, FALSE);
+ return;
}
rc = fcntl(fd, F_SETFL, O_NONBLOCK);
@@ -467,7 +475,8 @@ static void ssl_do_connect(AsyncConnectData *data) {
if (rc != 0) {
IDLE_DEBUG("failed to set socket to non-blocking mode: %s", g_strerror(errno));
close(fd);
- return data->finished_cb(data->conn, FALSE);
+ data->finished_cb(data->conn, FALSE);
+ return;
}
rc = connect(fd, data->cur->ai_addr, data->cur->ai_addrlen);
@@ -475,7 +484,8 @@ static void ssl_do_connect(AsyncConnectData *data) {
if ((errno != EINPROGRESS) && (rc == -1)) {
IDLE_DEBUG("connect() failed: %s", g_strerror(errno));
close(fd);
- return data->finished_cb(data->conn, FALSE);
+ data->finished_cb(data->conn, FALSE);
+ return;
}
io_chan = g_io_channel_unix_new(fd);
@@ -502,7 +512,7 @@ static void ssl_dns_result_cb(guint unused, IdleDNSResult *results, gpointer use
data->cur = results;
data->finished_cb = ssl_async_connecting_finished_cb;
- return ssl_do_connect(data);
+ ssl_do_connect(data);
}
static gboolean iface_ssl_connect_impl(IdleServerConnectionIface *iface, GError **error) {
--
1.5.6.5
More information about the telepathy-commits
mailing list