mirror of git://git.sysmocom.de/ofono
gdbus: remove signature and reply from tables
This commit is contained in:
parent
e0d6f9f0ce
commit
7f2b69d7b8
|
@ -89,8 +89,6 @@ typedef struct {
|
||||||
|
|
||||||
typedef struct {
|
typedef struct {
|
||||||
const char *name;
|
const char *name;
|
||||||
const char *signature;
|
|
||||||
const char *reply;
|
|
||||||
GDBusMethodFunction function;
|
GDBusMethodFunction function;
|
||||||
GDBusMethodFlags flags;
|
GDBusMethodFlags flags;
|
||||||
unsigned int privilege;
|
unsigned int privilege;
|
||||||
|
@ -100,7 +98,6 @@ typedef struct {
|
||||||
|
|
||||||
typedef struct {
|
typedef struct {
|
||||||
const char *name;
|
const char *name;
|
||||||
const char *signature;
|
|
||||||
GDBusSignalFlags flags;
|
GDBusSignalFlags flags;
|
||||||
const GDBusArgInfo *args;
|
const GDBusArgInfo *args;
|
||||||
} GDBusSignalTable;
|
} GDBusSignalTable;
|
||||||
|
@ -120,63 +117,6 @@ typedef struct {
|
||||||
|
|
||||||
#define GDBUS_ARGS(args...) (const GDBusArgInfo[]) { args, { } }
|
#define GDBUS_ARGS(args...) (const GDBusArgInfo[]) { args, { } }
|
||||||
|
|
||||||
#define _GDBUS_METHOD(_name, _signature, _reply, _in_args, _out_args, _function) \
|
|
||||||
.name = _name, \
|
|
||||||
.signature = _signature, \
|
|
||||||
.reply = _reply, \
|
|
||||||
.in_args = _in_args, \
|
|
||||||
.out_args = _out_args, \
|
|
||||||
.function = _function
|
|
||||||
|
|
||||||
#define _GDBUS_ASYNC_METHOD(_name, _signature, _reply, _in_args, _out_args, _function) \
|
|
||||||
.name = _name, \
|
|
||||||
.signature = _signature, \
|
|
||||||
.reply = _reply, \
|
|
||||||
.in_args = _in_args, \
|
|
||||||
.out_args = _out_args, \
|
|
||||||
.function = _function, \
|
|
||||||
.flags = G_DBUS_METHOD_FLAG_ASYNC
|
|
||||||
|
|
||||||
#define _GDBUS_DEPRECATED_METHOD(_name, _signature, _reply, _in_args, _out_args, _function) \
|
|
||||||
.name = _name, \
|
|
||||||
.signature = _signature, \
|
|
||||||
.reply = _reply, \
|
|
||||||
.in_args = _in_args, \
|
|
||||||
.out_args = _out_args, \
|
|
||||||
.function = _function, \
|
|
||||||
.flags = G_DBUS_METHOD_FLAG_DEPRECATED
|
|
||||||
|
|
||||||
#define _GDBUS_DEPRECATED_ASYNC_METHOD(_name, _signature, _reply, _in_args, _out_args, _function) \
|
|
||||||
.name = _name, \
|
|
||||||
.signature = _signature, \
|
|
||||||
.reply = _reply, \
|
|
||||||
.in_args = _in_args, \
|
|
||||||
.out_args = _out_args, \
|
|
||||||
.function = _function, \
|
|
||||||
.flags = G_DBUS_METHOD_FLAG_ASYNC | G_DBUS_METHOD_FLAG_DEPRECATED
|
|
||||||
|
|
||||||
#define _GDBUS_NOREPLY_METHOD(_name, _signature, _reply, _in_args, _out_args, _function) \
|
|
||||||
.name = _name, \
|
|
||||||
.signature = _signature, \
|
|
||||||
.reply = _reply, \
|
|
||||||
.in_args = _in_args, \
|
|
||||||
.out_args = _out_args, \
|
|
||||||
.function = _function, \
|
|
||||||
.flags = G_DBUS_METHOD_FLAG_NOREPLY
|
|
||||||
|
|
||||||
#define _GDBUS_SIGNAL(_name, _signature, _args) \
|
|
||||||
.name = _name, \
|
|
||||||
.signature = _signature, \
|
|
||||||
.args = _args
|
|
||||||
|
|
||||||
#define _GDBUS_DEPRECATED_SIGNAL(_name, _signature, _args) \
|
|
||||||
.name = _name, \
|
|
||||||
.signature = _signature, \
|
|
||||||
.args = _args, \
|
|
||||||
.flags = G_DBUS_SIGNAL_FLAG_DEPRECATED
|
|
||||||
|
|
||||||
/* Helpers with no signature and reply */
|
|
||||||
|
|
||||||
#define GDBUS_METHOD(_name, _in_args, _out_args, _function) \
|
#define GDBUS_METHOD(_name, _in_args, _out_args, _function) \
|
||||||
.name = _name, \
|
.name = _name, \
|
||||||
.in_args = _in_args, \
|
.in_args = _in_args, \
|
||||||
|
|
|
@ -471,7 +471,7 @@ done:
|
||||||
}
|
}
|
||||||
|
|
||||||
static const GDBusMethodTable introspect_methods[] = {
|
static const GDBusMethodTable introspect_methods[] = {
|
||||||
{ _GDBUS_METHOD("Introspect", "", "s", NULL,
|
{ GDBUS_METHOD("Introspect", NULL,
|
||||||
GDBUS_ARGS({ "xml", "s" }), introspect) },
|
GDBUS_ARGS({ "xml", "s" }), introspect) },
|
||||||
{ }
|
{ }
|
||||||
};
|
};
|
||||||
|
|
Loading…
Reference in New Issue