luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-09-28 18:16:34 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix up some harmless FALSE <> NULL confusions

Browse Source 
Reported in bug 643134.
This commit is contained in:
Matthias Clasen
2011-04-26 22:51:54 -04:00
parent 440bd2a975
commit 122a53a9bc
2 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gio/gdbusconnection.c
View File

@@ -1992,7 +1992,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_CONNECTION (connection), NULL);
g_return_val_if_fail (G_IS_DBUS_MESSAGE (message), 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 (timeout_msec >= 0 || timeout_msec == -1, NULL);
g_return_val_if_fail (error == NULL || *error == NULL, NULL); g_return_val_if_fail (error == NULL || *error == NULL, NULL);

7
gio/gdbusmessage.c
View File

@@ -3197,8 +3197,8 @@ g_dbus_message_lock (GDBusMessage *message)
* This operation can fail if e.g. @message contains file descriptors * This operation can fail if e.g. @message contains file descriptors
* and the per-process or system-wide open files limit is reached. * 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 * Returns: (transfer full): A new #GDBusMessage or %NULL if @error is set.
* g_object_unref(). * Free with g_object_unref().
* *
* Since: 2.26 * Since: 2.26
*/ */
@@ -3212,7 +3212,7 @@ g_dbus_message_copy (GDBusMessage *message,
GVariant *header_value; GVariant *header_value;
g_return_val_if_fail (G_IS_DBUS_MESSAGE (message), NULL); 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 = g_dbus_message_new ();
ret->type = message->type; ret->type = message->type;
@@ -3255,4 +3255,3 @@ g_dbus_message_copy (GDBusMessage *message,
out: out:
return ret; return ret;
} }