diff options
| author | Havoc Pennington <hp@redhat.com> | 2003-03-31 20:56:29 +0000 |
|---|---|---|
| committer | Havoc Pennington <hp@redhat.com> | 2003-03-31 20:56:29 +0000 |
| commit | fa05de9230d62e7c427b5313796fc6ccd4d0ff60 (patch) | |
| tree | 206890e8df6a575c150b901bf108b1c0a1e98824 /bus/config-loader-expat.c | |
| parent | 7af59334331fbd097a24c4942c75181882b96747 (diff) | |
2003-03-31 Havoc Pennington <hp@redhat.com>
Fix some annoying DBusString API and fix all affected code.
* dbus/dbus-string.c (_dbus_string_init): get rid of annoying
max_length argument
(_dbus_string_get_data): change to return string instead of using
an out param
(_dbus_string_get_const_data): ditto
(_dbus_string_get_data_len): ditto
(_dbus_string_get_const_data_len): ditto
Diffstat (limited to 'bus/config-loader-expat.c')
| -rw-r--r-- | bus/config-loader-expat.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/bus/config-loader-expat.c b/bus/config-loader-expat.c index 9988fb69..9e6de5e2 100644 --- a/bus/config-loader-expat.c +++ b/bus/config-loader-expat.c @@ -178,9 +178,9 @@ bus_config_load (const DBusString *file, context.error = error; context.failed = FALSE; - _dbus_string_get_const_data (file, &filename); + filename = _dbus_string_get_const_data (file); - if (!_dbus_string_init (&context.content, _DBUS_INT_MAX)) + if (!_dbus_string_init (&context.content)) { dbus_set_error (error, DBUS_ERROR_NO_MEMORY, NULL); return NULL; @@ -212,7 +212,7 @@ bus_config_load (const DBusString *file, DBusString data; const char *data_str; - if (!_dbus_string_init (&data, _DBUS_INT_MAX)) + if (!_dbus_string_init (&data)) { dbus_set_error (error, DBUS_ERROR_NO_MEMORY, NULL); goto failed; @@ -224,7 +224,7 @@ bus_config_load (const DBusString *file, goto failed; } - _dbus_string_get_const_data (&data, &data_str); + data_str = _dbus_string_get_const_data (&data); if (!XML_Parse (expat, data_str, _dbus_string_get_length (&data), TRUE)) { |