From c7e96dbe3217e5743872bb4e5fbba45ee2315a77 Mon Sep 17 00:00:00 2001 From: Xiang Xiao Date: Sun, 16 Jan 2022 17:47:34 +0800 Subject: [PATCH] Fix the nxstyle warning Signed-off-by: Xiang Xiao --- examples/nxterm/nxterm_internal.h | 5 +++-- examples/nxtext/nxtext_internal.h | 4 ++-- examples/usrsocktest/defines.h | 3 ++- netutils/thttpd/thttpd_strings.h | 8 +++++--- wireless/ieee802154/i8sak/i8sak_events.h | 8 ++++---- 5 files changed, 16 insertions(+), 12 deletions(-) diff --git a/examples/nxterm/nxterm_internal.h b/examples/nxterm/nxterm_internal.h index 963de8801..1baf76ee3 100644 --- a/examples/nxterm/nxterm_internal.h +++ b/examples/nxterm/nxterm_internal.h @@ -92,8 +92,8 @@ # define CONFIG_EXAMPLES_NXTERM_BPP 8 # elif !defined(CONFIG_NX_DISABLE_16BPP) # define CONFIG_EXAMPLES_NXTERM_BPP 16 -//#elif !defined(CONFIG_NX_DISABLE_24BPP) -//# define CONFIG_NXTERM_BPP 24 +# elif !defined(CONFIG_NX_DISABLE_24BPP) +# define CONFIG_EXAMPLES_NXTERM_BPP 24 # elif !defined(CONFIG_NX_DISABLE_32BPP) # define CONFIG_EXAMPLES_NXTERM_BPP 32 # else @@ -235,6 +235,7 @@ struct nxterm_state_s /**************************************************************************** * Public Data ****************************************************************************/ + /* All example global variables are retained in a structure to minimize * the chance of name collisions. */ diff --git a/examples/nxtext/nxtext_internal.h b/examples/nxtext/nxtext_internal.h index 88844112a..af271acef 100644 --- a/examples/nxtext/nxtext_internal.h +++ b/examples/nxtext/nxtext_internal.h @@ -69,8 +69,8 @@ # define CONFIG_EXAMPLES_NXTEXT_BPP 8 # elif !defined(CONFIG_NX_DISABLE_16BPP) # define CONFIG_EXAMPLES_NXTEXT_BPP 16 -//#elif !defined(CONFIG_NX_DISABLE_24BPP) -//# define CONFIG_NXTERM_BPP 24 +# elif !defined(CONFIG_NX_DISABLE_24BPP) +# define CONFIG_EXAMPLES_NXTEXT_BPP 24 # elif !defined(CONFIG_NX_DISABLE_32BPP) # define CONFIG_EXAMPLES_NXTEXT_BPP 32 # else diff --git a/examples/usrsocktest/defines.h b/examples/usrsocktest/defines.h index d2be13eaa..03320b8aa 100644 --- a/examples/usrsocktest/defines.h +++ b/examples/usrsocktest/defines.h @@ -183,7 +183,8 @@ bool usrsocktest_assert_print_buf(FAR const char *func, FAR const void *expect_buf, size_t buflen); -int usrsocktest_daemon_start(FAR const struct usrsocktest_daemon_conf_s *conf); +int usrsocktest_daemon_start( + FAR const struct usrsocktest_daemon_conf_s *conf); int usrsocktest_daemon_stop(void); diff --git a/netutils/thttpd/thttpd_strings.h b/netutils/thttpd/thttpd_strings.h index cb7e29faa..9b8d64d5a 100644 --- a/netutils/thttpd/thttpd_strings.h +++ b/netutils/thttpd/thttpd_strings.h @@ -7,8 +7,8 @@ * * Derived from the file of the same name in the original THTTPD package: * - * Copyright (C) 1995,1998,1999,2000,2001 by Jef Poskanzer . - * All rights reserved. + * Copyright (C) 1995,1998,1999,2000,2001 by Jef Poskanzer + * . All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -109,7 +109,9 @@ extern const char html_endhdr2[]; * Public Function Prototypes ****************************************************************************/ -/* Copies and decodes a string. It's ok for from and to to be the same string. */ +/* Copies and decodes a string. + * It's ok for from and to to be the same string. + */ void httpd_strdecode(char *to, char *from); diff --git a/wireless/ieee802154/i8sak/i8sak_events.h b/wireless/ieee802154/i8sak/i8sak_events.h index 0c63b4741..249264ed0 100644 --- a/wireless/ieee802154/i8sak/i8sak_events.h +++ b/wireless/ieee802154/i8sak/i8sak_events.h @@ -60,8 +60,8 @@ * Public Types ****************************************************************************/ -typedef void (*i8sak_eventcallback_t) (FAR struct ieee802154_primitive_s *primitive, - FAR void *arg); +typedef void (*i8sak_eventcallback_t)(FAR struct ieee802154_primitive_s * + primitive, FAR void *arg); struct i8sak_eventfilter_s { @@ -148,8 +148,8 @@ int i8sak_eventlistener_stop(FAR struct i8sak_s *i8sak); * Name: i8sak_eventlistener_addreceiver * * Description: - * Add an event receiver. An event receiver consists of a callback and flags - * for which events should be sent to the callback. + * Add an event receiver. An event receiver consists of a callback and + * flags for which events should be sent to the callback. * * Parameters: * handle - handle to the i8sak instance struct