fdo-mirrors/dbus
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/dbus/dbus.git synced 2026-06-07 12:58:19 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'autolaunch-win' into 'master'

Browse source 
Fixes for test-autolaunch-win

See merge request dbus/dbus!363
This commit is contained in:
Ralf Habacker 2022-10-11 18:23:44 +00:00
commit b1bc73e61d
1 changed files with 2 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
test/name-test/test-autolaunch-win.c
View file

@ -34,21 +34,6 @@ static int add_wait_time = 0;
#define oom() _dbus_test_fatal ("Out of memory")
/**
* helper function
*/
#define _dbus_error_set_from_message_with_location(a, b) __dbus_error_set_from_message_with_location (__FILE__, __LINE__, __FUNCTION__, a, b)
static void
__dbus_error_set_from_message_with_location (const char *file, int line, const char *function, DBusError *error, DBusMessage *message)
{
char *str = NULL;
dbus_message_get_args (message, NULL,
DBUS_TYPE_STRING, &str,
DBUS_TYPE_INVALID);
dbus_set_error (error, dbus_message_get_error_name (message), "[%s(%d):%s] %s", file, line, function, str ? str : "");
}
static dbus_bool_t
call_method (DBusConnection *conn,
DBusError *error,
@ -71,17 +56,12 @@ call_method (DBusConnection *conn,
dbus_message_unref (method);
if (reply == NULL)
{
dbus_set_error (error, DBUS_ERROR_FAILED, "Got no reply");
result = FALSE;
goto out;
}
if (dbus_message_get_type (reply) == DBUS_MESSAGE_TYPE_ERROR)
{
_dbus_error_set_from_message_with_location (error, reply);
result = FALSE;
goto out;
}
/* ..._send_with_reply_and_block converts ERROR messages into errors */
_dbus_assert (dbus_message_get_type (reply) != DBUS_MESSAGE_TYPE_ERROR);
result = TRUE;
out: