picnoir
/
Systemd
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #16957 from poettering/sd-bus-proto-def-move 

three unrelated, minor fixes
This commit is contained in:
Zbigniew Jędrzejewski-Szmek 2020-09-05 12:06:15 +02:00 committed by GitHub
parent 836540070d 8d91b2206c
commit 7de6b05160
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/shared/ptyfwd.c
View File

@ -572,9 +572,11 @@ int pty_forward_set_priority(PTYForward *f, int64_t priority) {
int r;
assert(f);
r = sd_event_source_set_priority(f->stdin_event_source, priority);
if (r < 0)
return r;
if (f->stdin_event_source) {
r = sd_event_source_set_priority(f->stdin_event_source, priority);
if (r < 0)
return r;
}
r = sd_event_source_set_priority(f->stdout_event_source, priority);
if (r < 0)

4
src/shared/varlink.c
View File

@ -2212,9 +2212,7 @@ int varlink_server_listen_fd(VarlinkServer *s, int fd) {
};
if (s->event) {
_cleanup_(sd_event_source_unrefp) sd_event_source *es = NULL;
r = sd_event_add_io(s->event, &es, fd, EPOLLIN, connect_callback, ss);
r = sd_event_add_io(s->event, &ss->event_source, fd, EPOLLIN, connect_callback, ss);
if (r < 0)
return r;

6
src/systemd/sd-bus-protocol.h
View File

@ -94,6 +94,12 @@ enum {
#define SD_BUS_ERROR_INTERACTIVE_AUTHORIZATION_REQUIRED \
"org.freedesktop.DBus.Error.InteractiveAuthorizationRequired"
/* https://dbus.freedesktop.org/doc/dbus-specification.html#message-protocol-marshaling-signature */
#define SD_BUS_MAXIMUM_SIGNATURE_LENGTH 255
/* https://dbus.freedesktop.org/doc/dbus-specification.html#message-protocol-names */
#define SD_BUS_MAXIMUM_NAME_LENGTH 255
_SD_END_DECLARATIONS;
#endif

6
src/systemd/sd-bus.h
View File

@ -34,12 +34,6 @@ _SD_BEGIN_DECLARATIONS;
#define SD_BUS_DEFAULT_USER ((sd_bus *) 2)
#define SD_BUS_DEFAULT_SYSTEM ((sd_bus *) 3)
/* https://dbus.freedesktop.org/doc/dbus-specification.html#message-protocol-marshaling-signature */
#define SD_BUS_MAXIMUM_SIGNATURE_LENGTH 255
/* https://dbus.freedesktop.org/doc/dbus-specification.html#message-protocol-names */
#define SD_BUS_MAXIMUM_NAME_LENGTH 255
/* Types */
typedef struct sd_bus sd_bus;