shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2024-11-06 08:26:52 +03:00
Code

dbus-mount: use BUS_DEFINE_PROPERTY_GET* macros

Browse Source
This commit is contained in:
Yu Watanabe 2018-05-11 18:09:40 +09:00
parent 23c9a63a98
commit f724fd4c25
1 changed files with 17 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

79
src/core/dbus-mount.c
View File

@ -15,78 +15,33 @@
#include "string-util.h"
#include "unit.h"
static int property_get_what(
sd_bus *bus,
const char *path,
const char *interface,
const char *property,
sd_bus_message *reply,
void *userdata,
sd_bus_error *error) {
Mount *m = userdata;
const char *d = NULL;
assert(bus);
assert(reply);
assert(m);
static const char *mount_get_what(const Mount *m) {
if (m->from_proc_self_mountinfo && m->parameters_proc_self_mountinfo.what)
d = m->parameters_proc_self_mountinfo.what;
else if (m->from_fragment && m->parameters_fragment.what)
d = m->parameters_fragment.what;
return sd_bus_message_append(reply, "s", d);
return m->parameters_proc_self_mountinfo.what;
if (m->from_fragment && m->parameters_fragment.what)
return m->parameters_fragment.what;
return NULL;
}
static int property_get_options(
sd_bus *bus,
const char *path,
const char *interface,
const char *property,
sd_bus_message *reply,
void *userdata,
sd_bus_error *error) {
Mount *m = userdata;
const char *d = NULL;
assert(bus);
assert(reply);
assert(m);
static const char *mount_get_options(const Mount *m) {
if (m->from_proc_self_mountinfo && m->parameters_proc_self_mountinfo.options)
d = m->parameters_proc_self_mountinfo.options;
else if (m->from_fragment && m->parameters_fragment.options)
d = m->parameters_fragment.options;
return sd_bus_message_append(reply, "s", d);
return m->parameters_proc_self_mountinfo.options;
if (m->from_fragment && m->parameters_fragment.options)
return m->parameters_fragment.options;
return NULL;
}
static int property_get_type(
sd_bus *bus,
const char *path,
const char *interface,
const char *property,
sd_bus_message *reply,
void *userdata,
sd_bus_error *error) {
const char *fstype = NULL;
Mount *m = userdata;
assert(bus);
assert(reply);
assert(m);
static const char *mount_get_fstype(const Mount *m) {
if (m->from_proc_self_mountinfo && m->parameters_proc_self_mountinfo.fstype)
fstype = m->parameters_proc_self_mountinfo.fstype;
return m->parameters_proc_self_mountinfo.fstype;
else if (m->from_fragment && m->parameters_fragment.fstype)
fstype = m->parameters_fragment.fstype;
return sd_bus_message_append(reply, "s", fstype);
return m->parameters_fragment.fstype;
return NULL;
}
static BUS_DEFINE_PROPERTY_GET(property_get_what, "s", Mount, mount_get_what);
static BUS_DEFINE_PROPERTY_GET(property_get_options, "s", Mount, mount_get_options);
static BUS_DEFINE_PROPERTY_GET(property_get_type, "s", Mount, mount_get_fstype);
static BUS_DEFINE_PROPERTY_GET_ENUM(property_get_result, mount_result, MountResult);
const sd_bus_vtable bus_mount_vtable[] = {