_dbus_address_test (void)
{
DBusAddressEntry **entries;
- int len;
- DBusError error;
+ int len;
+ DBusError error = DBUS_ERROR_INIT;
int i;
- dbus_error_init (&error);
-
i = 0;
while (i < _DBUS_N_ELEMENTS (escape_tests))
{
_dbus_auth_script_run (const DBusString *filename)
{
DBusString file;
- DBusError error;
+ DBusError error = DBUS_ERROR_INIT;
DBusString line;
dbus_bool_t retval;
int line_no;
return FALSE;
}
- dbus_error_init (&error);
if (!_dbus_file_get_contents (&file, filename, &error)) {
_dbus_warn ("Getting contents of %s failed: %s\n",
_dbus_string_get_const_data (filename), error.message);
DBusString filename;
DBusDirIter *dir;
dbus_bool_t retval;
- DBusError error;
+ DBusError error = DBUS_ERROR_INIT;
retval = FALSE;
dir = NULL;
if (!_dbus_string_init (&filename))
_dbus_assert_not_reached ("didn't allocate filename string\n");
- dbus_error_init (&error);
dir = _dbus_directory_open (&test_directory, &error);
if (dir == NULL)
{
{
DBusConnection *connection;
DBusAddressEntry **entries;
- DBusError tmp_error;
- DBusError first_error;
+ DBusError tmp_error = DBUS_ERROR_INIT;
+ DBusError first_error = DBUS_ERROR_INIT;
int len, i;
_DBUS_ASSERT_ERROR_IS_CLEAR (error);
connection = NULL;
- dbus_error_init (&tmp_error);
- dbus_error_init (&first_error);
for (i = 0; i < len; i++)
{
if (shared)
{
char **decomposed_path;
dbus_bool_t retval;
- DBusError error;
+ DBusError error = DBUS_ERROR_INIT;
_dbus_return_val_if_fail (connection != NULL, FALSE);
_dbus_return_val_if_fail (path != NULL, FALSE);
_dbus_return_val_if_fail (path[0] == '/', FALSE);
_dbus_return_val_if_fail (vtable != NULL, FALSE);
- dbus_error_init (&error);
-
if (!_dbus_decompose_path (path, strlen (path), &decomposed_path, NULL))
return FALSE;
{
char **decomposed_path;
dbus_bool_t retval;
- DBusError error;
+ DBusError error = DBUS_ERROR_INIT;
_dbus_return_val_if_fail (connection != NULL, FALSE);
_dbus_return_val_if_fail (path != NULL, FALSE);
_dbus_return_val_if_fail (path[0] == '/', FALSE);
_dbus_return_val_if_fail (vtable != NULL, FALSE);
- dbus_error_init (&error);
-
if (!_dbus_decompose_path (path, strlen (path), &decomposed_path, NULL))
return FALSE;
dbus_bool_t create_if_not_found,
DBusError *error)
{
- DBusError read_error;
-
- dbus_error_init (&read_error);
+ DBusError read_error = DBUS_ERROR_INIT;
if (_dbus_read_uuid_file_without_creating (filename, uuid, &read_error))
return TRUE;
_DBUS_LOCK (machine_uuid);
if (machine_uuid_initialized_generation != _dbus_current_generation)
{
- DBusError error;
- dbus_error_init (&error);
+ DBusError error = DBUS_ERROR_INIT;
+
if (!_dbus_read_local_machine_uuid (&machine_uuid, FALSE,
&error))
{
n_timeouts = 0;
while (n_timeouts < MAX_LOCK_TIMEOUTS)
{
- DBusError error;
+ DBusError error = DBUS_ERROR_INIT;
- dbus_error_init (&error);
if (_dbus_create_file_exclusively (&keyring->filename_lock,
&error))
break;
if (n_timeouts == MAX_LOCK_TIMEOUTS)
{
- DBusError error;
-
+ DBusError error = DBUS_ERROR_INIT;
+
_dbus_verbose ("Lock file timed out %d times, assuming stale\n",
n_timeouts);
- dbus_error_init (&error);
-
if (!_dbus_delete_file (&keyring->filename_lock, &error))
{
_dbus_verbose ("Couldn't delete old lock file: %s\n",
static void
_dbus_keyring_unlock (DBusKeyring *keyring)
{
- DBusError error;
- dbus_error_init (&error);
+ DBusError error = DBUS_ERROR_INIT;
+
if (!_dbus_delete_file (&keyring->filename_lock, &error))
{
_dbus_warn ("Failed to delete lock file: %s\n",
DBusString *data)
{
dbus_bool_t retval;
- DBusError error;
-
+ DBusError error = DBUS_ERROR_INIT;
+
retval = FALSE;
_dbus_verbose ("Loading raw %s\n", _dbus_string_get_const_data (filename));
- dbus_error_init (&error);
if (!_dbus_file_get_contents (data, filename, &error))
{
_dbus_warn ("Could not load message file %s: %s\n",
DBusString filename;
DBusDirIter *dir;
dbus_bool_t retval;
- DBusError error;
+ DBusError error = DBUS_ERROR_INIT;
retval = FALSE;
dir = NULL;
if (!_dbus_string_init (&filename))
_dbus_assert_not_reached ("didn't allocate filename string\n");
- dbus_error_init (&error);
dir = _dbus_directory_open (&test_directory, &error);
if (dir == NULL)
{
verify_test_message (DBusMessage *message)
{
DBusMessageIter iter;
- DBusError error;
+ DBusError error = DBUS_ERROR_INIT;
dbus_int16_t our_int16;
dbus_uint16_t our_uint16;
dbus_int32_t our_int;
dbus_message_iter_init (message, &iter);
- dbus_error_init (&error);
if (!dbus_message_iter_get_args (&iter, &error,
DBUS_TYPE_INT16, &our_int16,
DBUS_TYPE_UINT16, &our_uint16,
/* Marshal and demarshal the message. */
DBusMessage *message2;
- DBusError error;
+ DBusError error = DBUS_ERROR_INIT;
char *marshalled = NULL;
int len = 0;
- dbus_error_init (&error);
-
if (!dbus_message_marshal (message, &marshalled, &len))
_dbus_assert_not_reached ("failed to marshal message");
DBusServer *server;
DBusAddressEntry **entries;
int len, i;
- DBusError first_connect_error;
+ DBusError first_connect_error = DBUS_ERROR_INIT;
dbus_bool_t handled_once;
_dbus_return_val_if_fail (address != NULL, NULL);
return NULL;
server = NULL;
- dbus_error_init (&first_connect_error);
handled_once = FALSE;
-
+
for (i = 0; i < len; i++)
{
int j;
for (j = 0; j < (int) _DBUS_N_ELEMENTS (listen_funcs); ++j)
{
DBusServerListenResult result;
- DBusError tmp_error;
-
- dbus_error_init (&tmp_error);
+ DBusError tmp_error = DBUS_ERROR_INIT;
+
result = (* listen_funcs[j].func) (entries[i],
&server,
&tmp_error);
for (i = 0; i < _DBUS_N_ELEMENTS (valid_addresses); i++)
{
- DBusError error;
+ DBusError error = DBUS_ERROR_INIT;
char *address;
char *id;
-
- dbus_error_init (&error);
+
server = dbus_server_listen (valid_addresses[i], &error);
if (server == NULL)
{
int line_no;
dbus_bool_t retval;
int success_count;
- DBusError error;
-
+ DBusError error = DBUS_ERROR_INIT;
+
retval = FALSE;
if (!_dbus_string_init (&tests_file))
if (!_dbus_concat_dir_and_file (&results_file, &tmp))
_dbus_assert_not_reached ("no memory");
- dbus_error_init (&error);
if (!_dbus_file_get_contents (&tests, &tests_file, &error))
{
fprintf (stderr, "could not load test data file %s: %s\n",
check_spawn_nonexistent (void *data)
{
char *argv[4] = { NULL, NULL, NULL, NULL };
- DBusBabysitter *sitter;
- DBusError error;
-
- sitter = NULL;
-
- dbus_error_init (&error);
+ DBusBabysitter *sitter = NULL;
+ DBusError error = DBUS_ERROR_INIT;
/*** Test launching nonexistent binary */
check_spawn_segfault (void *data)
{
char *argv[4] = { NULL, NULL, NULL, NULL };
- DBusBabysitter *sitter;
- DBusError error;
-
- sitter = NULL;
-
- dbus_error_init (&error);
+ DBusBabysitter *sitter = NULL;
+ DBusError error = DBUS_ERROR_INIT;
/*** Test launching segfault binary */
check_spawn_exit (void *data)
{
char *argv[4] = { NULL, NULL, NULL, NULL };
- DBusBabysitter *sitter;
- DBusError error;
-
- sitter = NULL;
-
- dbus_error_init (&error);
+ DBusBabysitter *sitter = NULL;
+ DBusError error = DBUS_ERROR_INIT;
/*** Test launching exit failure binary */
check_spawn_and_kill (void *data)
{
char *argv[4] = { NULL, NULL, NULL, NULL };
- DBusBabysitter *sitter;
- DBusError error;
-
- sitter = NULL;
-
- dbus_error_init (&error);
+ DBusBabysitter *sitter = NULL;
+ DBusError error = DBUS_ERROR_INIT;
/*** Test launching sleeping binary then killing it */
{
int what;
int got;
- DBusError error;
+ DBusError error = DBUS_ERROR_INIT;
ReadStatus r;
-
- dbus_error_init (&error);
-
+
r = read_ints (fd, &what, 1, &got, &error);
switch (r)
check_spawn_nonexistent (void *data)
{
char *argv[4] = { NULL, NULL, NULL, NULL };
- DBusBabysitter *sitter;
- DBusError error;
-
- sitter = NULL;
-
- dbus_error_init (&error);
+ DBusBabysitter *sitter = NULL;
+ DBusError error = DBUS_ERROR_INIT;
/*** Test launching nonexistent binary */
check_spawn_segfault (void *data)
{
char *argv[4] = { NULL, NULL, NULL, NULL };
- DBusBabysitter *sitter;
- DBusError error;
-
- sitter = NULL;
-
- dbus_error_init (&error);
+ DBusBabysitter *sitter = NULL;
+ DBusError error = DBUS_ERROR_INIT;
/*** Test launching segfault binary */
check_spawn_exit (void *data)
{
char *argv[4] = { NULL, NULL, NULL, NULL };
- DBusBabysitter *sitter;
- DBusError error;
-
- sitter = NULL;
-
- dbus_error_init (&error);
+ DBusBabysitter *sitter = NULL;
+ DBusError error = DBUS_ERROR_INIT;
/*** Test launching exit failure binary */
check_spawn_and_kill (void *data)
{
char *argv[4] = { NULL, NULL, NULL, NULL };
- DBusBabysitter *sitter;
- DBusError error;
-
- sitter = NULL;
-
- dbus_error_init (&error);
+ DBusBabysitter *sitter = NULL;
+ DBusError error = DBUS_ERROR_INIT;
/*** Test launching sleeping binary then killing it */
_dbus_win_warn_win_error (const char *message,
int code)
{
- DBusError error;
+ DBusError error = DBUS_ERROR_INIT;
- dbus_error_init (&error);
_dbus_win_set_error_from_win_error (&error, code);
_dbus_warn ("%s: %s\n", message, error.message);
dbus_error_free (&error);
dbus_bool_t do_writing)
{
DBusTransportSocket *socket_transport = (DBusTransportSocket*) transport;
- DBusError error;
+ DBusError error = DBUS_ERROR_INIT;
_dbus_verbose ("exchange_credentials: do_reading = %d, do_writing = %d\n",
do_reading, do_writing);
- dbus_error_init (&error);
if (do_writing && transport->send_credentials_pending)
{
if (_dbus_send_credentials_socket (socket_transport->fd,
const char *expected_guid_orig;
char *expected_guid;
int i;
- DBusError tmp_error;
-
+ DBusError tmp_error = DBUS_ERROR_INIT;
+
_DBUS_ASSERT_ERROR_IS_CLEAR (error);
transport = NULL;
return NULL;
}
- dbus_error_init (&tmp_error);
for (i = 0; i < (int) _DBUS_N_ELEMENTS (open_funcs); ++i)
{
DBusTransportOpenResult result;
if (system_db == NULL)
{
- DBusError error;
+ DBusError error = DBUS_ERROR_INIT;
const DBusUserInfo *info;
system_db = _dbus_user_database_new ();
if (system_db == NULL)
return FALSE;
- dbus_error_init (&error);
-
if (!_dbus_user_database_get_uid (system_db,
_dbus_getuid (),
&info,