diff options
author | mvglasow <michael -at- vonglasow.com> | 2018-06-11 00:02:12 +0200 |
---|---|---|
committer | mvglasow <michael -at- vonglasow.com> | 2018-06-11 00:02:12 +0200 |
commit | aea6489afff65b85593db83fe8a661bceb80147c (patch) | |
tree | 5591b0c618d2a33584f3542628744af4e3bf38ef /navit/announcement.c | |
parent | ad318d7fec18389e9cf1810b7470c4cf1377f836 (diff) | |
parent | 07006013135b619029f26df579a0ac6acb86cd4a (diff) | |
download | navit-aea6489afff65b85593db83fe8a661bceb80147c.tar.gz |
Merge branch 'trunk' into traffic
# Conflicts:
# navit/binding/dbus/binding_dbus.c
# navit/gui/internal/gui_internal_html.c
# navit/route.c
# navit/util.c
# navit/xmlconfig.c
Diffstat (limited to 'navit/announcement.c')
-rw-r--r-- | navit/announcement.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/navit/announcement.c b/navit/announcement.c index 0d79ae9bf..c823fe1e1 100644 --- a/navit/announcement.c +++ b/navit/announcement.c @@ -38,25 +38,21 @@ announcement_new(struct attr *parent, struct attr **attrs) { return this_; } -int -announcement_get_attr(struct announcement *this_, enum attr_type type, struct attr *attr, struct attr_iter *iter) { +int announcement_get_attr(struct announcement *this_, enum attr_type type, struct attr *attr, struct attr_iter *iter) { return attr_generic_get_attr(this_->attrs, NULL, type, attr, iter); } -int -announcement_set_attr(struct announcement *this_, struct attr *attr) { +int announcement_set_attr(struct announcement *this_, struct attr *attr) { this_->attrs=attr_generic_set_attr(this_->attrs, attr); return 1; } -int -announcement_add_attr(struct announcement *this_, struct attr *attr) { +int announcement_add_attr(struct announcement *this_, struct attr *attr) { this_->attrs=attr_generic_add_attr(this_->attrs, attr); return 1; } -int -announcement_remove_attr(struct announcement *this_, struct attr *attr) { +int announcement_remove_attr(struct announcement *this_, struct attr *attr) { this_->attrs=attr_generic_remove_attr(this_->attrs, attr); return 1; } |