diff options
| author | Lennart Poettering <lennart@poettering.net> | 2017-12-19 15:45:30 +0100 |
|---|---|---|
| committer | Sven Eden <yamakuzure@gmx.net> | 2018-05-30 07:49:59 +0200 |
| commit | 4e6c30f09491bfae763107482d76c4af4f9f6681 (patch) | |
| tree | 75d9c86957753f48cd856e65a5cf3638bc66527e /src/libelogind/sd-bus | |
| parent | 20b20d0c3c2109840a83f435818d033dbe027a14 (diff) | |
sd-bus: modernize how we generate the match string in sd-bus-track
strjoina() FTW!
Diffstat (limited to 'src/libelogind/sd-bus')
| -rw-r--r-- | src/libelogind/sd-bus/bus-track.c | 26 |
1 files changed, 7 insertions, 19 deletions
diff --git a/src/libelogind/sd-bus/bus-track.c b/src/libelogind/sd-bus/bus-track.c index 919cebda0..0dd06e9b9 100644 --- a/src/libelogind/sd-bus/bus-track.c +++ b/src/libelogind/sd-bus/bus-track.c @@ -48,25 +48,13 @@ struct sd_bus_track { LIST_FIELDS(sd_bus_track, tracks); }; -#define MATCH_PREFIX \ - "type='signal'," \ - "sender='org.freedesktop.DBus'," \ - "path='/org/freedesktop/DBus'," \ - "interface='org.freedesktop.DBus'," \ - "member='NameOwnerChanged'," \ - "arg0='" - -#define MATCH_SUFFIX \ - "'" - -#define MATCH_FOR_NAME(name) \ - ({ \ - char *_x; \ - size_t _l = strlen(name); \ - _x = alloca(STRLEN(MATCH_PREFIX)+_l+STRLEN(MATCH_SUFFIX)+1); \ - strcpy(stpcpy(stpcpy(_x, MATCH_PREFIX), name), MATCH_SUFFIX); \ - _x; \ - }) +#define MATCH_FOR_NAME(name) \ + strjoina("type='signal'," \ + "sender='org.freedesktop.DBus'," \ + "path='/org/freedesktop/DBus'," \ + "interface='org.freedesktop.DBus'," \ + "member='NameOwnerChanged'," \ + "arg0='", name, "'") static struct track_item* track_item_free(struct track_item *i) { |