diff options
| author | Kjartan Maraas <kmaraas@gnome.org> | 2011-03-17 19:01:17 +0100 |
|---|---|---|
| committer | Tomas Bzatek <tbzatek@redhat.com> | 2011-03-17 19:01:17 +0100 |
| commit | 08120de3bdf768ed6d1a935ce05b64f9ddecadc0 (patch) | |
| tree | bff58f236ff267fe21c377f488f11ea08544c0c9 /common | |
| parent | cdc5849ea5067573a278c7d5f1a21c14c5b0686a (diff) | |
Cleanups and fixes for compiler warnings
https://bugzilla.gnome.org/show_bug.cgi?id=641856
Diffstat (limited to 'common')
| -rw-r--r-- | common/gsysutils.c | 4 | ||||
| -rw-r--r-- | common/gvfsdbusutils.c | 3 |
2 files changed, 2 insertions, 5 deletions
diff --git a/common/gsysutils.c b/common/gsysutils.c index 9dd8afa4..6c056ab2 100644 --- a/common/gsysutils.c +++ b/common/gsysutils.c @@ -89,7 +89,7 @@ _g_socket_receive_fd (int socket_fd) iov[0].iov_base = buf; iov[0].iov_len = 1; - msg.msg_name = 0; + msg.msg_name = NULL; msg.msg_namelen = 0; msg.msg_iov = iov; msg.msg_iovlen = 1; @@ -165,7 +165,7 @@ _g_socket_connect (const char *address, strncpy (addr.sun_path, path, path_len); } - if (connect (fd, (struct sockaddr*) &addr, G_STRUCT_OFFSET (struct sockaddr_un, sun_path) + path_len) < 0) + if (connect (fd, (const struct sockaddr*) &addr, G_STRUCT_OFFSET (struct sockaddr_un, sun_path) + path_len) < 0) { int errsv = errno; diff --git a/common/gvfsdbusutils.c b/common/gvfsdbusutils.c index 9945ba81..1b735cde 100644 --- a/common/gvfsdbusutils.c +++ b/common/gvfsdbusutils.c @@ -289,13 +289,10 @@ _g_dbus_message_append_args_valist (DBusMessage *message, int first_arg_type, va_list var_args) { - int type; DBusMessageIter iter; g_return_if_fail (message != NULL); - type = first_arg_type; - dbus_message_iter_init_append (message, &iter); _g_dbus_message_iter_append_args_valist (&iter, |