fdo-mirrors/dbus
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/dbus/dbus.git synced 2026-01-05 03:10:15 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

2003-07-13 Havoc Pennington <hp@pobox.com>

Browse source 
* dbus/dbus-object.h (struct DBusObjectVTable): add padding
	fields to DBusObjectVTable and DBusObjectInfo
This commit is contained in:
Havoc Pennington 2003-07-17 01:10:57 +00:00
parent f1ee877d76
commit 8b7fe6f99d
4 changed files with 21 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
2003-07-13 Havoc Pennington <hp@pobox.com>
* dbus/dbus-object.h (struct DBusObjectVTable): add padding
fields to DBusObjectVTable and DBusObjectInfo
2003-07-12 Havoc Pennington <hp@pobox.com>
* dbus/dbus-object-registry.c: implement unit test,

8
dbus/dbus-connection.c
View file

@ -2791,8 +2791,12 @@ dbus_connection_register_object (DBusConnection *connection,
void *object_impl,
DBusObjectID *object_id)
{
_dbus_return_val_if_fail (connection != NULL, FALSE);
_dbus_return_val_if_fail (connection != NULL, FALSE);
_dbus_return_val_if_fail (vtable != NULL, FALSE);
_dbus_return_val_if_fail (vtable->dbus_internal_pad1 == NULL);
_dbus_return_val_if_fail (vtable->dbus_internal_pad2 == NULL);
_dbus_return_val_if_fail (vtable->dbus_internal_pad3 == NULL);
CONNECTION_LOCK (connection);
return _dbus_object_registry_add_and_unlock (connection->objects,

3
dbus/dbus-object.c
View file

@ -136,7 +136,8 @@ callback_object_message (DBusObjectInfo *info,
static const DBusObjectVTable callback_object_vtable = {
callback_object_registered,
callback_object_unregistered,
callback_object_message
callback_object_message,
NULL, NULL, NULL
};
/**

11
dbus/dbus-object.h
View file

@ -47,9 +47,11 @@ typedef enum
struct DBusObjectInfo
{
void *object_impl; /**< Object information */
DBusObjectID object_id;
DBusConnection *connection;
void *object_impl; /**< Object implementation pointer provided by app */
DBusObjectID object_id; /**< Object ID */
DBusConnection *connection; /**< The connection object ID is for */
void *dbus_internal_pad1; /**< Padding, do not use */
void *dbus_internal_pad2; /**< Padding, do not use */
};
typedef void (* DBusObjectRegisteredFunction) (DBusObjectInfo *info);
@ -62,6 +64,9 @@ struct DBusObjectVTable
DBusObjectRegisteredFunction registered;
DBusObjectUnregisteredFunction unregistered;
DBusObjectMessageFunction message;
void (* dbus_internal_pad1) (void *);
void (* dbus_internal_pad2) (void *);
void (* dbus_internal_pad3) (void *);
};
extern const DBusObjectVTable *dbus_callback_object_vtable;