bus: Raise file descriptor limit to match configuration

[platform/upstream/dbus.git] / dbus / dbus-errors.c

diff --git a/dbus/dbus-errors.c b/dbus/dbus-errors.c
index 30bf6a1..5f27501 100644 (file)
--- a/dbus/dbus-errors.c
+++ b/dbus/dbus-errors.c
@@ -18,9 +18,11 @@
  * 
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  *
  */
+
+#include <config.h>
 #include "dbus-errors.h"
 #include "dbus-internals.h"
 #include "dbus-string.h"
@@ -36,13 +38,13 @@
  */
 
 /**
- * @def DBUS_ERROR_INITIALIZER
+ * @def DBUS_ERROR_INIT
  *
  * Expands to a suitable initializer for a DBusError on the stack.
  * Declaring a DBusError with:
  *
  * @code
- * DBusError error = DBUS_ERROR_INITIALIZER;
+ * DBusError error = DBUS_ERROR_INIT;
  *
  * do_things_with (&error);
  * @endcode
@@ -375,6 +377,7 @@ dbus_set_error (DBusError  *error,
                                 message_from_error (name)))
         {
           _dbus_string_free (&str);
+          va_end (args);
           goto nomem;
         }
     }
@@ -384,6 +387,7 @@ dbus_set_error (DBusError  *error,
       if (!_dbus_string_append_printf_valist (&str, format, args))
         {
           _dbus_string_free (&str);
+          va_end (args);
           goto nomem;
         }
       va_end (args);