Fix clang reports.
authorenglebass <englebass@7cbeb6ba-43b4-40fd-8cce-4c39aea84d33>
Tue, 23 Dec 2008 20:37:37 +0000 (20:37 +0000)
committerenglebass <englebass@7cbeb6ba-43b4-40fd-8cce-4c39aea84d33>
Tue, 23 Dec 2008 20:37:37 +0000 (20:37 +0000)
git-svn-id: svn+ssh://svn.enlightenment.org/var/svn/e/trunk/e_dbus@38308 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33

src/bin/test.c
src/lib/dbus/e_dbus.c
src/lib/dbus/e_dbus_signal.c
src/lib/notification/marshal.c

index 31d6149..9b6b7d0 100644 (file)
@@ -36,7 +36,7 @@ copy_message(DBusMessageIter *from, DBusMessageIter *to)
         DBusMessageIter fsub, tsub;
         char *sig;
         dbus_message_iter_recurse(from, &fsub);
-        dbus_message_iter_get_signature(&fsub);
+        sig = dbus_message_iter_get_signature(&fsub);
         dbus_message_iter_open_container(to, type, sig, &tsub);
         copy_message(&fsub, &tsub);
         dbus_message_iter_close_container(to, &tsub);
index d4bf889..b043090 100644 (file)
@@ -54,7 +54,6 @@ static int
 e_dbus_fd_handler(void *data, Ecore_Fd_Handler *fd_handler)
 {
   E_DBus_Handler_Data *hd;
-  DBusConnection *conn;
   unsigned int condition = 0;
 
   DEBUG(5, "fd handler (%ld)!\n", (long int)fd_handler);
@@ -67,9 +66,6 @@ e_dbus_fd_handler(void *data, Ecore_Fd_Handler *fd_handler)
     hd->fd_handler = NULL;
     return 0;
   }
-
-  conn = hd->cd->conn;
-
   if (ecore_main_fd_handler_active_get(fd_handler, ECORE_FD_READ)) condition |= DBUS_WATCH_READABLE;
   if (ecore_main_fd_handler_active_get(fd_handler, ECORE_FD_WRITE)) condition |= DBUS_WATCH_WRITABLE;
   if (ecore_main_fd_handler_active_get(fd_handler, ECORE_FD_ERROR)) condition |= DBUS_WATCH_ERROR;
@@ -344,9 +340,7 @@ cb_watch_add(DBusWatch *watch, void *data)
 static void
 cb_watch_del(DBusWatch *watch, void *data)
 {
-  E_DBus_Connection *cd;
   E_DBus_Handler_Data *hd;
-  cd = data;
 
   DEBUG(5, "cb_watch_del\n");
   hd = (E_DBus_Handler_Data *)dbus_watch_get_data(watch);
index 16e342b..d3deda4 100644 (file)
@@ -7,8 +7,6 @@
 #include "e_dbus_private.h"
 #include "dbus/dbus.h"
 
-static int init = 0;
-
 struct E_DBus_Signal_Handler
 {
   char *sender;
@@ -45,10 +43,8 @@ cb_name_owner(void *data, DBusMessage *msg, DBusError *err)
 {
   const char *unique_name = NULL;
   struct cb_name_owner_data *d = data;
-  E_DBus_Connection *conn;
   E_DBus_Signal_Handler *sh;
 
-  conn = d->conn;
   sh = d->sh;
   free(d);
 
index 9a0a8e2..f0db570 100644 (file)
@@ -488,6 +488,7 @@ e_notify_unmarshal_notify_hints(E_Notification *n, DBusMessageIter *iter)
         }
       else if (!strcmp(key, "desktop-entry"))
         {
+          dbus_message_iter_get_basic(&variant, &s_val);
           e_notification_hint_desktop_set(n, s_val);
         }
       else if (!strcmp(key, "sound-file"))