Andrew Geissler | 7e0e3c0 | 2022-02-25 20:34:39 +0000 | [diff] [blame^] | 1 | From 2241edc8b70c2a54d109ac9c0e821889ac138d40 Mon Sep 17 00:00:00 2001 |
| 2 | From: Khem Raj <raj.khem@gmail.com> |
| 3 | Date: Thu, 27 Jan 2022 22:49:52 -0800 |
| 4 | Subject: [PATCH] cecloader: Match return type of function LibCecBootloader |
| 5 | |
| 6 | Fixes |
| 7 | include/cecloader.h:175:14: error: cannot initialize return object of type 'bool' with an rvalue of type 'nullptr_t' |
| 8 | return NULL; |
| 9 | ^~~~ |
| 10 | |
| 11 | Upstream-Status: Pending |
| 12 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
| 13 | --- |
| 14 | include/cecloader.h | 4 ++-- |
| 15 | 1 file changed, 2 insertions(+), 2 deletions(-) |
| 16 | |
| 17 | diff --git a/include/cecloader.h b/include/cecloader.h |
| 18 | index be76468f..550f598e 100644 |
| 19 | --- a/include/cecloader.h |
| 20 | +++ b/include/cecloader.h |
| 21 | @@ -172,7 +172,7 @@ bool LibCecBootloader(const char *strLib = NULL) |
| 22 | if (!g_libCEC) |
| 23 | { |
| 24 | std::cout << dlerror() << std::endl; |
| 25 | - return NULL; |
| 26 | + return false; |
| 27 | } |
| 28 | } |
| 29 | |
| 30 | @@ -181,7 +181,7 @@ bool LibCecBootloader(const char *strLib = NULL) |
| 31 | if (!LibCecBootloader) |
| 32 | { |
| 33 | std::cout << "cannot find CECStartBootloader" << std::endl; |
| 34 | - return NULL; |
| 35 | + return false; |
| 36 | } |
| 37 | |
| 38 | bool bReturn = LibCecBootloader(); |
| 39 | -- |
| 40 | 2.35.0 |
| 41 | |