From 7bf62e31a3c820852271768fafc04ba95c31a19f Mon Sep 17 00:00:00 2001 From: Havoc Pennington Date: Mon, 17 Jan 2005 03:53:40 +0000 Subject: 2005-01-16 Havoc Pennington This is about it on what can be disabled/deleted from libdbus easily, back below 150K anyhow. Deeper cuts are more work than just turning the code off as I've done here. * dbus/dbus-marshal-basic.c (_dbus_pack_int32): we don't need the signed int convenience funcs * dbus/dbus-internals.c (_dbus_verbose_real): omit when not in verbose mode * dbus/dbus-string-util.c, dbus/dbus-string.c: more breaking things out of libdbus * dbus/dbus-sysdeps.c, dbus/dbus-sysdeps-util.c: same * dbus/dbus-hash.c: purge the TWO_STRINGS crap (well, make it tests-enabled-only, though it should probably be deleted) * dbus/dbus-message-util.c: same stuff * dbus/dbus-auth-util.c: same stuff --- dbus/dbus-string.h | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'dbus/dbus-string.h') diff --git a/dbus/dbus-string.h b/dbus/dbus-string.h index df5f4232..52281210 100644 --- a/dbus/dbus-string.h +++ b/dbus/dbus-string.h @@ -54,6 +54,7 @@ struct DBusString * to inline non-exported symbols across files in the library. * Note that these break type safety (due to the casts) */ +#define _dbus_string_get_data(s) ((char*)(((DBusString*)(s))->dummy1)) #define _dbus_string_get_length(s) (((DBusString*)(s))->dummy2) #define _dbus_string_set_byte(s, i, b) ((((unsigned char*)(((DBusString*)(s))->dummy1))[(i)]) = (unsigned char) (b)) #define _dbus_string_get_byte(s, i) (((const unsigned char*)(((DBusString*)(s))->dummy1))[(i)]) @@ -71,7 +72,9 @@ dbus_bool_t _dbus_string_init_preallocated (DBusString *str, int allocate_size); void _dbus_string_free (DBusString *str); void _dbus_string_lock (DBusString *str); +#ifndef _dbus_string_get_data char* _dbus_string_get_data (DBusString *str); +#endif /* _dbus_string_get_data */ #ifndef _dbus_string_get_const_data const char* _dbus_string_get_const_data (const DBusString *str); #endif /* _dbus_string_get_const_data */ @@ -205,11 +208,6 @@ dbus_bool_t _dbus_string_parse_double (const DBusString *str, int start, double *value, int *end_return); -dbus_bool_t _dbus_string_parse_basic_type (const DBusString *str, - char type, - int start, - void *value, - int *end_return); dbus_bool_t _dbus_string_find (const DBusString *str, int start, const char *substr, -- cgit