Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
S
systemd
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Labels
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Commits
Open sidebar
steam
systemd
Commits
f10dda3b
Commit
f10dda3b
authored
Apr 05, 2013
by
Lennart Poettering
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
bus: add convenience calls for method replies, too
parent
88d331d5
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
65 additions
and
0 deletions
+65
-0
src/libsystemd-bus/sd-bus.c
src/libsystemd-bus/sd-bus.c
+63
-0
src/systemd/sd-bus.h
src/systemd/sd-bus.h
+2
-0
No files found.
src/libsystemd-bus/sd-bus.c
View file @
f10dda3b
...
...
@@ -2265,3 +2265,66 @@ int sd_bus_call_method(
return
sd_bus_send_with_reply_and_block
(
bus
,
m
,
0
,
error
,
reply
);
}
int
sd_bus_reply_method_return
(
sd_bus
*
bus
,
sd_bus_message
*
call
,
const
char
*
types
,
...)
{
_cleanup_bus_message_unref_
sd_bus_message
*
m
=
NULL
;
va_list
ap
;
int
r
;
if
(
!
bus
)
return
-
EINVAL
;
if
(
!
call
)
return
-
EINVAL
;
if
(
!
call
->
sealed
)
return
-
EPERM
;
if
(
call
->
header
->
type
!=
SD_BUS_MESSAGE_TYPE_METHOD_CALL
)
return
-
EINVAL
;
if
(
call
->
header
->
flags
&
SD_BUS_MESSAGE_NO_REPLY_EXPECTED
)
return
0
;
r
=
sd_bus_message_new_method_return
(
bus
,
call
,
&
m
);
if
(
r
<
0
)
return
r
;
va_start
(
ap
,
types
);
r
=
bus_message_append_ap
(
m
,
types
,
ap
);
va_end
(
ap
);
if
(
r
<
0
)
return
r
;
return
sd_bus_send
(
bus
,
m
,
NULL
);
}
int
sd_bus_reply_method_error
(
sd_bus
*
bus
,
sd_bus_message
*
call
,
const
sd_bus_error
*
e
)
{
_cleanup_bus_message_unref_
sd_bus_message
*
m
=
NULL
;
int
r
;
if
(
!
bus
)
return
-
EINVAL
;
if
(
!
call
)
return
-
EINVAL
;
if
(
!
call
->
sealed
)
return
-
EPERM
;
if
(
call
->
header
->
type
!=
SD_BUS_MESSAGE_TYPE_METHOD_CALL
)
return
-
EINVAL
;
if
(
!
sd_bus_error_is_set
(
e
))
return
-
EINVAL
;
if
(
call
->
header
->
flags
&
SD_BUS_MESSAGE_NO_REPLY_EXPECTED
)
return
0
;
r
=
sd_bus_message_new_method_error
(
bus
,
call
,
e
,
&
m
);
if
(
r
<
0
)
return
r
;
return
sd_bus_send
(
bus
,
m
,
NULL
);
}
src/systemd/sd-bus.h
View file @
f10dda3b
...
...
@@ -149,6 +149,8 @@ int sd_bus_message_rewind(sd_bus_message *m, int complete);
int
sd_bus_emit_signal
(
sd_bus
*
bus
,
const
char
*
path
,
const
char
*
interface
,
const
char
*
member
,
const
char
*
types
,
...);
int
sd_bus_call_method
(
sd_bus
*
bus
,
const
char
*
destination
,
const
char
*
path
,
const
char
*
interface
,
const
char
*
member
,
sd_bus_error
*
error
,
sd_bus_message
**
reply
,
const
char
*
types
,
...);
int
sd_bus_reply_method_return
(
sd_bus
*
bus
,
sd_bus_message
*
call
,
const
char
*
types
,
...);
int
sd_bus_reply_method_error
(
sd_bus
*
bus
,
sd_bus_message
*
call
,
const
sd_bus_error
*
e
);
/* Bus management */
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment