+2006-08-14 John (J5) Palmieri <johnp@redhat.com>
+
+ Patches by Kjartan Maraas <kmaraas at gnome dot org>
+
+ * bus/services.c (bus_service_list_queued_owners):
+ Add a pointer cast to fix compiler warning
+
+ * dbus/dbus-dataslot.c (_dbus_data_slot_list_get):
+ return a NULL instead of FALSE since the return type
+ is not expecting a boolean
+
+ * dbus/dbus-marshal-basic.c (_dbus_marshal_test):
+ Remove unused variable
+
+ * dbus/dbus-marshal-recursive-util.c (node_new):
+ return a NULL instead of FALSE since the return type
+ is not expecting a boolean
+
+ * dbus/dbus-server-debug-pipe.c (_dbus_transport_debug_pipe_new):
+ Send a NULL into _dbus_transport_new_for_fd instead of a FALSE
+ because we are expecting a pointer not a boolean
+
+ * dbus/dbus-sysdeps-util.c (_dbus_get_tmpdir):
+ add void as the parameter so some compilers
+ don't complain
+
+ * dbus/dbus-transport-unix.c (_dbus_transport_new_for_domain_socket,
+ _dbus_transport_new_for_tcp_socket):
+ Send a NULL into _dbus_transport_new_for_fd instead of a FALSE
+ because we are expecting a pointer not a boolean
+
+ * test/shell-test.c (test_command_line):
+ cast the second argument to _dbus_list_append to avoid compiler
+ warnings
+
+ * test/test-names.c (main): remove unused variable
+
+ * test/test-service.c (check_hello_from_self_reply):
+ Initialize echo_message and echo_reply to NULL
+
+ * test/test-shell-service.c (handle_echo):
+ Remove unused variable and cast the third parameter passed to
+ dbus_connection_get_object_path_data to avoid compiler warrnings
+
+ * test/name-test/test-names.c (clear_message_queue):
+ Remove unused function
+
+ * test/name-test/test-pending-call-dispatch.c:
+ Fix format string in printf
+
+
2006-08-14 John (J5) Palmieri <johnp@redhat.com>
* dbus/dbus-bus.c:
owner = (BusOwner *) link->data;
uname = bus_connection_get_name (owner->conn);
- if (!_dbus_list_append (return_list, uname))
+ if (!_dbus_list_append (return_list, (char *)uname))
goto oom;
link = _dbus_list_get_next_link (&service->owners, link);
* are disabled, since then the asserts are empty.
*/
if (!_dbus_mutex_lock (allocator->lock))
- return FALSE;
+ return NULL;
_dbus_assert (slot >= 0);
_dbus_assert (slot < allocator->n_allocated_slots);
_dbus_assert (allocator->allocated_slots[slot].slot_id == slot);
dbus_uint16_t *v_ARRAY_UINT16;
dbus_int32_t *v_ARRAY_INT32;
dbus_uint32_t *v_ARRAY_UINT32;
- double *v_ARRAY_DOUBLE;
DBusString t;
double v_DOUBLE;
double t_DOUBLE;
if (!(* klass->construct) (node))
{
dbus_free (node);
- return FALSE;
+ return NULL;
}
}
_dbus_fd_set_close_on_exec (server_fd);
client_transport = _dbus_transport_new_for_fd (client_fd,
- FALSE, &address);
+ NULL, &address);
if (client_transport == NULL)
{
_dbus_close (client_fd, NULL);
act.sa_handler = handler;
act.sa_mask = empty_mask;
act.sa_flags = 0;
- sigaction (sig, &act, 0);
+ sigaction (sig, &act, NULL);
}
* @returns char* - location of temp directory
*/
char*
-_dbus_get_tmpdir()
+_dbus_get_tmpdir(void)
{
char* tmpdir;
dbus_bool_t _dbus_file_exists (const char *file);
dbus_bool_t _dbus_user_at_console (const char *username,
DBusError *error);
-char* _dbus_get_tmpdir();
+char* _dbus_get_tmpdir(void);
/* Define DBUS_VA_COPY() to do the right thing for copying va_list variables.
* config.h may have already defined DBUS_VA_COPY as va_copy or __va_copy.
_dbus_verbose ("Successfully connected to unix socket %s\n",
path);
- transport = _dbus_transport_new_for_fd (fd, FALSE, &address);
+ transport = _dbus_transport_new_for_fd (fd, NULL, &address);
if (transport == NULL)
{
dbus_set_error (error, DBUS_ERROR_NO_MEMORY, NULL);
_dbus_verbose ("Successfully connected to tcp socket %s:%d\n",
host, port);
- transport = _dbus_transport_new_for_fd (fd, FALSE, &address);
+ transport = _dbus_transport_new_for_fd (fd, NULL, &address);
if (transport == NULL)
{
dbus_set_error (error, DBUS_ERROR_NO_MEMORY, NULL);
return FALSE;
}
-static void
-clear_message_queue (DBusConnection *conn)
-{
- int tries;
- DBusMessage *msg;
-
- for (tries = 0; tries < NUM_TRIES_TIL_FAIL; tries++)
- {
- _dbus_connection_lock (conn);
- _dbus_connection_do_iteration_unlocked (conn,
- DBUS_ITERATION_DO_READING |
- DBUS_ITERATION_DO_WRITING |
- DBUS_ITERATION_BLOCK,
- 0);
- _dbus_connection_unlock (conn);
- msg = dbus_connection_pop_message (conn);
- }
-}
-
static dbus_bool_t
match_acquired_or_lost_signal (DBusConnection *conn, const char *member, const char *name)
{
/* we just care about seconds */
delta = end_tv_sec - start_tv_sec;
- printf ("Iter %i: %is\n", i, delta);
+ printf ("Iter %i: %lis\n", i, delta);
if (delta >= 5)
{
printf ("Failed: looks like we might have been be stuck in poll ***\n");
DBusError error;
va_start (var_args, arg1);
- _dbus_list_append (&list, arg1);
+ _dbus_list_append (&list, (char *)arg1);
do
{
tmp = va_arg (var_args, char *);
char **argv)
{
DBusError error;
- int result;
DBusConnection *connection;
dbus_error_init (&error);
void *user_data)
{
DBusMessage *reply;
- DBusMessage *echo_message, *echo_reply;
+ DBusMessage *echo_message, *echo_reply = NULL;
DBusError error;
DBusConnection *connection;
DBusMessage *reply;
DBusMessageIter iter;
int i;
- char *s;
EchoData *d;
_dbus_verbose ("sending reply to Echo method\n");
- if (!dbus_connection_get_object_path_data (connection, echo_path, &d))
+ if (!dbus_connection_get_object_path_data (connection, echo_path, (void **)&d))
die ("No memory");
projects / thirdparty / dbus.git / commitdiff
