diff options
| author | Havoc Pennington <hp@redhat.com> | 2003-02-24 02:24:13 +0000 |
|---|---|---|
| committer | Havoc Pennington <hp@redhat.com> | 2003-02-24 02:24:13 +0000 |
| commit | 2f38c959212d98e2194139daa9120fda37415b4f (patch) | |
| tree | 725edc511caad936a6ab424d451533c9ce3ff48e /dbus/dbus-errors.c | |
| parent | 32b4b2a2f6b4dc7b2ee07f1efb75ec8c871ca04b (diff) | |
2003-02-23 Havoc Pennington <hp@pobox.com>
* dbus/dbus-keyring.c: finish most of this implementation and
simple unit test
* dbus/dbus-errors.c (dbus_set_error_const, dbus_set_error): make
these barf if the error isn't cleared to NULL
* dbus/dbus-sysdeps.c (_dbus_delete_file): set error on failure
(_dbus_create_directory): new function
* dbus/dbus-errors.c (dbus_set_error): fix warning
* dbus/dbus-string.c (_dbus_string_hex_encode): new function
(_dbus_string_hex_decode): new function
(test_hex_roundtrip): test code
* dbus/dbus-sha.c (_dbus_sha_compute): use dbus_string_hex_encode
* dbus/dbus-md5.c (_dbus_md5_compute): use dbus_string_hex_encode
* dbus/dbus-sysdeps.c (_dbus_string_save_to_file): make this use
the save-to-temp/rename trick to atomically write the new file
(_dbus_string_parse_uint): new function
Diffstat (limited to 'dbus/dbus-errors.c')
| -rw-r--r-- | dbus/dbus-errors.c | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/dbus/dbus-errors.c b/dbus/dbus-errors.c index a469f7e6..3aca9f10 100644 --- a/dbus/dbus-errors.c +++ b/dbus/dbus-errors.c @@ -196,6 +196,10 @@ dbus_set_error_const (DBusError *error, if (error == NULL) return; + + /* it's a bug to pile up errors */ + _dbus_assert (error->name == NULL); + _dbus_assert (error->message == NULL); real = (DBusRealError *)error; @@ -225,13 +229,17 @@ dbus_set_error (DBusError *error, ...) { DBusRealError *real; - va_list args, args2; + va_list args; int message_length; char *message; char c; if (error == NULL) return; + + /* it's a bug to pile up errors */ + _dbus_assert (error->name == NULL); + _dbus_assert (error->message == NULL); va_start (args, format); /* Measure the message length */ @@ -248,7 +256,7 @@ dbus_set_error (DBusError *error, } va_start (args, format); - vsprintf (message, format, args2); + vsprintf (message, format, args); va_end (args); real = (DBusRealError *)error; |