[glib/glib-2-28] Fix up some harmless FALSE <> NULL confusions
- From: Matthias Clasen <matthiasc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [glib/glib-2-28] Fix up some harmless FALSE <> NULL confusions
- Date: Sat, 21 May 2011 04:01:22 +0000 (UTC)
commit 486e6d3eb4a2b086ebf539809de8974c54df5028
Author: Matthias Clasen <mclasen redhat com>
Date: Tue Apr 26 22:51:54 2011 -0400
Fix up some harmless FALSE <> NULL confusions
Reported in bug 643134.
gio/gdbusconnection.c | 2 +-
gio/gdbusmessage.c | 7 +++----
2 files changed, 4 insertions(+), 5 deletions(-)
---
diff --git a/gio/gdbusconnection.c b/gio/gdbusconnection.c
index 45cd314..bd4d5d0 100644
--- a/gio/gdbusconnection.c
+++ b/gio/gdbusconnection.c
@@ -1995,7 +1995,7 @@ g_dbus_connection_send_message_with_reply_sync (GDBusConnection *connection,
g_return_val_if_fail (G_IS_DBUS_CONNECTION (connection), NULL);
g_return_val_if_fail (G_IS_DBUS_MESSAGE (message), NULL);
- g_return_val_if_fail ((flags & G_DBUS_SEND_MESSAGE_FLAGS_PRESERVE_SERIAL) || !g_dbus_message_get_locked (message), FALSE);
+ g_return_val_if_fail ((flags & G_DBUS_SEND_MESSAGE_FLAGS_PRESERVE_SERIAL) || !g_dbus_message_get_locked (message), NULL);
g_return_val_if_fail (timeout_msec >= 0 || timeout_msec == -1, NULL);
g_return_val_if_fail (error == NULL || *error == NULL, NULL);
diff --git a/gio/gdbusmessage.c b/gio/gdbusmessage.c
index a7878b0..6819627 100644
--- a/gio/gdbusmessage.c
+++ b/gio/gdbusmessage.c
@@ -3198,8 +3198,8 @@ g_dbus_message_lock (GDBusMessage *message)
* This operation can fail if e.g. @message contains file descriptors
* and the per-process or system-wide open files limit is reached.
*
- * Returns: (transfer full): A new #GDBusMessage or %NULL if @error is set. Free with
- * g_object_unref().
+ * Returns: (transfer full): A new #GDBusMessage or %NULL if @error is set.
+ * Free with g_object_unref().
*
* Since: 2.26
*/
@@ -3213,7 +3213,7 @@ g_dbus_message_copy (GDBusMessage *message,
GVariant *header_value;
g_return_val_if_fail (G_IS_DBUS_MESSAGE (message), NULL);
- g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
+ g_return_val_if_fail (error == NULL || *error == NULL, NULL);
ret = g_dbus_message_new ();
ret->type = message->type;
@@ -3256,4 +3256,3 @@ g_dbus_message_copy (GDBusMessage *message,
out:
return ret;
}
-
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]