DBus: remove unused macro, check memory allocation

diff --git a/modules/control/dbus.c b/modules/control/dbus.c
index ec2914d34b791f0cdbf739019908d016e01e1b13..514f2c1afab1d20427d9d0fae10cb9f22cacab53 100644 (file)
--- a/modules/control/dbus.c
+++ b/modules/control/dbus.c
@@ -136,10 +136,20 @@ DBUS_METHOD( MprisVersion )
     dbus_uint16_t i_minor = VLC_MPRIS_VERSION_MINOR;
     DBusMessageIter version;
 
-    dbus_message_iter_open_container( &args, DBUS_TYPE_STRUCT, NULL, &version );
-    dbus_message_iter_append_basic( &version, DBUS_TYPE_UINT16, &i_major );
-    dbus_message_iter_append_basic( &version, DBUS_TYPE_UINT16, &i_minor );
-    dbus_message_iter_close_container( &args, &version );
+    if( !dbus_message_iter_open_container( &args, DBUS_TYPE_STRUCT, NULL,
+            &version ) )
+        return DBUS_HANDLER_RESULT_NEED_MEMORY;
+
+    if( !dbus_message_iter_append_basic( &version, DBUS_TYPE_UINT16,
+            &i_major ) )
+        return DBUS_HANDLER_RESULT_NEED_MEMORY;
+
+    if( !dbus_message_iter_append_basic( &version, DBUS_TYPE_UINT16,
+            &i_minor ) )
+        return DBUS_HANDLER_RESULT_NEED_MEMORY;
+
+    if( !dbus_message_iter_close_container( &args, &version ) )
+        return DBUS_HANDLER_RESULT_NEED_MEMORY;
     REPLY_SEND;
 }
 

diff --git a/modules/control/dbus.h b/modules/control/dbus.h
index c9057d7ab32b1b620af7be6602aeba6ae9e0a57f..5956f0d68ed8cac54783014b14d267db1fb9a5f1 100644 (file)
--- a/modules/control/dbus.h
+++ b/modules/control/dbus.h
@@ -80,7 +80,6 @@
 #define ADD_BOOL( b ) DBUS_ADD( DBUS_TYPE_BOOLEAN, b )
 #define ADD_INT32( i ) DBUS_ADD( DBUS_TYPE_INT32, i )
 #define ADD_BYTE( b ) DBUS_ADD( DBUS_TYPE_BYTE, b )
-#define ADD_UINT16( i ) DBUS_ADD( DBUS_TYPE_UINT16, i )
 
 /* XML data to answer org.freedesktop.DBus.Introspectable.Introspect requests */