From: Simon McVittie Date: Fri, 10 Feb 2012 14:37:41 +0000 (+0000) Subject: Remove unused _dbus_string_append_4_aligned, _dbus_string_append_8_aligned X-Git-Tag: dbus-1.5.10~48 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=54bf2bd92cbc7dd1ca7afee5e4cd9ce48d483896;p=thirdparty%2Fdbus.git Remove unused _dbus_string_append_4_aligned, _dbus_string_append_8_aligned Bug: https://bugs.freedesktop.org/show_bug.cgi?id=39759 Signed-off-by: Simon McVittie Reviewed-by: Lennart Poettering --- diff --git a/dbus/dbus-string.c b/dbus/dbus-string.c index 6658abd4d..2e891c792 100644 --- a/dbus/dbus-string.c +++ b/dbus/dbus-string.c @@ -957,54 +957,6 @@ do { \ } while (0) #endif /* DBUS_HAVE_INT64 */ -#ifdef DBUS_BUILD_TESTS -/** - * Appends 4 bytes aligned on a 4 byte boundary - * with any alignment padding initialized to 0. - * - * @param str the DBusString - * @param octets 4 bytes to append - * @returns #FALSE if not enough memory. - */ -dbus_bool_t -_dbus_string_append_4_aligned (DBusString *str, - const unsigned char octets[4]) -{ - DBUS_STRING_PREAMBLE (str); - - if (!align_length_then_lengthen (str, 4, 4)) - return FALSE; - - ASSIGN_4_OCTETS (real->str + (real->len - 4), octets); - - return TRUE; -} -#endif /* DBUS_BUILD_TESTS */ - -#ifdef DBUS_BUILD_TESTS -/** - * Appends 8 bytes aligned on an 8 byte boundary - * with any alignment padding initialized to 0. - * - * @param str the DBusString - * @param octets 8 bytes to append - * @returns #FALSE if not enough memory. - */ -dbus_bool_t -_dbus_string_append_8_aligned (DBusString *str, - const unsigned char octets[8]) -{ - DBUS_STRING_PREAMBLE (str); - - if (!align_length_then_lengthen (str, 8, 8)) - return FALSE; - - ASSIGN_8_OCTETS (real->str + (real->len - 8), octets); - - return TRUE; -} -#endif /* DBUS_BUILD_TESTS */ - /** * Inserts 2 bytes aligned on a 2 byte boundary * with any alignment padding initialized to 0. diff --git a/dbus/dbus-string.h b/dbus/dbus-string.h index 2f1fe8787..027d11037 100644 --- a/dbus/dbus-string.h +++ b/dbus/dbus-string.h @@ -156,10 +156,6 @@ dbus_bool_t _dbus_string_append_byte (DBusString *str, unsigned char byte); dbus_bool_t _dbus_string_append_unichar (DBusString *str, dbus_unichar_t ch); -dbus_bool_t _dbus_string_append_4_aligned (DBusString *str, - const unsigned char octets[4]); -dbus_bool_t _dbus_string_append_8_aligned (DBusString *str, - const unsigned char octets[8]); dbus_bool_t _dbus_string_append_printf (DBusString *str, const char *format, ...) _DBUS_GNUC_PRINTF (2, 3);