michaelh/zephyr
1
0
Fork 0
Code Releases Activity

samples/drivers/display: Eliminate control flow in macro

Browse source 
Remove RETURN_FROM_MAIN macro which performed control flow, violating
compliance tests. Replace with explicit use of posix_exit_main or return as
appropriate.

Signed-off-by: Keith Packard <keithp@keithp.com>
This commit is contained in:
Keith Packard 2023-04-03 22:23:32 -07:00 • committed by Stephanos Ioannidis
commit f12853004e
1 changed files with 18 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

28
samples/drivers/display/src/main.c
View file

@ -18,12 +18,6 @@ LOG_MODULE_REGISTER(sample, LOG_LEVEL_INF);
#include "posix_board_if.h" #include "posix_board_if.h"
#endif #endif
#ifdef CONFIG_ARCH_POSIX
#define RETURN_FROM_MAIN(exit_code) posix_exit_main(exit_code)
#else
#define RETURN_FROM_MAIN(exit_code) return(exit_code)
#endif
enum corner { enum corner {
TOP_LEFT, TOP_LEFT,
TOP_RIGHT, TOP_RIGHT,
@ -184,7 +178,11 @@ int main(void)
if (!device_is_ready(display_dev)) { if (!device_is_ready(display_dev)) {
LOG_ERR("Device %s not found. Aborting sample.", LOG_ERR("Device %s not found. Aborting sample.",
display_dev->name); display_dev->name);
RETURN_FROM_MAIN(1); #ifdef CONFIG_ARCH_POSIX
posix_exit_main(1);
#else
return 0;
#endif
} }
LOG_INF("Display sample for %s", display_dev->name); LOG_INF("Display sample for %s", display_dev->name);
@ -240,14 +238,22 @@ int main(void)
break; break;
default: default:
LOG_ERR("Unsupported pixel format. Aborting sample."); LOG_ERR("Unsupported pixel format. Aborting sample.");
RETURN_FROM_MAIN(1); #ifdef CONFIG_ARCH_POSIX
posix_exit_main(1);
#else
return 0;
#endif
} }
buf = k_malloc(buf_size); buf = k_malloc(buf_size);
if (buf == NULL) { if (buf == NULL) {
LOG_ERR("Could not allocate memory. Aborting sample."); LOG_ERR("Could not allocate memory. Aborting sample.");
RETURN_FROM_MAIN(1); #ifdef CONFIG_ARCH_POSIX
posix_exit_main(1);
#else
return 0;
#endif
} }
(void)memset(buf, 0xFFu, buf_size); (void)memset(buf, 0xFFu, buf_size);
@ -298,6 +304,8 @@ int main(void)
#endif #endif
} }
RETURN_FROM_MAIN(0); #ifdef CONFIG_ARCH_POSIX
posix_exit_main(0);
#endif
return 0; return 0;
} }