summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon McVittie <simon.mcvittie@collabora.co.uk>2010-09-29 10:55:18 +0100
committerSimon McVittie <simon.mcvittie@collabora.co.uk>2010-09-29 10:55:18 +0100
commit5e8d727e37c31f487bce840c755f66d66fa259d8 (patch)
tree3ae5f233d91521ea52897c20167a55f9c6336b04
parent760fe45393bda94cebc9192595e34eed906a3d89 (diff)
downloadtelepathy-mission-control-5e8d727e37c31f487bce840c755f66d66fa259d8.tar.gz
fd.o #30447: don't use "return x()", where x returns void, in void functions
Solaris CC doesn't allow this. [In fact, neither does ISO C99 --smcv] Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk> Bug: https://bugs.freedesktop.org/show_bug.cgi?id=30447
-rw-r--r--mission-control-plugins/account.c2
-rw-r--r--src/mcd-account.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/mission-control-plugins/account.c b/mission-control-plugins/account.c
index a52dcee9..721bfb55 100644
--- a/mission-control-plugins/account.c
+++ b/mission-control-plugins/account.c
@@ -149,7 +149,7 @@ mcp_account_manager_parameter_make_secret (const McpAccountManager *mcpa,
g_return_if_fail (iface->make_secret != NULL);
g_debug ("%s.%s should be secret", account, key);
- return iface->make_secret (mcpa, account, key);
+ iface->make_secret (mcpa, account, key);
}
/**
diff --git a/src/mcd-account.c b/src/mcd-account.c
index 74af7280..0a7f3efc 100644
--- a/src/mcd-account.c
+++ b/src/mcd-account.c
@@ -1864,7 +1864,7 @@ void
mcd_account_delete (McdAccount *account, McdAccountDeleteCb callback,
gpointer user_data)
{
- return MCD_ACCOUNT_GET_CLASS (account)->delete (account, callback, user_data);
+ MCD_ACCOUNT_GET_CLASS (account)->delete (account, callback, user_data);
}
typedef struct