fix some warnings

Change-Id: Iffc672d09b30447ba714e50d5ab182fd6370078f
Signed-off-by: Paweł Szewczyk <p.szewczyk@samsung.com>

diff --git a/bus/activation.c b/bus/activation.c
index 6378af9..b29cc2d 100644 (file)
--- a/bus/activation.c
+++ b/bus/activation.c
@@ -1784,7 +1784,7 @@ bus_activation_activate_service (BusActivation  *activation,
   char **argv;
   char **envp = NULL;
   int argc;
-  dbus_bool_t retval;
+  dbus_bool_t retval = FALSE;
   dbus_bool_t was_pending_activation;
   DBusString command;
 

diff --git a/bus/dir-watch-inotify.c b/bus/dir-watch-inotify.c
index ce19fdc..a287f0b 100644 (file)
--- a/bus/dir-watch-inotify.c
+++ b/bus/dir-watch-inotify.c
@@ -59,7 +59,9 @@ _handle_inotify_watch (DBusWatch *passed_watch, unsigned int flags, void *data)
 {
   char buffer[INOTIFY_BUF_LEN];
   ssize_t ret = 0;
+#ifdef DBUS_ENABLE_VERBOSE_MODE
   int i = 0;
+#endif
 
   ret = read (inotify_fd, buffer, INOTIFY_BUF_LEN);
   if (ret < 0)

diff --git a/dbus/dbus-marshal-recursive.c b/dbus/dbus-marshal-recursive.c
index a33ae23..183afb4 100644 (file)
--- a/dbus/dbus-marshal-recursive.c
+++ b/dbus/dbus-marshal-recursive.c
@@ -1150,7 +1150,7 @@ void
 _dbus_type_reader_recurse (DBusTypeReader *reader,
                            DBusTypeReader *sub)
 {
-  const DBusTypeReaderClass *klass;
+  const DBusTypeReaderClass *klass = NULL;
   int t;
 
   t = _dbus_first_type_in_signature (reader->type_str, reader->type_pos);

diff --git a/dbus/dbus-message-private.h b/dbus/dbus-message-private.h
index 4d59ff2..801b143 100644 (file)
--- a/dbus/dbus-message-private.h
+++ b/dbus/dbus-message-private.h
@@ -66,7 +66,7 @@ struct DBusMessageLoader
   DBusList *messages;  /**< Complete messages. */
 
   long max_message_size; /**< Maximum size of a message */
-  long max_message_unix_fds; /**< Maximum unix fds in a message */
+  unsigned long max_message_unix_fds; /**< Maximum unix fds in a message */
 
   DBusValidity corruption_reason; /**< why we were corrupted */
 

diff --git a/dbus/dbus-transport.c b/dbus/dbus-transport.c
index 4e1caf2..8b8ee1f 100644 (file)
--- a/dbus/dbus-transport.c
+++ b/dbus/dbus-transport.c
@@ -1202,7 +1202,7 @@ recover_unused_bytes (DBusTransport *transport)
                                    &bytes);
 
       succeeded = TRUE;
-      if (!_dbus_string_copy (bytes, 0, buffer, _dbus_string_get_length (buffer)))
+      if (!_dbus_string_copy (bytes, 0, buffer, orig_len))
         succeeded = FALSE;
       
       _dbus_verbose (" %d unused bytes sent to message loader\n",