chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
2e5a04d
)
bus-message: use streq_ptr() (#8786)
author
Yu Watanabe
<watanabe.yu+github@gmail.com>
Mon, 23 Apr 2018 08:13:26 +0000
(17:13 +0900)
committer
Sven Eden
<yamakuzure@gmx.net>
Fri, 24 Aug 2018 14:47:08 +0000
(16:47 +0200)
src/libelogind/sd-bus/bus-message.c
patch
|
blob
|
history
diff --git
a/src/libelogind/sd-bus/bus-message.c
b/src/libelogind/sd-bus/bus-message.c
index f48125e64701bcdee0b09d36eace11f467cb7101..b8c9eed5aa319c0600766eec71dc265f7e6d59a3 100644
(file)
--- a/
src/libelogind/sd-bus/bus-message.c
+++ b/
src/libelogind/sd-bus/bus-message.c
@@
-1071,10
+1071,10
@@
_public_ int sd_bus_message_is_signal(
if (m->header->type != SD_BUS_MESSAGE_SIGNAL)
return 0;
if (m->header->type != SD_BUS_MESSAGE_SIGNAL)
return 0;
- if (interface &&
(!m->interface || !streq(m->interface, interface)
))
+ if (interface &&
!streq_ptr(m->interface, interface
))
return 0;
return 0;
- if (member &&
(!m->member || !streq(m->member, member)
))
+ if (member &&
!streq_ptr(m->member, member
))
return 0;
return 1;
return 0;
return 1;
@@
-1090,10
+1090,10
@@
_public_ int sd_bus_message_is_method_call(
if (m->header->type != SD_BUS_MESSAGE_METHOD_CALL)
return 0;
if (m->header->type != SD_BUS_MESSAGE_METHOD_CALL)
return 0;
- if (interface &&
(!m->interface || !streq(m->interface, interface)
))
+ if (interface &&
!streq_ptr(m->interface, interface
))
return 0;
return 0;
- if (member &&
(!m->member || !streq(m->member, member)
))
+ if (member &&
!streq_ptr(m->member, member
))
return 0;
return 1;
return 0;
return 1;
@@
-1105,7
+1105,7
@@
_public_ int sd_bus_message_is_method_error(sd_bus_message *m, const char *name)
if (m->header->type != SD_BUS_MESSAGE_METHOD_ERROR)
return 0;
if (m->header->type != SD_BUS_MESSAGE_METHOD_ERROR)
return 0;
- if (name &&
(!m->error.name || !streq(m->error.name, name)
))
+ if (name &&
!streq_ptr(m->error.name, name
))
return 0;
return 1;
return 0;
return 1;