You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nuttx.apache.org by ag...@apache.org on 2020/11/28 11:20:20 UTC
[incubator-nuttx-apps] 01/02: style/code: remove unnecessary
trailing whitespace
This is an automated email from the ASF dual-hosted git repository.
aguettouche pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx-apps.git
commit b5692d803421b2b3b64d534043f9b0fd5dedbdf6
Author: chao.an <an...@xiaomi.com>
AuthorDate: Sat Nov 28 14:58:55 2020 +0800
style/code: remove unnecessary trailing whitespace
N/A
Signed-off-by: chao.an <an...@xiaomi.com>
---
Makefile | 4 +-
canutils/candump/candump.c | 18 +-
canutils/cansend/cansend.c | 2 +-
canutils/libcanutils/lib.h | 4 +-
examples/elf/tests/helloxx/hello++5.cpp | 594 ++++++++++++++++----------------
examples/hdc1008_demo/Kconfig | 2 +-
wireless/bluetooth/nimble/Kconfig | 2 +-
wireless/bluetooth/nimble/Makefile | 4 +-
8 files changed, 315 insertions(+), 315 deletions(-)
diff --git a/Makefile b/Makefile
index f8225f0..1df35d3 100644
--- a/Makefile
+++ b/Makefile
@@ -51,7 +51,7 @@ SYMTABOBJ = $(SYMTABSRC:.c=$(OBJEXT))
all:
$(RM) $(BIN)
$(MAKE) $(BIN)
-
+
.PHONY: import install dirlinks export .depdirs preconfig depend clean distclean
.PHONY: context clean_context context_all register register_all
.PRECIOUS: $(BIN)
@@ -106,7 +106,7 @@ $(SYMTABSRC): $(foreach SDIR, $(CONFIGURED_APPS), $(SDIR)_all)
$(Q) for app in ${CONFIGURED_APPS}; do \
$(MAKE) -C "$${app}" archive ; \
done
- $(Q) $(MAKE) install
+ $(Q) $(MAKE) install
$(Q) $(APPDIR)$(DELIM)tools$(DELIM)mksymtab.sh $(BINDIR) >$@.tmp
$(Q) $(call TESTANDREPLACEFILE, $@.tmp, $@)
diff --git a/canutils/candump/candump.c b/canutils/candump/candump.c
index a166356..5bea919 100644
--- a/canutils/candump/candump.c
+++ b/canutils/candump/candump.c
@@ -104,7 +104,7 @@ static __u32 dropcnt[MAXSOCK];
static __u32 last_dropcnt[MAXSOCK];
static char devname[MAXIFNAMES][IFNAMSIZ+1];
static int dindex[MAXIFNAMES];
-static int max_devname_len; /* to prevent frazzled device name output */
+static int max_devname_len; /* to prevent frazzled device name output */
const int canfd_on = 1;
#define MAXANI 4
@@ -249,7 +249,7 @@ int main(int argc, char **argv)
struct timeval timeout, timeout_config = { 0, 0 }, *timeout_current = NULL;
FILE *logfile = NULL;
-#if 0 /* NuttX doesn't support these signals */
+#if 0 /* NuttX doesn't support these signals */
signal(SIGTERM, sigterm);
signal(SIGHUP, sigterm);
#endif
@@ -360,7 +360,7 @@ int main(int argc, char **argv)
print_usage(basename(argv[0]));
exit(0);
}
-
+
if (logfrmt && view) {
fprintf(stderr, "Log file format selected: Please disable ASCII/BINARY/SWAP options!\n");
exit(0);
@@ -458,14 +458,14 @@ int main(int argc, char **argv)
nptr = strchr(ptr, ','); /* update exit condition */
if (sscanf(ptr, "%" SCNx32 ":%" SCNx32,
- &rfilter[numfilter].can_id,
+ &rfilter[numfilter].can_id,
&rfilter[numfilter].can_mask) == 2) {
rfilter[numfilter].can_mask &= ~CAN_ERR_FLAG;
if (*(ptr+8) == ':')
rfilter[numfilter].can_id |= CAN_EFF_FLAG;
numfilter++;
} else if (sscanf(ptr, "%" SCNx32 "~%" SCNx32,
- &rfilter[numfilter].can_id,
+ &rfilter[numfilter].can_id,
&rfilter[numfilter].can_mask) == 2) {
rfilter[numfilter].can_id |= CAN_INV_FILTER;
rfilter[numfilter].can_mask &= ~CAN_ERR_FLAG;
@@ -635,7 +635,7 @@ int main(int argc, char **argv)
/* these settings may be modified by recvmsg() */
iov.iov_len = sizeof(frame);
msg.msg_namelen = sizeof(addr);
- msg.msg_controllen = sizeof(ctrlmsg);
+ msg.msg_controllen = sizeof(ctrlmsg);
msg.msg_flags = 0;
nbytes = recvmsg(s[i], &msg, 0);
@@ -661,7 +661,7 @@ int main(int argc, char **argv)
if (count && (--count == 0))
running = 0;
-
+
for (cmsg = CMSG_FIRSTHDR(&msg);
cmsg && (cmsg->cmsg_level == SOL_SOCKET);
cmsg = CMSG_NXTHDR(&msg,cmsg)) {
@@ -732,7 +732,7 @@ int main(int argc, char **argv)
}
goto out_fflush; /* no other output to stdout */
}
-
+
printf(" %s", (color>2)?col_on[idx%MAXCOL]:"");
switch (timestamp) {
@@ -768,7 +768,7 @@ int main(int argc, char **argv)
diff.tv_sec = diff.tv_usec = 0;
printf("(%03ju.%06ld) ",
(uintmax_t)diff.tv_sec, diff.tv_usec);
-
+
if (timestamp == 'd')
last_tv = tv; /* update for delta calculation */
}
diff --git a/canutils/cansend/cansend.c b/canutils/cansend/cansend.c
index 0a8e677..a629a4a 100644
--- a/canutils/cansend/cansend.c
+++ b/canutils/cansend/cansend.c
@@ -81,7 +81,7 @@ void print_usage_send(char *prg)
int main(int argc, char **argv)
{
- int s; /* can raw socket */
+ int s; /* can raw socket */
int required_mtu;
int mtu;
int enable_canfd = 1;
diff --git a/canutils/libcanutils/lib.h b/canutils/libcanutils/lib.h
index 24fd41e..97db405 100644
--- a/canutils/libcanutils/lib.h
+++ b/canutils/libcanutils/lib.h
@@ -48,8 +48,8 @@
#include <stdio.h>
/* Compatibility for NuttX */
-typedef uint8_t __u8;
-typedef uint32_t __u32;
+typedef uint8_t __u8;
+typedef uint32_t __u32;
/* buffer sizes for CAN frame string representations */
diff --git a/examples/elf/tests/helloxx/hello++5.cpp b/examples/elf/tests/helloxx/hello++5.cpp
index 165ac4c..db6cd69 100644
--- a/examples/elf/tests/helloxx/hello++5.cpp
+++ b/examples/elf/tests/helloxx/hello++5.cpp
@@ -1,297 +1,297 @@
-/////////////////////////////////////////////////////////////////////////////
-// examples/elf/tests/helloxx/hello++5.c
-//
-// Copyright (C) 2015 Gregory Nutt. All rights reserved.
-// Author: Gregory Nutt <gn...@nuttx.org>
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-//
-// 1. Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-// 2. Redistributions in binary form must reproduce the above copyright
-// notice, this list of conditions and the following disclaimer in
-// the documentation and/or other materials provided with the
-// distribution.
-// 3. Neither the name NuttX nor the names of its contributors may be
-// used to endorse or promote products derived from this software
-// without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
-// OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
-// AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-// POSSIBILITY OF SUCH DAMAGE.
-//
-/////////////////////////////////////////////////////////////////////////////
-//
-// This is an excessively complex version of "Hello, World" design to
-// illustrate some basic properties of C++:
-//
-// - Building a C++ program
-// - Streams / statically linked libstdc++
-// - Static constructor and destructors (in main program only)
-// - Exception handling
-//
-/////////////////////////////////////////////////////////////////////////////
-
-/////////////////////////////////////////////////////////////////////////////
-// Included Files
-/////////////////////////////////////////////////////////////////////////////
-
-#include <cstdio>
-#include <iostream>
-#include <string>
-
-#ifndef NULL
-# define NULL ((void*)0L)
-#endif
-
-/////////////////////////////////////////////////////////////////////////////
-// Private Classes
-/////////////////////////////////////////////////////////////////////////////
-
-using namespace std;
-
-// A hello world sayer class
-
-class CThingSayer
-{
- const char *szWhatToSay;
-public:
- CThingSayer(void);
- virtual ~CThingSayer(void);
- virtual void Initialize(const char *czSayThis);
- virtual void SayThing(void);
- virtual void ThrowThing(void);
- virtual void ThrowMyThing(const char *czSayThis);
-};
-
-class MyException: public std::exception
-{
- std::string reason;
-
-public:
- virtual ~MyException() throw();
- MyException();
- MyException(std::string r);
-
- virtual const char *what() const throw();
-};
-
-/////////////////////////////////////////////////////////////////////////////
-// Private Data
-/////////////////////////////////////////////////////////////////////////////
-
-// A static instance of the CThingSayer class. This instance MUST
-// be constructed by the system BEFORE the program is started at
-// main() and must be destructed by the system AFTER the main()
-// returns to the system
-
-static CThingSayer MyThingSayer;
-
-/////////////////////////////////////////////////////////////////////////////
-// MyException Method Implementations
-/////////////////////////////////////////////////////////////////////////////
-
-MyException::MyException(std::string r = NULL) : reason(r)
-{
- if( r.length() > 0 )
- {
- cout << "MyException(" << r << "): constructing with reason." << endl;
- }
- else
- {
- cout << "MyException(): constructing." << endl;
- }
-}
-
-MyException::~MyException() throw()
-{
- cout << "~MyException(): destructing." << endl;
-}
-
-const char *MyException::what() const throw()
-{
- return reason.c_str();
-}
-
-/////////////////////////////////////////////////////////////////////////////
-// CThingSayer Method Implementations
-/////////////////////////////////////////////////////////////////////////////
-
-// These are implementations of the methods of the CThingSayer class
-
-CThingSayer::CThingSayer(void)
-{
- cout << "CThingSayer::CThingSayer: I am!" << endl;
- szWhatToSay = (const char*)NULL;
-}
-
-CThingSayer::~CThingSayer(void)
-{
- cout << "CThingSayer::~CThingSayer: I cease to be" << endl;
- if (szWhatToSay)
- {
- cout << "CThingSayer::~CThingSayer: I will never say '"
- << szWhatToSay << "' again" << endl;
- }
- szWhatToSay = (const char*)NULL;
-}
-
-void CThingSayer::Initialize(const char *czSayThis)
-{
- cout << "CThingSayer::Initialize: When told, I will say '"
- << czSayThis << "'" << endl;
- szWhatToSay = czSayThis;
-}
-
-void CThingSayer::SayThing(void)
-{
- cout << "CThingSayer::SayThing: I am now saying '"
- << szWhatToSay << "'" << endl;
-}
-
-void CThingSayer::ThrowThing(void)
-{
- cout << "CThingSayer::ThrowThing: I am now throwing an exception." << endl;
- throw exception();
-}
-
-void CThingSayer::ThrowMyThing(const char *czSayThis = NULL)
-{
- cout << "CThingSayer::ThrowMyThing: I am now throwing an MyException (with reason)." << endl;
- throw MyException( string(czSayThis) );
-}
-
-/////////////////////////////////////////////////////////////////////////////
-// Public Functions
-/////////////////////////////////////////////////////////////////////////////
-
-int main(int argc, char **argv)
-{
- // We should see the message from constructor, CThingSayer::CThingSayer(),
- // BEFORE we see the following messages. That is proof that the
- // C++ static initializer is working
-
- cout << "main: Started" << endl;
-
- // Tell MyThingSayer that "Hello, World!" is the string to be said
-
- cout << "main: Calling MyThingSayer.Initialize" << endl;
- MyThingSayer.Initialize("Hello, World!");
-
- // Tell MyThingSayer to say the thing we told it to say
-
- cout << "main: Calling MyThingSayer.SayThing" << endl;
- MyThingSayer.SayThing();
-
- // Test Static object throwing std::exception located in flash
-
- try
- {
- cout << "main: Calling MyThingSayer.ThrowThing (and catching it)" << endl;
- MyThingSayer.ThrowThing();
- }
-
- catch (const exception& e)
- {
- cout << "main: Caught exception: " << e.what() << endl;
- }
-
- // Test Static object throwing MyException shipped in the ELF and located in RAM.
-
- try
- {
- cout << "main: Calling MyThingSayer.ThrowMyThing (and catching it)" << endl;
- MyThingSayer.ThrowMyThing();
- }
-
- catch (const MyException& e)
- {
- cout << "main: Caught MyException: " << e.what() << endl;
- }
-
- // Testing with a local object
-
- CThingSayer localMyThingSayer;
-
- cout << "main: Calling localMyThingSayer.Initialize" << endl;
- localMyThingSayer.Initialize("Repeat in heap.");
- cout << "main: Calling localMyThingSayer.SayThing" << endl;
- localMyThingSayer.SayThing();
-
- // Test local object throwing std::exception located in flash
-
- try
- {
- cout << "main: Calling localMyThingSayer.ThrowThing (and catching it)" << endl;
- localMyThingSayer.ThrowThing();
- }
-
- catch (const exception& e)
- {
- cout << "main: Caught exception: " << e.what() << endl;
- }
-
- catch (const MyException& e)
- {
- cout << "main: Caught MyException: " << e.what() << endl;
- }
-
- // Test local object throwing MyException shipped in the ELF and located in RAM.
- // Also testing the action record selection logic trying different sorting of the
- // catch clauses
-
- try
- {
- cout << "main: Calling localMyThingSayer.ThrowMyThing (and catching it)" << endl;
- localMyThingSayer.ThrowMyThing();
- }
-
- catch (const exception& e)
- {
- cout << "main: Caught exception: " << e.what() << endl;
- }
-
- catch (const MyException& e)
- {
- cout << "main: Caught MyException: " << e.what() << endl;
- }
-
- // AGAING: Test local object throwing MyException shipped in the ELF and located in RAM.
- // Also testing the action record selection logic trying different sorting of the
- // catch clauses
-
- try
- {
- cout << "main: Calling localMyThingSayer.ThrowMyThing (and catching it)" << endl;
- localMyThingSayer.ThrowMyThing("Custom Reason.");
- }
-
- catch (const MyException& e)
- {
- cout << "main: Caught MyException: " << e.what() << endl;
- }
-
- catch (const exception& e)
- {
- cout << "main: Caught exception: " << e.what() << endl;
- }
-
- // We are finished, return. We should see the message from the
- // destructor, CThingSayer::~CThingSayer(), AFTER we see the following
- // message. That is proof that the C++ static destructor logic
- // is working
-
- cout << "main: Returning" << endl;
- return 0;
-}
+/////////////////////////////////////////////////////////////////////////////
+// examples/elf/tests/helloxx/hello++5.c
+//
+// Copyright (C) 2015 Gregory Nutt. All rights reserved.
+// Author: Gregory Nutt <gn...@nuttx.org>
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+//
+// 1. Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+// 2. Redistributions in binary form must reproduce the above copyright
+// notice, this list of conditions and the following disclaimer in
+// the documentation and/or other materials provided with the
+// distribution.
+// 3. Neither the name NuttX nor the names of its contributors may be
+// used to endorse or promote products derived from this software
+// without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
+// OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
+// AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+// LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+// POSSIBILITY OF SUCH DAMAGE.
+//
+/////////////////////////////////////////////////////////////////////////////
+//
+// This is an excessively complex version of "Hello, World" design to
+// illustrate some basic properties of C++:
+//
+// - Building a C++ program
+// - Streams / statically linked libstdc++
+// - Static constructor and destructors (in main program only)
+// - Exception handling
+//
+/////////////////////////////////////////////////////////////////////////////
+
+/////////////////////////////////////////////////////////////////////////////
+// Included Files
+/////////////////////////////////////////////////////////////////////////////
+
+#include <cstdio>
+#include <iostream>
+#include <string>
+
+#ifndef NULL
+# define NULL ((void*)0L)
+#endif
+
+/////////////////////////////////////////////////////////////////////////////
+// Private Classes
+/////////////////////////////////////////////////////////////////////////////
+
+using namespace std;
+
+// A hello world sayer class
+
+class CThingSayer
+{
+ const char *szWhatToSay;
+public:
+ CThingSayer(void);
+ virtual ~CThingSayer(void);
+ virtual void Initialize(const char *czSayThis);
+ virtual void SayThing(void);
+ virtual void ThrowThing(void);
+ virtual void ThrowMyThing(const char *czSayThis);
+};
+
+class MyException: public std::exception
+{
+ std::string reason;
+
+public:
+ virtual ~MyException() throw();
+ MyException();
+ MyException(std::string r);
+
+ virtual const char *what() const throw();
+};
+
+/////////////////////////////////////////////////////////////////////////////
+// Private Data
+/////////////////////////////////////////////////////////////////////////////
+
+// A static instance of the CThingSayer class. This instance MUST
+// be constructed by the system BEFORE the program is started at
+// main() and must be destructed by the system AFTER the main()
+// returns to the system
+
+static CThingSayer MyThingSayer;
+
+/////////////////////////////////////////////////////////////////////////////
+// MyException Method Implementations
+/////////////////////////////////////////////////////////////////////////////
+
+MyException::MyException(std::string r = NULL) : reason(r)
+{
+ if( r.length() > 0 )
+ {
+ cout << "MyException(" << r << "): constructing with reason." << endl;
+ }
+ else
+ {
+ cout << "MyException(): constructing." << endl;
+ }
+}
+
+MyException::~MyException() throw()
+{
+ cout << "~MyException(): destructing." << endl;
+}
+
+const char *MyException::what() const throw()
+{
+ return reason.c_str();
+}
+
+/////////////////////////////////////////////////////////////////////////////
+// CThingSayer Method Implementations
+/////////////////////////////////////////////////////////////////////////////
+
+// These are implementations of the methods of the CThingSayer class
+
+CThingSayer::CThingSayer(void)
+{
+ cout << "CThingSayer::CThingSayer: I am!" << endl;
+ szWhatToSay = (const char*)NULL;
+}
+
+CThingSayer::~CThingSayer(void)
+{
+ cout << "CThingSayer::~CThingSayer: I cease to be" << endl;
+ if (szWhatToSay)
+ {
+ cout << "CThingSayer::~CThingSayer: I will never say '"
+ << szWhatToSay << "' again" << endl;
+ }
+ szWhatToSay = (const char*)NULL;
+}
+
+void CThingSayer::Initialize(const char *czSayThis)
+{
+ cout << "CThingSayer::Initialize: When told, I will say '"
+ << czSayThis << "'" << endl;
+ szWhatToSay = czSayThis;
+}
+
+void CThingSayer::SayThing(void)
+{
+ cout << "CThingSayer::SayThing: I am now saying '"
+ << szWhatToSay << "'" << endl;
+}
+
+void CThingSayer::ThrowThing(void)
+{
+ cout << "CThingSayer::ThrowThing: I am now throwing an exception." << endl;
+ throw exception();
+}
+
+void CThingSayer::ThrowMyThing(const char *czSayThis = NULL)
+{
+ cout << "CThingSayer::ThrowMyThing: I am now throwing an MyException (with reason)." << endl;
+ throw MyException( string(czSayThis) );
+}
+
+/////////////////////////////////////////////////////////////////////////////
+// Public Functions
+/////////////////////////////////////////////////////////////////////////////
+
+int main(int argc, char **argv)
+{
+ // We should see the message from constructor, CThingSayer::CThingSayer(),
+ // BEFORE we see the following messages. That is proof that the
+ // C++ static initializer is working
+
+ cout << "main: Started" << endl;
+
+ // Tell MyThingSayer that "Hello, World!" is the string to be said
+
+ cout << "main: Calling MyThingSayer.Initialize" << endl;
+ MyThingSayer.Initialize("Hello, World!");
+
+ // Tell MyThingSayer to say the thing we told it to say
+
+ cout << "main: Calling MyThingSayer.SayThing" << endl;
+ MyThingSayer.SayThing();
+
+ // Test Static object throwing std::exception located in flash
+
+ try
+ {
+ cout << "main: Calling MyThingSayer.ThrowThing (and catching it)" << endl;
+ MyThingSayer.ThrowThing();
+ }
+
+ catch (const exception& e)
+ {
+ cout << "main: Caught exception: " << e.what() << endl;
+ }
+
+ // Test Static object throwing MyException shipped in the ELF and located in RAM.
+
+ try
+ {
+ cout << "main: Calling MyThingSayer.ThrowMyThing (and catching it)" << endl;
+ MyThingSayer.ThrowMyThing();
+ }
+
+ catch (const MyException& e)
+ {
+ cout << "main: Caught MyException: " << e.what() << endl;
+ }
+
+ // Testing with a local object
+
+ CThingSayer localMyThingSayer;
+
+ cout << "main: Calling localMyThingSayer.Initialize" << endl;
+ localMyThingSayer.Initialize("Repeat in heap.");
+ cout << "main: Calling localMyThingSayer.SayThing" << endl;
+ localMyThingSayer.SayThing();
+
+ // Test local object throwing std::exception located in flash
+
+ try
+ {
+ cout << "main: Calling localMyThingSayer.ThrowThing (and catching it)" << endl;
+ localMyThingSayer.ThrowThing();
+ }
+
+ catch (const exception& e)
+ {
+ cout << "main: Caught exception: " << e.what() << endl;
+ }
+
+ catch (const MyException& e)
+ {
+ cout << "main: Caught MyException: " << e.what() << endl;
+ }
+
+ // Test local object throwing MyException shipped in the ELF and located in RAM.
+ // Also testing the action record selection logic trying different sorting of the
+ // catch clauses
+
+ try
+ {
+ cout << "main: Calling localMyThingSayer.ThrowMyThing (and catching it)" << endl;
+ localMyThingSayer.ThrowMyThing();
+ }
+
+ catch (const exception& e)
+ {
+ cout << "main: Caught exception: " << e.what() << endl;
+ }
+
+ catch (const MyException& e)
+ {
+ cout << "main: Caught MyException: " << e.what() << endl;
+ }
+
+ // AGAING: Test local object throwing MyException shipped in the ELF and located in RAM.
+ // Also testing the action record selection logic trying different sorting of the
+ // catch clauses
+
+ try
+ {
+ cout << "main: Calling localMyThingSayer.ThrowMyThing (and catching it)" << endl;
+ localMyThingSayer.ThrowMyThing("Custom Reason.");
+ }
+
+ catch (const MyException& e)
+ {
+ cout << "main: Caught MyException: " << e.what() << endl;
+ }
+
+ catch (const exception& e)
+ {
+ cout << "main: Caught exception: " << e.what() << endl;
+ }
+
+ // We are finished, return. We should see the message from the
+ // destructor, CThingSayer::~CThingSayer(), AFTER we see the following
+ // message. That is proof that the C++ static destructor logic
+ // is working
+
+ cout << "main: Returning" << endl;
+ return 0;
+}
diff --git a/examples/hdc1008_demo/Kconfig b/examples/hdc1008_demo/Kconfig
index fbf736f..a52b254 100644
--- a/examples/hdc1008_demo/Kconfig
+++ b/examples/hdc1008_demo/Kconfig
@@ -7,5 +7,5 @@ config EXAMPLES_HDC1008
tristate "HDC1008 driver example"
default n
---help---
- Enable the example application
+ Enable the example application
diff --git a/wireless/bluetooth/nimble/Kconfig b/wireless/bluetooth/nimble/Kconfig
index 1ace6b5..f8a7f99 100644
--- a/wireless/bluetooth/nimble/Kconfig
+++ b/wireless/bluetooth/nimble/Kconfig
@@ -4,7 +4,7 @@ config NIMBLE
depends on !WIRELESS_BLUETOOTH_HOST
---help---
Enable Apache nimBLE Bluetooth Low Energy
- host-layer stack.
+ host-layer stack.
if NIMBLE
config NIMBLE_REF
diff --git a/wireless/bluetooth/nimble/Makefile b/wireless/bluetooth/nimble/Makefile
index 1edef9b..56443ad 100644
--- a/wireless/bluetooth/nimble/Makefile
+++ b/wireless/bluetooth/nimble/Makefile
@@ -35,7 +35,7 @@ $(NIMBLE_TAR):
$(NIMBLE_ROOT): $(NIMBLE_TAR)
tar zxf $(NIMBLE_TAR)
- mv mynewt-nimble-$(CONFIG_NIMBLE_REF) mynewt-nimble
+ mv mynewt-nimble-$(CONFIG_NIMBLE_REF) mynewt-nimble
context:: $(NIMBLE_ROOT)
@@ -43,5 +43,5 @@ distclean::
$(call CLEAN,$(NIMBLE_TAR))
$(call DELDIR,$(NIMBLE_ROOT))
-
+
include $(APPDIR)/Application.mk