diff options
| author | emersion <contact@emersion.fr> | 2017-11-17 23:29:47 +0100 |
|---|---|---|
| committer | emersion <contact@emersion.fr> | 2017-11-17 23:29:47 +0100 |
| commit | 27937add762bb2594828ac678859bfdde4275f1e (patch) | |
| tree | aa9813fd534d019a5e967ffad31d153d30ae7fa1 /backend/session | |
| parent | 3e3209cba22c9a5a562acc5e543946408a36e2f4 (diff) | |
| parent | bf5640db128b930b38ebca2b1d8a79e028ad9f39 (diff) | |
Merge branch 'master' into laggy-move-resize
Diffstat (limited to 'backend/session')
| -rw-r--r-- | backend/session/logind.c | 6 | ||||
| -rw-r--r-- | backend/session/session.c | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/backend/session/logind.c b/backend/session/logind.c index 42b48e94..daff75b6 100644 --- a/backend/session/logind.c +++ b/backend/session/logind.c @@ -123,7 +123,7 @@ static bool logind_change_vt(struct wlr_session *base, unsigned vt) { return ret >= 0; } -static bool find_sesion_path(struct logind_session *session) { +static bool find_session_path(struct logind_session *session) { int ret; sd_bus_message *msg = NULL; sd_bus_error error = SD_BUS_ERROR_NULL; @@ -303,7 +303,7 @@ static bool add_signal_matches(struct logind_session *session) { "member='%s'," "path='%s'"; - snprintf(str, sizeof(str), fmt, "Manager", "SesssionRemoved", "/org/freedesktop/login1"); + snprintf(str, sizeof(str), fmt, "Manager", "SessionRemoved", "/org/freedesktop/login1"); ret = sd_bus_add_match(session->bus, NULL, str, session_removed, session); if (ret < 0) { wlr_log(L_ERROR, "Failed to add D-Bus match: %s", strerror(-ret)); @@ -368,7 +368,7 @@ static struct wlr_session *logind_session_create(struct wl_display *disp) { goto error; } - if (!find_sesion_path(session)) { + if (!find_session_path(session)) { sd_bus_unref(session->bus); goto error; } diff --git a/backend/session/session.c b/backend/session/session.c index b14ca4d0..657558fd 100644 --- a/backend/session/session.c +++ b/backend/session/session.c @@ -249,7 +249,7 @@ static size_t explicit_find_gpus(struct wlr_session *session, } } while ((ptr = strtok_r(NULL, ":", &save))); - free(ptr); + free(gpus); return i; } @@ -257,7 +257,7 @@ static size_t explicit_find_gpus(struct wlr_session *session, * If it's not found, it returns the first valid GPU it finds. */ size_t wlr_session_find_gpus(struct wlr_session *session, - size_t ret_len, int ret[static ret_len]) { + size_t ret_len, int *ret) { const char *explicit = getenv("WLR_DRM_DEVICES"); if (explicit) { return explicit_find_gpus(session, ret_len, ret, explicit); |