projects
/
platform
/
upstream
/
dbus.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[Foxp][Test] simple echo test with custom payload size
[platform/upstream/dbus.git]
/
dbus
/
dbus-errors.c
diff --git
a/dbus/dbus-errors.c
b/dbus/dbus-errors.c
index
9629c68
..
a0571a5
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
*
* 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., 5
9 Temple Place, Suite 330, Boston, MA 02111-1307
USA
+ * Foundation, Inc., 5
1 Franklin Street, Fifth Floor, Boston, MA 02110-1301
USA
*
*/
*
*/
+
+#include <config.h>
#include "dbus-errors.h"
#include "dbus-internals.h"
#include "dbus-string.h"
#include "dbus-errors.h"
#include "dbus-internals.h"
#include "dbus-string.h"
@@
-76,6
+78,8
@@
typedef struct
} DBusRealError;
} DBusRealError;
+_DBUS_STATIC_ASSERT (sizeof (DBusRealError) == sizeof (DBusError));
+
/**
* Returns a longer message describing an error name.
* If the error name is unknown, returns the name
/**
* Returns a longer message describing an error name.
* If the error name is unknown, returns the name
@@
-231,7
+235,7
@@
dbus_error_free (DBusError *error)
* must ensure the name and message are global data that won't be
* freed. You probably want dbus_set_error() instead, in most cases.
*
* must ensure the name and message are global data that won't be
* freed. You probably want dbus_set_error() instead, in most cases.
*
- * @param error the error
.
or #NULL
+ * @param error the error
or #NULL
* @param name the error name (not copied!!!)
* @param message the error message (not copied!!!)
*/
* @param name the error name (not copied!!!)
* @param message the error message (not copied!!!)
*/
@@
-384,6
+388,7
@@
dbus_set_error (DBusError *error,
if (!_dbus_string_append_printf_valist (&str, format, args))
{
_dbus_string_free (&str);
if (!_dbus_string_append_printf_valist (&str, format, args))
{
_dbus_string_free (&str);
+ va_end (args);
goto nomem;
}
va_end (args);
goto nomem;
}
va_end (args);