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 /dbus/dbus-string.h | |
| 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 'dbus/dbus-string.h')
| -rw-r--r-- | dbus/dbus-string.h | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/dbus/dbus-string.h b/dbus/dbus-string.h index 3a517e94..ba0fcf85 100644 --- a/dbus/dbus-string.h +++ b/dbus/dbus-string.h @@ -45,8 +45,7 @@ struct DBusString unsigned int dummy8 : 3; /**< placeholder */ }; -dbus_bool_t _dbus_string_init (DBusString *str, - int max_length); +dbus_bool_t _dbus_string_init (DBusString *str); void _dbus_string_init_const (DBusString *str, const char *value); void _dbus_string_init_const_len (DBusString *str, @@ -55,16 +54,12 @@ void _dbus_string_init_const_len (DBusString *str, void _dbus_string_free (DBusString *str); void _dbus_string_lock (DBusString *str); -void _dbus_string_get_data (DBusString *str, - char **data_return); -void _dbus_string_get_const_data (const DBusString *str, - const char **data_return); -void _dbus_string_get_data_len (DBusString *str, - char **data_return, +char* _dbus_string_get_data (DBusString *str); +const char* _dbus_string_get_const_data (const DBusString *str); +char* _dbus_string_get_data_len (DBusString *str, int start, int len); -void _dbus_string_get_const_data_len (const DBusString *str, - const char **data_return, +const char* _dbus_string_get_const_data_len (const DBusString *str, int start, int len); void _dbus_string_set_byte (DBusString *str, |