|
 |
a8262ca |
From 0928169cf80bf767f7246ecaa52cc01e198bb15a Mon Sep 17 00:00:00 2001
|
|
|
a8262ca |
From: Ivan Romanov <drizt land ru>
|
|
|
a8262ca |
Date: Thu, 22 Aug 2013 19:11:23 +0100
|
|
|
a8262ca |
Subject: [PATCH] Use iface instead of interface in function parameters
|
|
|
a8262ca |
|
|
|
a8262ca |
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=66493
|
|
|
a8262ca |
Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
|
|
|
a8262ca |
---
|
|
|
a8262ca |
dbus/dbus-message.c | 62 ++++++++++++++++++++++++++---------------------------
|
|
|
a8262ca |
dbus/dbus-message.h | 12 +++++------
|
|
|
a8262ca |
2 files changed, 37 insertions(+), 37 deletions(-)
|
|
|
a8262ca |
|
|
|
a8262ca |
diff --git a/dbus/dbus-message.c b/dbus/dbus-message.c
|
|
|
a8262ca |
index 5d3517c..079251e 100644
|
|
|
a8262ca |
--- a/dbus/dbus-message.c
|
|
|
a8262ca |
+++ b/dbus/dbus-message.c
|
|
|
a8262ca |
@@ -1259,7 +1259,7 @@ dbus_message_new (int message_type)
|
|
|
a8262ca |
*
|
|
|
a8262ca |
* @param destination name that the message should be sent to or #NULL
|
|
|
a8262ca |
* @param path object path the message should be sent to
|
|
|
a8262ca |
- * @param interface interface to invoke method on, or #NULL
|
|
|
a8262ca |
+ * @param iface interface to invoke method on, or #NULL
|
|
|
a8262ca |
* @param method method to invoke
|
|
|
a8262ca |
*
|
|
|
a8262ca |
* @returns a new DBusMessage, free with dbus_message_unref()
|
|
|
a8262ca |
@@ -1267,7 +1267,7 @@ dbus_message_new (int message_type)
|
|
|
a8262ca |
DBusMessage*
|
|
|
a8262ca |
dbus_message_new_method_call (const char *destination,
|
|
|
a8262ca |
const char *path,
|
|
|
a8262ca |
- const char *interface,
|
|
|
a8262ca |
+ const char *iface,
|
|
|
a8262ca |
const char *method)
|
|
|
a8262ca |
{
|
|
|
a8262ca |
DBusMessage *message;
|
|
|
a8262ca |
@@ -1277,8 +1277,8 @@ dbus_message_new_method_call (const char *destination,
|
|
|
a8262ca |
_dbus_return_val_if_fail (destination == NULL ||
|
|
|
a8262ca |
_dbus_check_is_valid_bus_name (destination), NULL);
|
|
|
a8262ca |
_dbus_return_val_if_fail (_dbus_check_is_valid_path (path), NULL);
|
|
|
a8262ca |
- _dbus_return_val_if_fail (interface == NULL ||
|
|
|
a8262ca |
- _dbus_check_is_valid_interface (interface), NULL);
|
|
|
a8262ca |
+ _dbus_return_val_if_fail (iface == NULL ||
|
|
|
a8262ca |
+ _dbus_check_is_valid_interface (iface), NULL);
|
|
|
a8262ca |
_dbus_return_val_if_fail (_dbus_check_is_valid_member (method), NULL);
|
|
|
a8262ca |
|
|
|
a8262ca |
message = dbus_message_new_empty_header ();
|
|
|
a8262ca |
@@ -1288,7 +1288,7 @@ dbus_message_new_method_call (const char *destination,
|
|
|
a8262ca |
if (!_dbus_header_create (&message->header,
|
|
|
a8262ca |
DBUS_COMPILER_BYTE_ORDER,
|
|
|
a8262ca |
DBUS_MESSAGE_TYPE_METHOD_CALL,
|
|
|
a8262ca |
- destination, path, interface, method, NULL))
|
|
|
a8262ca |
+ destination, path, iface, method, NULL))
|
|
|
a8262ca |
{
|
|
|
a8262ca |
dbus_message_unref (message);
|
|
|
a8262ca |
return NULL;
|
|
|
a8262ca |
@@ -1351,22 +1351,22 @@ dbus_message_new_method_return (DBusMessage *method_call)
|
|
|
a8262ca |
* specification defines the syntax of these fields).
|
|
|
a8262ca |
*
|
|
|
a8262ca |
* @param path the path to the object emitting the signal
|
|
|
a8262ca |
- * @param interface the interface the signal is emitted from
|
|
|
a8262ca |
+ * @param iface the interface the signal is emitted from
|
|
|
a8262ca |
* @param name name of the signal
|
|
|
a8262ca |
* @returns a new DBusMessage, free with dbus_message_unref()
|
|
|
a8262ca |
*/
|
|
|
a8262ca |
DBusMessage*
|
|
|
a8262ca |
dbus_message_new_signal (const char *path,
|
|
|
a8262ca |
- const char *interface,
|
|
|
a8262ca |
+ const char *iface,
|
|
|
a8262ca |
const char *name)
|
|
|
a8262ca |
{
|
|
|
a8262ca |
DBusMessage *message;
|
|
|
a8262ca |
|
|
|
a8262ca |
_dbus_return_val_if_fail (path != NULL, NULL);
|
|
|
a8262ca |
- _dbus_return_val_if_fail (interface != NULL, NULL);
|
|
|
a8262ca |
+ _dbus_return_val_if_fail (iface != NULL, NULL);
|
|
|
a8262ca |
_dbus_return_val_if_fail (name != NULL, NULL);
|
|
|
a8262ca |
_dbus_return_val_if_fail (_dbus_check_is_valid_path (path), NULL);
|
|
|
a8262ca |
- _dbus_return_val_if_fail (_dbus_check_is_valid_interface (interface), NULL);
|
|
|
a8262ca |
+ _dbus_return_val_if_fail (_dbus_check_is_valid_interface (iface), NULL);
|
|
|
a8262ca |
_dbus_return_val_if_fail (_dbus_check_is_valid_member (name), NULL);
|
|
|
a8262ca |
|
|
|
a8262ca |
message = dbus_message_new_empty_header ();
|
|
|
a8262ca |
@@ -1376,7 +1376,7 @@ dbus_message_new_signal (const char *path,
|
|
|
a8262ca |
if (!_dbus_header_create (&message->header,
|
|
|
a8262ca |
DBUS_COMPILER_BYTE_ORDER,
|
|
|
a8262ca |
DBUS_MESSAGE_TYPE_SIGNAL,
|
|
|
a8262ca |
- NULL, path, interface, name, NULL))
|
|
|
a8262ca |
+ NULL, path, iface, name, NULL))
|
|
|
a8262ca |
{
|
|
|
a8262ca |
dbus_message_unref (message);
|
|
|
a8262ca |
return NULL;
|
|
|
a8262ca |
@@ -3126,23 +3126,23 @@ dbus_message_get_path_decomposed (DBusMessage *message,
|
|
|
a8262ca |
* in the D-Bus specification.
|
|
|
a8262ca |
*
|
|
|
a8262ca |
* @param message the message
|
|
|
a8262ca |
- * @param interface the interface or #NULL to unset
|
|
|
a8262ca |
+ * @param iface the interface or #NULL to unset
|
|
|
a8262ca |
* @returns #FALSE if not enough memory
|
|
|
a8262ca |
*/
|
|
|
a8262ca |
dbus_bool_t
|
|
|
a8262ca |
dbus_message_set_interface (DBusMessage *message,
|
|
|
a8262ca |
- const char *interface)
|
|
|
a8262ca |
+ const char *iface)
|
|
|
a8262ca |
{
|
|
|
a8262ca |
_dbus_return_val_if_fail (message != NULL, FALSE);
|
|
|
a8262ca |
_dbus_return_val_if_fail (!message->locked, FALSE);
|
|
|
a8262ca |
- _dbus_return_val_if_fail (interface == NULL ||
|
|
|
a8262ca |
- _dbus_check_is_valid_interface (interface),
|
|
|
a8262ca |
+ _dbus_return_val_if_fail (iface == NULL ||
|
|
|
a8262ca |
+ _dbus_check_is_valid_interface (iface),
|
|
|
a8262ca |
FALSE);
|
|
|
a8262ca |
|
|
|
a8262ca |
return set_or_delete_string_field (message,
|
|
|
a8262ca |
DBUS_HEADER_FIELD_INTERFACE,
|
|
|
a8262ca |
DBUS_TYPE_STRING,
|
|
|
a8262ca |
- interface);
|
|
|
a8262ca |
+ iface);
|
|
|
a8262ca |
}
|
|
|
a8262ca |
|
|
|
a8262ca |
/**
|
|
|
a8262ca |
@@ -3177,28 +3177,28 @@ dbus_message_get_interface (DBusMessage *message)
|
|
|
a8262ca |
* Checks if the message has an interface
|
|
|
a8262ca |
*
|
|
|
a8262ca |
* @param message the message
|
|
|
a8262ca |
- * @param interface the interface name
|
|
|
a8262ca |
+ * @param iface the interface name
|
|
|
a8262ca |
* @returns #TRUE if the interface field in the header matches
|
|
|
a8262ca |
*/
|
|
|
a8262ca |
dbus_bool_t
|
|
|
a8262ca |
dbus_message_has_interface (DBusMessage *message,
|
|
|
a8262ca |
- const char *interface)
|
|
|
a8262ca |
+ const char *iface)
|
|
|
a8262ca |
{
|
|
|
a8262ca |
const char *msg_interface;
|
|
|
a8262ca |
msg_interface = dbus_message_get_interface (message);
|
|
|
a8262ca |
|
|
|
a8262ca |
if (msg_interface == NULL)
|
|
|
a8262ca |
{
|
|
|
a8262ca |
- if (interface == NULL)
|
|
|
a8262ca |
+ if (iface == NULL)
|
|
|
a8262ca |
return TRUE;
|
|
|
a8262ca |
else
|
|
|
a8262ca |
return FALSE;
|
|
|
a8262ca |
}
|
|
|
a8262ca |
|
|
|
a8262ca |
- if (interface == NULL)
|
|
|
a8262ca |
+ if (iface == NULL)
|
|
|
a8262ca |
return FALSE;
|
|
|
a8262ca |
|
|
|
a8262ca |
- if (strcmp (msg_interface, interface) == 0)
|
|
|
a8262ca |
+ if (strcmp (msg_interface, iface) == 0)
|
|
|
a8262ca |
return TRUE;
|
|
|
a8262ca |
|
|
|
a8262ca |
return FALSE;
|
|
|
a8262ca |
@@ -3490,13 +3490,13 @@ dbus_message_get_signature (DBusMessage *message)
|
|
|
a8262ca |
static dbus_bool_t
|
|
|
a8262ca |
_dbus_message_has_type_interface_member (DBusMessage *message,
|
|
|
a8262ca |
int type,
|
|
|
a8262ca |
- const char *interface,
|
|
|
a8262ca |
+ const char *iface,
|
|
|
a8262ca |
const char *member)
|
|
|
a8262ca |
{
|
|
|
a8262ca |
const char *n;
|
|
|
a8262ca |
|
|
|
a8262ca |
_dbus_assert (message != NULL);
|
|
|
a8262ca |
- _dbus_assert (interface != NULL);
|
|
|
a8262ca |
+ _dbus_assert (iface != NULL);
|
|
|
a8262ca |
_dbus_assert (member != NULL);
|
|
|
a8262ca |
|
|
|
a8262ca |
if (dbus_message_get_type (message) != type)
|
|
|
a8262ca |
@@ -3512,7 +3512,7 @@ _dbus_message_has_type_interface_member (DBusMessage *message,
|
|
|
a8262ca |
{
|
|
|
a8262ca |
n = dbus_message_get_interface (message);
|
|
|
a8262ca |
|
|
|
a8262ca |
- if (n == NULL || strcmp (n, interface) == 0)
|
|
|
a8262ca |
+ if (n == NULL || strcmp (n, iface) == 0)
|
|
|
a8262ca |
return TRUE;
|
|
|
a8262ca |
}
|
|
|
a8262ca |
|
|
|
a8262ca |
@@ -3528,18 +3528,18 @@ _dbus_message_has_type_interface_member (DBusMessage *message,
|
|
|
a8262ca |
* protocol allows method callers to leave out the interface name.
|
|
|
a8262ca |
*
|
|
|
a8262ca |
* @param message the message
|
|
|
a8262ca |
- * @param interface the name to check (must not be #NULL)
|
|
|
a8262ca |
+ * @param iface the name to check (must not be #NULL)
|
|
|
a8262ca |
* @param method the name to check (must not be #NULL)
|
|
|
a8262ca |
*
|
|
|
a8262ca |
* @returns #TRUE if the message is the specified method call
|
|
|
a8262ca |
*/
|
|
|
a8262ca |
dbus_bool_t
|
|
|
a8262ca |
dbus_message_is_method_call (DBusMessage *message,
|
|
|
a8262ca |
- const char *interface,
|
|
|
a8262ca |
+ const char *iface,
|
|
|
a8262ca |
const char *method)
|
|
|
a8262ca |
{
|
|
|
a8262ca |
_dbus_return_val_if_fail (message != NULL, FALSE);
|
|
|
a8262ca |
- _dbus_return_val_if_fail (interface != NULL, FALSE);
|
|
|
a8262ca |
+ _dbus_return_val_if_fail (iface != NULL, FALSE);
|
|
|
a8262ca |
_dbus_return_val_if_fail (method != NULL, FALSE);
|
|
|
a8262ca |
/* don't check that interface/method are valid since it would be
|
|
|
a8262ca |
* expensive, and not catch many common errors
|
|
|
a8262ca |
@@ -3547,7 +3547,7 @@ dbus_message_is_method_call (DBusMessage *message,
|
|
|
a8262ca |
|
|
|
a8262ca |
return _dbus_message_has_type_interface_member (message,
|
|
|
a8262ca |
DBUS_MESSAGE_TYPE_METHOD_CALL,
|
|
|
a8262ca |
- interface, method);
|
|
|
a8262ca |
+ iface, method);
|
|
|
a8262ca |
}
|
|
|
a8262ca |
|
|
|
a8262ca |
/**
|
|
|
a8262ca |
@@ -3556,18 +3556,18 @@ dbus_message_is_method_call (DBusMessage *message,
|
|
|
a8262ca |
* has a different interface or member field, returns #FALSE.
|
|
|
a8262ca |
*
|
|
|
a8262ca |
* @param message the message
|
|
|
a8262ca |
- * @param interface the name to check (must not be #NULL)
|
|
|
a8262ca |
+ * @param iface the name to check (must not be #NULL)
|
|
|
a8262ca |
* @param signal_name the name to check (must not be #NULL)
|
|
|
a8262ca |
*
|
|
|
a8262ca |
* @returns #TRUE if the message is the specified signal
|
|
|
a8262ca |
*/
|
|
|
a8262ca |
dbus_bool_t
|
|
|
a8262ca |
dbus_message_is_signal (DBusMessage *message,
|
|
|
a8262ca |
- const char *interface,
|
|
|
a8262ca |
+ const char *iface,
|
|
|
a8262ca |
const char *signal_name)
|
|
|
a8262ca |
{
|
|
|
a8262ca |
_dbus_return_val_if_fail (message != NULL, FALSE);
|
|
|
a8262ca |
- _dbus_return_val_if_fail (interface != NULL, FALSE);
|
|
|
a8262ca |
+ _dbus_return_val_if_fail (iface != NULL, FALSE);
|
|
|
a8262ca |
_dbus_return_val_if_fail (signal_name != NULL, FALSE);
|
|
|
a8262ca |
/* don't check that interface/name are valid since it would be
|
|
|
a8262ca |
* expensive, and not catch many common errors
|
|
|
a8262ca |
@@ -3575,7 +3575,7 @@ dbus_message_is_signal (DBusMessage *message,
|
|
|
a8262ca |
|
|
|
a8262ca |
return _dbus_message_has_type_interface_member (message,
|
|
|
a8262ca |
DBUS_MESSAGE_TYPE_SIGNAL,
|
|
|
a8262ca |
- interface, signal_name);
|
|
|
a8262ca |
+ iface, signal_name);
|
|
|
a8262ca |
}
|
|
|
a8262ca |
|
|
|
a8262ca |
/**
|
|
|
a8262ca |
diff --git a/dbus/dbus-message.h b/dbus/dbus-message.h
|
|
|
a8262ca |
index 5500492..4fd44da 100644
|
|
|
a8262ca |
--- a/dbus/dbus-message.h
|
|
|
a8262ca |
+++ b/dbus/dbus-message.h
|
|
|
a8262ca |
@@ -71,13 +71,13 @@ DBusMessage* dbus_message_new (int message_type);
|
|
|
a8262ca |
DBUS_EXPORT
|
|
|
a8262ca |
DBusMessage* dbus_message_new_method_call (const char *bus_name,
|
|
|
a8262ca |
const char *path,
|
|
|
a8262ca |
- const char *interface,
|
|
|
a8262ca |
+ const char *iface,
|
|
|
a8262ca |
const char *method);
|
|
|
a8262ca |
DBUS_EXPORT
|
|
|
a8262ca |
DBusMessage* dbus_message_new_method_return (DBusMessage *method_call);
|
|
|
a8262ca |
DBUS_EXPORT
|
|
|
a8262ca |
DBusMessage* dbus_message_new_signal (const char *path,
|
|
|
a8262ca |
- const char *interface,
|
|
|
a8262ca |
+ const char *iface,
|
|
|
a8262ca |
const char *name);
|
|
|
a8262ca |
DBUS_EXPORT
|
|
|
a8262ca |
DBusMessage* dbus_message_new_error (DBusMessage *reply_to,
|
|
|
a8262ca |
@@ -108,12 +108,12 @@ dbus_bool_t dbus_message_has_path (DBusMessage *message,
|
|
|
a8262ca |
const char *object_path);
|
|
|
a8262ca |
DBUS_EXPORT
|
|
|
a8262ca |
dbus_bool_t dbus_message_set_interface (DBusMessage *message,
|
|
|
a8262ca |
- const char *interface);
|
|
|
a8262ca |
+ const char *iface);
|
|
|
a8262ca |
DBUS_EXPORT
|
|
|
a8262ca |
const char* dbus_message_get_interface (DBusMessage *message);
|
|
|
a8262ca |
DBUS_EXPORT
|
|
|
a8262ca |
dbus_bool_t dbus_message_has_interface (DBusMessage *message,
|
|
|
a8262ca |
- const char *interface);
|
|
|
a8262ca |
+ const char *iface);
|
|
|
a8262ca |
DBUS_EXPORT
|
|
|
a8262ca |
dbus_bool_t dbus_message_set_member (DBusMessage *message,
|
|
|
a8262ca |
const char *member);
|
|
|
a8262ca |
@@ -146,11 +146,11 @@ DBUS_EXPORT
|
|
|
a8262ca |
dbus_bool_t dbus_message_get_no_reply (DBusMessage *message);
|
|
|
a8262ca |
DBUS_EXPORT
|
|
|
a8262ca |
dbus_bool_t dbus_message_is_method_call (DBusMessage *message,
|
|
|
a8262ca |
- const char *interface,
|
|
|
a8262ca |
+ const char *iface,
|
|
|
a8262ca |
const char *method);
|
|
|
a8262ca |
DBUS_EXPORT
|
|
|
a8262ca |
dbus_bool_t dbus_message_is_signal (DBusMessage *message,
|
|
|
a8262ca |
- const char *interface,
|
|
|
a8262ca |
+ const char *iface,
|
|
|
a8262ca |
const char *signal_name);
|
|
|
a8262ca |
DBUS_EXPORT
|
|
|
a8262ca |
dbus_bool_t dbus_message_is_error (DBusMessage *message,
|
|
|
a8262ca |
--
|
|
|
a8262ca |
1.8.3.1
|
|
|
a8262ca |
|