[maemo-commits] [maemo-commits] r14665 - in projects/haf/trunk/dbus/debian: . patches

[From: subversion at stage.maemo.org]

Author: kihamala
Date: 2007-10-29 13:28:06 +0200 (Mon, 29 Oct 2007)
New Revision: 14665

Added:
   projects/haf/trunk/dbus/debian/patches/36-remove-deadcode.patch
Modified:
   projects/haf/trunk/dbus/debian/changelog
Log:
remove some dead code from config-parser.c


Modified: projects/haf/trunk/dbus/debian/changelog
===================================================================
--- projects/haf/trunk/dbus/debian/changelog	2007-10-29 11:00:16 UTC (rev 14664)
+++ projects/haf/trunk/dbus/debian/changelog	2007-10-29 11:28:06 UTC (rev 14665)
@@ -22,6 +22,7 @@
   * Add missing OOM check to main.c.
   * Fix some _dbus_poll calls in dbus-spawn.c.
   * Remove unused function _dbus_shell_quote.
+  * Remove some dead code from config-parser.c.
 
  -- Kimmo Hämäläinen <kimmo.hamalainen at nokia.com>  Thu, 18 Oct 2007 11:21:11 +0300
 

Added: projects/haf/trunk/dbus/debian/patches/36-remove-deadcode.patch
===================================================================
--- projects/haf/trunk/dbus/debian/patches/36-remove-deadcode.patch	2007-10-29 11:00:16 UTC (rev 14664)
+++ projects/haf/trunk/dbus/debian/patches/36-remove-deadcode.patch	2007-10-29 11:28:06 UTC (rev 14665)
@@ -0,0 +1,13 @@
+diff -pur dbus-1.0.2/bus/config-parser.c dbus-1.0.2.new/bus/config-parser.c
+--- dbus-1.0.2/bus/config-parser.c	2006-12-11 21:21:21.000000000 +0200
++++ dbus-1.0.2.new/bus/config-parser.c	2007-10-29 13:24:26.584609360 +0200
+@@ -636,9 +636,6 @@ locate_attributes (BusConfigParser  *par
+ 
+   va_end (args);
+ 
+-  if (!retval)
+-    return retval;
+-
+   i = 0;
+   while (attribute_names[i])
+     {