From a2ba2b1b5bb08996ac3b35c4ea5d22297a731b13 Mon Sep 17 00:00:00 2001 From: Simon Ser Date: Tue, 20 Jul 2021 19:40:20 +0200 Subject: [PATCH] drm: fix find_crtc_for_connector error return value The return type is uint32_t so we can't return -1. 0 is a perfectly fine error guard since DRM object IDs can't have this value. --- src/drm.cpp | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/src/drm.cpp b/src/drm.cpp index b3c0076..e3c9f6b 100644 --- a/src/drm.cpp +++ b/src/drm.cpp @@ -39,9 +39,7 @@ static int s_drm_log = 0; static uint32_t find_crtc_for_encoder(const drmModeRes *resources, const drmModeEncoder *encoder) { - int i; - - for (i = 0; i < resources->count_crtcs; i++) { + for (int i = 0; i < resources->count_crtcs; i++) { /* possible_crtcs is a bitmask as described here: * https://dvdhrm.wordpress.com/2012/09/13/linux-drm-mode-setting-api */ @@ -53,14 +51,12 @@ static uint32_t find_crtc_for_encoder(const drmModeRes *resources, } /* no match found */ - return -1; + return 0; } static uint32_t find_crtc_for_connector(const struct drm_t *drm, const drmModeRes *resources, const drmModeConnector *connector) { - int i; - - for (i = 0; i < connector->count_encoders; i++) { + for (int i = 0; i < connector->count_encoders; i++) { const uint32_t encoder_id = connector->encoders[i]; drmModeEncoder *encoder = drmModeGetEncoder(drm->fd, encoder_id); @@ -75,7 +71,7 @@ static uint32_t find_crtc_for_connector(const struct drm_t *drm, const drmModeRe } /* no match found */ - return -1; + return 0; } static int get_resources(int fd, drmModeRes **resources)