adafruit-mirror/zephyr
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 9

ARCMWDT: Fix cbprintf issue with omitted function prototype

Browse source 
MWDT requires function to be declared with argument types.
This PR provides explisitly type cast for out routine
inside z_cbvprintf_impl().

This PR also actual to LLVM-based compilers with strict
rules of compilation. It covers warnings generated with
additional flag -Wincompatible-function-pointer-types-strict.

This fixes https://github.com/zephyrproject-rtos/zephyr/issues/74562

Signed-off-by: Nikolay Agishev <agishev@synopsys.com>
This commit is contained in:
Nikolay Agishev 2024-06-19 19:13:26 +03:00 committed by Anas Nashif
parent 7b0784c1f6
commit 5d92abeaec
3 changed files with 12 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
include/zephyr/sys/cbprintf.h
View file

@ -302,6 +302,12 @@ typedef int (*cbprintf_cb)(int c, void *ctx);
typedef int (*cbprintf_cb)(/* int c, void *ctx */);
#endif
/* Create local cbprintf_cb type to make calng-based compilers happy when handles
* OUTC() macro (see below). With strict rules (Wincompatible-function-pointer-types-strict)
* it's prohibited to pass arguments with mismatched types.
*/
typedef int (*cbprintf_cb_local)(int c, void *ctx);
/** @brief Signature for a cbprintf multibyte callback function.
*
* @param buf data.

6
lib/os/cbprintf_complete.c
View file

@ -1345,12 +1345,13 @@ static inline void store_count(const struct conversion *conv,
}
/* Outline function to emit all characters in [sp, ep). */
static int outs(cbprintf_cb out,
static int outs(cbprintf_cb __out,
void *ctx,
const char *sp,
const char *ep)
{
size_t count = 0;
cbprintf_cb_local out = __out;
while ((sp < ep) || ((ep == NULL) && *sp)) {
int rc = out((int)*sp, ctx);
@ -1365,12 +1366,13 @@ static int outs(cbprintf_cb out,
return (int)count;
}
int z_cbvprintf_impl(cbprintf_cb out, void *ctx, const char *fp,
int z_cbvprintf_impl(cbprintf_cb __out, void *ctx, const char *fp,
va_list ap, uint32_t flags)
{
char buf[CONVERTED_BUFLEN];
size_t count = 0;
sint_value_type sint;
cbprintf_cb_local out = __out;
const bool tagged_ap = (flags & Z_CBVPRINTF_PROCESS_FLAG_TAGGED_ARGS)
== Z_CBVPRINTF_PROCESS_FLAG_TAGGED_ARGS;

3
lib/os/cbprintf_nano.c
View file

@ -73,7 +73,7 @@ static inline int convert_value(uint_value_type num, unsigned int base,
*
* @return printed byte count if CONFIG_CBPRINTF_LIBC_SUBSTS is set
*/
int z_cbvprintf_impl(cbprintf_cb out, void *ctx, const char *fmt,
int z_cbvprintf_impl(cbprintf_cb __out, void *ctx, const char *fmt,
va_list ap, uint32_t flags)
{
size_t count = 0;
@ -81,6 +81,7 @@ int z_cbvprintf_impl(cbprintf_cb out, void *ctx, const char *fmt,
char *prefix, *data;
int min_width, precision, data_len;
char padding_mode, length_mod, special;
cbprintf_cb_local out = __out;
const bool tagged_ap = (flags & Z_CBVPRINTF_PROCESS_FLAG_TAGGED_ARGS)
== Z_CBVPRINTF_PROCESS_FLAG_TAGGED_ARGS;