diff options
| author | Havoc Pennington <hp@redhat.com> | 2003-07-07 00:47:01 +0000 |
|---|---|---|
| committer | Havoc Pennington <hp@redhat.com> | 2003-07-07 00:47:01 +0000 |
| commit | 3f1ad214b5e5c63697ee208d459b304a4ef6e79b (patch) | |
| tree | 9912979a2b6989b66c6812f21c24cdde698d032c /dbus/dbus-objectid.h | |
| parent | 320aac6ce610bfdeedebc39d26a6d27e957275f9 (diff) | |
2003-07-06 Havoc Pennington <hp@pobox.com>
* dbus/dbus-marshal.c (_dbus_marshal_set_object_id): new function
(_dbus_marshal_object_id): new
(_dbus_demarshal_object_id): new
(_dbus_marshal_get_arg_end_pos): support object ID type, and
consolidate identical switch cases. Don't conditionalize handling
of DBUS_TYPE_UINT64, need to handle the type always.
(_dbus_marshal_validate_arg): consolidate identical cases, and
handle DBUS_TYPE_OBJECT_ID
* dbus/dbus-objectid.c: new file with DBusObjectID data type.
* dbus/dbus-protocol.h: add DBUS_TYPE_OBJECT_ID
Diffstat (limited to 'dbus/dbus-objectid.h')
| -rw-r--r-- | dbus/dbus-objectid.h | 61 |
1 files changed, 61 insertions, 0 deletions
diff --git a/dbus/dbus-objectid.h b/dbus/dbus-objectid.h new file mode 100644 index 00000000..57346910 --- /dev/null +++ b/dbus/dbus-objectid.h @@ -0,0 +1,61 @@ +/* -*- mode: C; c-file-style: "gnu" -*- */ +/* dbus-objectid.h DBusObjectID type + * + * Copyright (C) 2003 Red Hat Inc. + * + * Licensed under the Academic Free License version 1.2 + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * + */ +#if !defined (DBUS_INSIDE_DBUS_H) && !defined (DBUS_COMPILATION) +#error "Only <dbus/dbus.h> can be included directly, this file may disappear or change contents." +#endif + +#ifndef DBUS_OBJECTID_H +#define DBUS_OBJECTID_H + +#include <dbus/dbus-arch-deps.h> +#include <dbus/dbus-types.h> + +typedef struct DBusObjectID DBusObjectID; + +struct DBusObjectID +{ +#ifdef DBUS_HAVE_INT64 + dbus_uint64_t dbus_do_not_use_dummy1; +#else + dbus_uint32_t dbus_do_not_use_dummy1; + dbus_uint32_t dbus_do_not_use_dummy2; +#endif +}; + +dbus_bool_t dbus_object_id_equal (const DBusObjectID *a, + const DBusObjectID *b); +int dbus_object_id_compare (const DBusObjectID *a, + const DBusObjectID *b); +dbus_uint32_t dbus_object_id_get_high_bits (const DBusObjectID *obj_id); +dbus_uint32_t dbus_object_id_get_low_bits (const DBusObjectID *obj_id); +void dbus_object_id_set_high_bits (DBusObjectID *obj_id, + dbus_uint32_t value); +void dbus_object_id_set_low_bits (DBusObjectID *obj_id, + dbus_uint32_t value); +#ifdef DBUS_HAVE_INT64 +dbus_uint64_t dbus_object_id_get_as_integer (const DBusObjectID *obj_id); +void dbus_object_id_set_as_integer (DBusObjectID *obj_id, + dbus_uint64_t value); +#endif + +#endif /* DBUS_OBJECTID_H */ |