summaryrefslogtreecommitdiff
path: root/liblightdm-gobject
diff options
context:
space:
mode:
authorChristopher James Halse Rogers <christopher.halse.rogers@canonical.com>2014-05-28 22:23:37 +0200
committerChristopher James Halse Rogers <christopher.halse.rogers@canonical.com>2014-05-28 22:23:37 +0200
commit8008fe2d8fa9c71f446022f2c4d7c52e8871a6ca (patch)
tree9e0c12108a47c214185959bd79ab7ca8644b0491 /liblightdm-gobject
parentce1db5cfdf12f6ca15899fe3091023d41414c8ea (diff)
downloadlightdm-8008fe2d8fa9c71f446022f2c4d7c52e8871a6ca.tar.gz
Fix a whole bunch of warnings generated by Clang.
Mostly printf-format-not-literal, which is mostly just paranoia, but also some genuine bugs that I have no idea why GCC doesn't find (like not returning a value from a non-void function)
Diffstat (limited to 'liblightdm-gobject')
-rw-r--r--liblightdm-gobject/greeter.c2
-rw-r--r--liblightdm-gobject/user.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/liblightdm-gobject/greeter.c b/liblightdm-gobject/greeter.c
index 36f7b06c..2875c42d 100644
--- a/liblightdm-gobject/greeter.c
+++ b/liblightdm-gobject/greeter.c
@@ -762,7 +762,7 @@ lightdm_greeter_connect_to_daemon (LightDMGreeter *greeter, GCancellable *cancel
gboolean
lightdm_greeter_connect_to_daemon_finish (LightDMGreeter *greeter, GAsyncResult *result, GError **error)
{
- g_return_if_fail (LIGHTDM_IS_GREETER (greeter));
+ g_return_val_if_fail (LIGHTDM_IS_GREETER (greeter), FALSE);
return REQUEST (result)->complete;
}
diff --git a/liblightdm-gobject/user.c b/liblightdm-gobject/user.c
index 7d54b6d2..50f766b0 100644
--- a/liblightdm-gobject/user.c
+++ b/liblightdm-gobject/user.c
@@ -538,7 +538,7 @@ lightdm_user_get_has_messages (LightDMUser *user)
uid_t
lightdm_user_get_uid (LightDMUser *user)
{
- g_return_val_if_fail (LIGHTDM_IS_USER (user), NULL);
+ g_return_val_if_fail (LIGHTDM_IS_USER (user), (uid_t)-1);
return common_user_get_uid (GET_USER_PRIVATE (user)->common_user);
}