From 03fb492feb4d4a46e883b5542e5bf214a9695e26 Mon Sep 17 00:00:00 2001 From: Stef Walter Date: Thu, 9 May 2013 14:30:58 +0200 Subject: Remove unused functions from realmd provider --- src/realmd/rdcp_dbus.c | 137 ------------------------------------------------- 1 file changed, 137 deletions(-) (limited to 'src/realmd') diff --git a/src/realmd/rdcp_dbus.c b/src/realmd/rdcp_dbus.c index b05e5c9..75ee439 100644 --- a/src/realmd/rdcp_dbus.c +++ b/src/realmd/rdcp_dbus.c @@ -46,15 +46,6 @@ append_g_variant_to_dbus_msg_iter(DBusMessageIter *iter, GVariant *value, GError static gboolean append_g_variant_to_dbus_message(DBusMessage *message, GVariant *g_variant, GError **g_error); -static gboolean -dbus_method_append_args_tuple(DBusMessage *message, GVariant *args, GError **g_error); - -static gboolean -marshal_dbus_string_variant(DBusMessageIter *iter, const char *value, GError **g_error); - -static gboolean -marshal_dbus_dict_string_entry(DBusMessageIter *array, const char *name, const char *value, GError **g_error); - static gboolean dbus_iter_to_variant(DBusMessageIter *iter, GVariant **g_variant_return, GError **g_error); @@ -681,134 +672,6 @@ append_g_variant_to_dbus_message(DBusMessage *message, GVariant *g_variant, GEr return TRUE; } -/** - * dbus_method_append_args_tuple: - * @message DBus message currently being built - * @args A GVariant tuple containing the method parameters to - * be appended to @message - * @g_error initialized to error info when FALSE is returned. - * - * Append the method parameters to a DBus method message. @args - * is a GVariant tuple representing the parameter list. - * - * Returns: return TRUE if successful, FALSE if error with @g_error initialized. - */ -static gboolean -dbus_method_append_args_tuple(DBusMessage *message, GVariant *args, GError **g_error) -{ - DBusMessageIter iter; - gsize n, i; - GVariant *arg; - - g_return_val_if_fail (message != NULL, FALSE); - g_return_val_if_fail (args != NULL && g_variant_is_of_type(args, G_VARIANT_TYPE_TUPLE), FALSE); - g_return_val_if_fail (g_error == NULL || *g_error == NULL, FALSE); - - if ((n = g_variant_n_children(args))) { - - dbus_message_iter_init_append(message, &iter); - - for (i = 0; i < n; i++) { - arg = g_variant_get_child_value(args, i); - if (!append_g_variant_to_dbus_msg_iter(&iter, arg, g_error)) { - G_VARIANT_FREE(arg); - return FALSE; - } - G_VARIANT_FREE(arg); - } - } - - return TRUE; -} - -/** - * marshal_dbus_string_variant: - * @iter iterator into which the string variant will be inserted - * @value string value to insert as variant - * @g_error initialized to error info when FALSE is returned. - * - * Add a string variant while marshaling DBus protocol. - * - * Returns: return TRUE if successful, FALSE if error with @g_error initialized. - */ -static gboolean -marshal_dbus_string_variant(DBusMessageIter *iter, const char *value, GError **g_error) -{ - DBusMessageIter variant; - - g_return_val_if_fail (iter != NULL, FALSE); - g_return_val_if_fail (value != NULL, FALSE); - g_return_val_if_fail (g_error == NULL || *g_error == NULL, FALSE); - - if (!dbus_message_iter_open_container(iter, DBUS_TYPE_VARIANT, "s", &variant)) { - g_set_error(g_error, RDCP_ERROR, RDCP_ERROR_DBUS, - "cannot open dbus variant string container, value=\"%s\"", value); - return FALSE; - } - - if (!dbus_message_iter_append_basic(&variant, DBUS_TYPE_STRING, &value)) { - g_set_error(g_error, RDCP_ERROR, RDCP_ERROR_DBUS, - "cannot append dbus variant string value, value=\"%s\"", value); - return FALSE; - } - - if (!dbus_message_iter_close_container(iter, &variant)) { - g_set_error(g_error, RDCP_ERROR, RDCP_ERROR_DBUS, - "cannot close dbus variant container, value=\"%s\"", value); - return FALSE; - } - - return TRUE; -} - -/** - * marshal_dbus_dict_string_entry: - * @array dictionary array into which entry is inserted - * @name entry's key - * @value entry's value - * @g_error initialized to error info when FALSE is returned. - * - * Adds a dictionary entry into an dictionary array whose key is a - * string and whose value is also a string while marshaling DBus protocol. - * - * Returns: return TRUE if successful, FALSE if error with @g_error initialized. - */ -static gboolean -marshal_dbus_dict_string_entry(DBusMessageIter *array, const char *name, const char *value, GError **g_error) -{ - DBusMessageIter entry; - - g_return_val_if_fail (array != NULL, FALSE); - g_return_val_if_fail (name != NULL, FALSE); - g_return_val_if_fail (value != NULL, FALSE); - g_return_val_if_fail (g_error == NULL || *g_error == NULL, FALSE); - - if (!dbus_message_iter_open_container(array, DBUS_TYPE_DICT_ENTRY, NULL, &entry)) { - g_set_error(g_error, RDCP_ERROR, RDCP_ERROR_DBUS, - "cannot open dbus dict entry container for option <%s=%s>", name, value); - return FALSE; - } - - if (!dbus_message_iter_append_basic(&entry, DBUS_TYPE_STRING, &name)) { - g_set_error(g_error, RDCP_ERROR, RDCP_ERROR_DBUS, - "cannot append option name for option <%s=%s>", name, value); - return FALSE; - } - - if (!marshal_dbus_string_variant(&entry, value, g_error)) { - return FALSE; - } - - if (!dbus_message_iter_close_container(array, &entry)) { - g_set_error(g_error, RDCP_ERROR, RDCP_ERROR_DBUS, - "cannot close dbus dict entry container for option <%s=%s>", name, value); - return FALSE; - } - - return TRUE; -} - - /*----------------------------------------------------------------------------*/ -- cgit