diff options
| author | Havoc Pennington <hp@redhat.com> | 2005-02-25 22:03:30 +0000 |
|---|---|---|
| committer | Havoc Pennington <hp@redhat.com> | 2005-02-25 22:03:30 +0000 |
| commit | 7ce7502e1ae23766ba40105327de787c2d1cef9d (patch) | |
| tree | 06fcb80d134ca45a88a510e0f53d34e2f415fd50 /dbus/dbus-string.c | |
| parent | 1b5dace8e6986965af7b573b3b2c5991af11cf6e (diff) | |
2005-02-25 Havoc Pennington <hp@redhat.com>
* doc/dbus-specification.xml: document the GUID thing
* dbus/dbus-server.c (_dbus_server_init_base): initialize a
globally unique ID for the server, and put a "guid=hexencoded"
field in the address
* dbus/dbus-bus.c: fix missing #include of dbus-threads-internal.h
* dbus/dbus-message.c: ditto
* dbus/dbus-dataslot.c: ditto
* dbus/dbus-list.c: ditto
* dbus/dbus-internals.h: wait, just include
dbus-threads-internal.h here
* dbus/dbus-string.c (_dbus_string_copy_to_buffer): move back for
use in main library
* dbus/dbus-sysdeps.c (_dbus_generate_random_bytes_buffer): new function
Diffstat (limited to 'dbus/dbus-string.c')
| -rw-r--r-- | dbus/dbus-string.c | 24 |
1 files changed, 24 insertions, 0 deletions
diff --git a/dbus/dbus-string.c b/dbus/dbus-string.c index 5088bca9..86d3eb83 100644 --- a/dbus/dbus-string.c +++ b/dbus/dbus-string.c @@ -708,6 +708,30 @@ _dbus_string_copy_data (const DBusString *str, return TRUE; } +/** + * Copies the contents of a DBusString into a different + * buffer. The resulting buffer will be nul-terminated. + * + * @param str a string + * @param buffer a C buffer to copy data to + * @param avail_len maximum length of C buffer + */ +void +_dbus_string_copy_to_buffer (const DBusString *str, + char *buffer, + int avail_len) +{ + int copy_len; + DBUS_CONST_STRING_PREAMBLE (str); + + _dbus_assert (avail_len >= 0); + + copy_len = MIN (avail_len, real->len+1); + memcpy (buffer, real->str, copy_len); + if (avail_len > 0 && avail_len == copy_len) + buffer[avail_len-1] = '\0'; +} + #ifdef DBUS_BUILD_TESTS /** * Copies a segment of the string into a char* |