blankie
/
wlroots
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #597 from agx/typos 

Fix some typos
This commit is contained in:
emersion 2018-01-30 18:14:46 +01:00 committed by GitHub
parent f152fdb4c5 c5aac77692
commit 429f06d3f1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
backend/drm/backend.c
View File

@ -119,7 +119,7 @@ struct wlr_backend *wlr_drm_backend_create(struct wl_display *display,
char *name = drmGetDeviceNameFromFd2(gpu_fd); char *name = drmGetDeviceNameFromFd2(gpu_fd);
drmVersion *version = drmGetVersion(gpu_fd); drmVersion *version = drmGetVersion(gpu_fd);
wlr_log(L_INFO, "Initalizing DRM backend for %s (%s)", name, version->name); wlr_log(L_INFO, "Initializing DRM backend for %s (%s)", name, version->name);
free(name); free(name);
drmFreeVersion(version); drmFreeVersion(version);

6
backend/drm/drm.c
View File

@ -469,7 +469,7 @@ static bool wlr_drm_connector_set_mode(struct wlr_output *output,
wlr_output_update_mode(&conn->output, mode); wlr_output_update_mode(&conn->output, mode);
// Since realloc_crtcs can deallocate planes on OTHER outputs, // Since realloc_crtcs can deallocate planes on OTHER outputs,
// we actually need to reinitalise any than has changed // we actually need to reinitialize any than has changed
ssize_t output_index = -1; ssize_t output_index = -1;
wl_list_for_each(conn, &drm->outputs, link) { wl_list_for_each(conn, &drm->outputs, link) {
output_index += 1; output_index += 1;
@ -483,7 +483,7 @@ static bool wlr_drm_connector_set_mode(struct wlr_output *output,
if (!wlr_drm_plane_surfaces_init(crtc->primary, drm, if (!wlr_drm_plane_surfaces_init(crtc->primary, drm,
mode->width, mode->height, GBM_FORMAT_XRGB8888)) { mode->width, mode->height, GBM_FORMAT_XRGB8888)) {
wlr_log(L_ERROR, "Failed to initalise renderer for plane"); wlr_log(L_ERROR, "Failed to initialize renderer for plane");
goto error_conn; goto error_conn;
} }
@ -949,7 +949,7 @@ void wlr_drm_connector_cleanup(struct wlr_drm_connector *conn) {
conn->possible_crtc = 0; conn->possible_crtc = 0;
/* Fallthrough */ /* Fallthrough */
case WLR_DRM_CONN_NEEDS_MODESET: case WLR_DRM_CONN_NEEDS_MODESET:
wlr_log(L_INFO, "Emmiting destruction signal for '%s'", wlr_log(L_INFO, "Emitting destruction signal for '%s'",
conn->output.name); conn->output.name);
wl_signal_emit(&drm->backend.events.output_remove, &conn->output); wl_signal_emit(&drm->backend.events.output_remove, &conn->output);
break; break;

2
meson.build
View File

@ -36,7 +36,7 @@ wlr_inc = include_directories('include')
cc = meson.get_compiler('c') cc = meson.get_compiler('c')
# Clang complains about some zeroed initialiser lists (= {0}), even though they # Clang complains about some zeroed initializer lists (= {0}), even though they
# are valid # are valid
if cc.get_id() == 'clang' if cc.get_id() == 'clang'
add_project_arguments('-Wno-missing-field-initializers', language: 'c') add_project_arguments('-Wno-missing-field-initializers', language: 'c')