diff options
author | Gregory Nutt <gnutt@nuttx.org> | 2014-04-13 16:24:28 -0600 |
---|---|---|
committer | Gregory Nutt <gnutt@nuttx.org> | 2014-04-13 16:24:28 -0600 |
commit | 43ec94a665e13552402ff4f102e0f65f6792cf29 (patch) | |
tree | 05da26d1bb5e364c1a388afd54630d5ae3ca4aa7 /apps | |
parent | 70b6bb22af51defd713adfd452309f32f0e523aa (diff) | |
download | px4-nuttx-43ec94a665e13552402ff4f102e0f65f6792cf29.tar.gz px4-nuttx-43ec94a665e13552402ff4f102e0f65f6792cf29.tar.bz2 px4-nuttx-43ec94a665e13552402ff4f102e0f65f6792cf29.zip |
More trailing whilespace removal
Diffstat (limited to 'apps')
285 files changed, 769 insertions, 769 deletions
diff --git a/apps/COPYING b/apps/COPYING index 7e8fd8407..89ccb6dc4 100644 --- a/apps/COPYING +++ b/apps/COPYING @@ -15,7 +15,7 @@ License for NuttX in general (authorship of individual files may vary): Author: Gregory Nutt <gnutt@nuttx.org> Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions +modification, are permitted provided that the following conditions are met: 1. Redistributions of source code must retain the above copyright @@ -31,13 +31,13 @@ are met: 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 +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 +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. diff --git a/apps/Makefile b/apps/Makefile index 3be4a1d99..17b14ce04 100644 --- a/apps/Makefile +++ b/apps/Makefile @@ -174,7 +174,7 @@ else echo "* The external directory/link must be removed manually *"; \ echo "********************************************************"; \ fi; \ - ) + ) endif diff --git a/apps/builtin/exec_builtin.c b/apps/builtin/exec_builtin.c index c262b43da..68fcbd487 100644 --- a/apps/builtin/exec_builtin.c +++ b/apps/builtin/exec_builtin.c @@ -133,7 +133,7 @@ int exec_builtin(FAR const char *appname, FAR char * const *argv, builtin = builtin_for_index(index); if (builtin == NULL) - { + { ret = ENOENT; goto errout_with_errno; } diff --git a/apps/examples/Makefile b/apps/examples/Makefile index 8b7b56b3d..3691ca664 100644 --- a/apps/examples/Makefile +++ b/apps/examples/Makefile @@ -40,7 +40,7 @@ SUBDIRS = adc buttons can cc3000 cxxtest dhcpd discover elf flash_test SUBDIRS += ftpc ftpd hello helloxx hidkbd igmp i2schar json keypadtest SUBDIRS += lcdrw mm modbus mount mtdpart nettest nrf24l01_term nsh null nx -SUBDIRS += nxconsole nxffs nxflat nxhello nximage nxlines nxtext ostest +SUBDIRS += nxconsole nxffs nxflat nxhello nximage nxlines nxtext ostest SUBDIRS += pashello pipe poll posix_spawn pwm qencoder random relays rgmp SUBDIRS += romfs sendmail serloop slcd smart smart_test tcpecho telnetd SUBDIRS += thttpd tiff touchscreen udp uip usbserial usbterm watchdog diff --git a/apps/examples/adc/Makefile b/apps/examples/adc/Makefile index 3cbe843f6..d786ea6dc 100644 --- a/apps/examples/adc/Makefile +++ b/apps/examples/adc/Makefile @@ -68,7 +68,7 @@ STACKSIZE = 2048 # Common build -VPATH = +VPATH = all: .built .PHONY: context clean depend distclean diff --git a/apps/examples/adc/adc_main.c b/apps/examples/adc/adc_main.c index b0ed43897..e78c00eac 100644 --- a/apps/examples/adc/adc_main.c +++ b/apps/examples/adc/adc_main.c @@ -176,7 +176,7 @@ static void parse_args(FAR struct adc_state_s *adc, int argc, FAR char **argv) long value; int index; int nargs; - + for (index = 1; index < argc; ) { ptr = argv[index]; @@ -209,7 +209,7 @@ static void parse_args(FAR struct adc_state_s *adc, int argc, FAR char **argv) case 'h': adc_help(adc); exit(0); - + default: message("Unsupported option: %s\n", ptr); adc_help(adc); diff --git a/apps/examples/buttons/Kconfig b/apps/examples/buttons/Kconfig index d145867fc..104cbe002 100644 --- a/apps/examples/buttons/Kconfig +++ b/apps/examples/buttons/Kconfig @@ -18,7 +18,7 @@ config EXAMPLES_BUTTONS_MAX int "Highest Button Number" default 7 -if ARCH_IRQBUTTONS +if ARCH_IRQBUTTONS config EXAMPLES_IRQBUTTONS_MIN int "Lowest Interrupting Button Number" default 0 diff --git a/apps/examples/buttons/Makefile b/apps/examples/buttons/Makefile index a2e8679d4..b7e4965df 100644 --- a/apps/examples/buttons/Makefile +++ b/apps/examples/buttons/Makefile @@ -68,7 +68,7 @@ STACKSIZE = 2048 # Common build -VPATH = +VPATH = all: .built .PHONY: context clean depend distclean diff --git a/apps/examples/buttons/buttons_main.c b/apps/examples/buttons/buttons_main.c index ab17cb5bc..04db19068 100644 --- a/apps/examples/buttons/buttons_main.c +++ b/apps/examples/buttons/buttons_main.c @@ -297,7 +297,7 @@ static void show_buttons(uint8_t oldset, uint8_t newset) } else { - state = "released"; + state = "released"; } /* Use lowsyslog() because we make be executing from an diff --git a/apps/examples/can/Makefile b/apps/examples/can/Makefile index 548c6702c..2abdd845b 100644 --- a/apps/examples/can/Makefile +++ b/apps/examples/can/Makefile @@ -68,7 +68,7 @@ STACKSIZE = 2048 # Common build -VPATH = +VPATH = all: .built .PHONY: context clean depend distclean diff --git a/apps/examples/can/can_main.c b/apps/examples/can/can_main.c index ff9e0a6ec..b3dd5aa48 100644 --- a/apps/examples/can/can_main.c +++ b/apps/examples/can/can_main.c @@ -250,9 +250,9 @@ int can_main(int argc, char *argv[]) if (memcmp(&txmsg.cm_hdr, &rxmsg.cm_hdr, sizeof(struct can_hdr_s)) != 0) { message("ERROR: Sent header does not match received header:\n"); - lib_dumpbuffer("Sent header", (FAR const uint8_t*)&txmsg.cm_hdr, + lib_dumpbuffer("Sent header", (FAR const uint8_t*)&txmsg.cm_hdr, sizeof(struct can_hdr_s)); - lib_dumpbuffer("Received header", (FAR const uint8_t*)&rxmsg.cm_hdr, + lib_dumpbuffer("Received header", (FAR const uint8_t*)&rxmsg.cm_hdr, sizeof(struct can_hdr_s)); errval = 4; goto errout_with_dev; @@ -270,7 +270,7 @@ int can_main(int argc, char *argv[]) } /* Report success */ - + message(" ID: %4d DLC: %d -- OK\n", msgid, msgdlc); #endif @@ -278,7 +278,7 @@ int can_main(int argc, char *argv[]) #ifndef CONFIG_EXAMPLES_CAN_READONLY msgdata += msgdlc; - + if (++msgid >= MAX_ID) { msgid = 1; diff --git a/apps/examples/cc3000/board.h b/apps/examples/cc3000/board.h index 61976b346..1646095dc 100644 --- a/apps/examples/cc3000/board.h +++ b/apps/examples/cc3000/board.h @@ -3,7 +3,7 @@ * This file is part of the ArduinoCC3000 library. * Version 1.0.1b -* +* * Copyright (C) 2013 Chris Magagna - cmagagna@yahoo.com * * Redistribution and use in source and binary forms, with or without @@ -15,10 +15,10 @@ * * This file is the main module for the Arduino CC3000 library. * Your program must call CC3000_Init() before any other API calls. -* +* ****************************************************************************/ -/* +/* Some things are different for the Teensy 3.0, so set a flag if we're using that hardware. */ @@ -39,7 +39,7 @@ to send the bits manually. For the Uno, Nano, etc. you can probably leave this unchanged. If your Arduino can't talk to the CC3000 and you're sure your wiring is OK then try changing this. */ - + #ifdef TEENSY3 #define USE_HARDWARE_SPI false #else @@ -54,7 +54,7 @@ -// These are the Arduino pins that connect to the CC3000 +// These are the Arduino pins that connect to the CC3000 // (in addition to standard SPI pins MOSI, MISO, and SCK) // // The WLAN_IRQ pin must be supported by attachInterrupt @@ -95,7 +95,7 @@ /* The timing between setting the CS pin and reading the IRQ pin is very tight on the CC3000, and sometimes the default Arduino digitalRead() - and digitalWrite() functions are just too slow. + and digitalWrite() functions are just too slow. For many of the CC3000 library functions this isn't a big deal because the IRQ pin is tied to an interrupt routine but some of them of them disable @@ -170,26 +170,26 @@ /* If you uncomment the line below the library will leave out a lot of the higher level functions but use a lot less memory. From: - + http://processors.wiki.ti.com/index.php/Tiny_Driver_Support - + CC3000's new driver has flexible memory compile options. - + This feature comes in handy when we want to use a limited RAM size MCU. - + Using The Tiny Driver Compilation option will create a tiny version of our host driver with lower data, stack and code consumption. - + By enabling this feature, host driver's RAM consumption can be reduced to minimum of 251 bytes. - + The Tiny host driver version will limit the host driver API to the most essential ones. - + Code size depends on actual APIs used. - + RAM size depends on the largest packet sent and received. - + CC3000 can now be used with ultra low cost MCUs, consuming 251 byte of RAM and 2K to 6K byte of code size, depending on the API usage. */ diff --git a/apps/examples/configdata/Makefile b/apps/examples/configdata/Makefile index e24a59d9a..cc989284a 100644 --- a/apps/examples/configdata/Makefile +++ b/apps/examples/configdata/Makefile @@ -62,7 +62,7 @@ ROOTDEPPATH = --dep-path . # Common build -VPATH = +VPATH = all: .built .PHONY: clean depend distclean diff --git a/apps/examples/cxxtest/Makefile b/apps/examples/cxxtest/Makefile index ecdc1d4fb..833cf0cc7 100644 --- a/apps/examples/cxxtest/Makefile +++ b/apps/examples/cxxtest/Makefile @@ -70,7 +70,7 @@ STACKSIZE = 4096 # Common build -VPATH = +VPATH = all: .built .PHONY: clean depend distclean chkcxx diff --git a/apps/examples/cxxtest/cxxtest_main.cxx b/apps/examples/cxxtest/cxxtest_main.cxx index 8c75e0fb8..364dc12ce 100644 --- a/apps/examples/cxxtest/cxxtest_main.cxx +++ b/apps/examples/cxxtest/cxxtest_main.cxx @@ -259,7 +259,7 @@ extern "C" #ifdef CONFIG_UCLIBCXX_EXCEPTION test_exception(); #endif - + return 0; } } diff --git a/apps/examples/dhcpd/Makefile b/apps/examples/dhcpd/Makefile index d718d79e1..73058dcaa 100644 --- a/apps/examples/dhcpd/Makefile +++ b/apps/examples/dhcpd/Makefile @@ -68,7 +68,7 @@ STACKSIZE = 2048 # Common build -VPATH = +VPATH = all: .built .PHONY: clean depend distclean diff --git a/apps/examples/dhcpd/target.c b/apps/examples/dhcpd/target.c index 37758d041..1434ae287 100644 --- a/apps/examples/dhcpd/target.c +++ b/apps/examples/dhcpd/target.c @@ -36,7 +36,7 @@ /**************************************************************************** * Included Files ****************************************************************************/ - + #include <nuttx/config.h> #include <stdint.h> @@ -124,7 +124,7 @@ int dhcpd_main(int argc, char *argv[]) uip_setnetmask("eth0", &addr); /* Then start the server */ - + dhcpd_run(); return 0; } diff --git a/apps/examples/discover/Makefile b/apps/examples/discover/Makefile index 033ab1131..a0fac4acf 100644 --- a/apps/examples/discover/Makefile +++ b/apps/examples/discover/Makefile @@ -69,7 +69,7 @@ ROOTDEPPATH = --dep-path . # Common build -VPATH = +VPATH = all: .built .PHONY: clean depend distclean diff --git a/apps/examples/elf/tests/Makefile b/apps/examples/elf/tests/Makefile index 755199506..17732c775 100644 --- a/apps/examples/elf/tests/Makefile +++ b/apps/examples/elf/tests/Makefile @@ -76,7 +76,7 @@ $(foreach DIR, $(BUILD_SUBDIRS), $(eval $(call DIR_template,$(DIR),build, all))) $(foreach DIR, $(ALL_SUBDIRS), $(eval $(call DIR_template,$(DIR),clean,clean))) $(foreach DIR, $(BUILD_SUBDIRS), $(eval $(call DIR_template,$(DIR),install,install))) -# Build program(s) in each sud-directory +# Build program(s) in each sud-directory build: $(foreach DIR, $(BUILD_SUBDIRS), $(DIR)_build) @@ -103,7 +103,7 @@ $(ROMFS_IMG): populate $(ROMFS_HDR) : $(ROMFS_IMG) $(Q) (cd $(TESTS_DIR); xxd -i romfs.img | sed -e "s/^unsigned/static const unsigned/g" >$@) -# Create the dirlist.h header file from the romfs directory +# Create the dirlist.h header file from the romfs directory $(DIRLIST_HDR) : populate $(Q) $(TESTS_DIR)/mkdirlist.sh $(ROMFS_DIR) >$@ diff --git a/apps/examples/elf/tests/hello/Makefile b/apps/examples/elf/tests/hello/Makefile index 5cd80411b..07f97bee9 100644 --- a/apps/examples/elf/tests/hello/Makefile +++ b/apps/examples/elf/tests/hello/Makefile @@ -50,7 +50,7 @@ $(BIN): $(OBJS) @echo "LD: $<" $(Q) $(LD) $(LDELFFLAGS) -o $@ $^ -clean: +clean: $(call DELFILE, $(BIN)) $(call CLEAN) diff --git a/apps/examples/elf/tests/helloxx/Makefile b/apps/examples/elf/tests/helloxx/Makefile index cce33d843..260475c5d 100644 --- a/apps/examples/elf/tests/helloxx/Makefile +++ b/apps/examples/elf/tests/helloxx/Makefile @@ -104,7 +104,7 @@ endif # @echo "LD: $<" # $(Q) $(LD) $(LDELFFLAGS) -o $@ $^ -clean: +clean: $(call DELFILE, $(BIN1)) $(call DELFILE, $(BIN2)) $(call DELFILE, $(BIN3)) diff --git a/apps/examples/elf/tests/helloxx/hello++2.cpp b/apps/examples/elf/tests/helloxx/hello++2.cpp index f1268dda5..5d4ba9923 100644 --- a/apps/examples/elf/tests/helloxx/hello++2.cpp +++ b/apps/examples/elf/tests/helloxx/hello++2.cpp @@ -61,7 +61,7 @@ public: printf("CThingSayer::CThingSayer: I am!\n"); szWhatToSay = (const char*)NULL; } - + ~CThingSayer(void) { printf("CThingSayer::~CThingSayer: I cease to be\n"); diff --git a/apps/examples/elf/tests/longjmp/Makefile b/apps/examples/elf/tests/longjmp/Makefile index 6ddbf9b8d..a0100b247 100644 --- a/apps/examples/elf/tests/longjmp/Makefile +++ b/apps/examples/elf/tests/longjmp/Makefile @@ -50,7 +50,7 @@ $(BIN): $(OBJS) @echo "LD: $<" $(Q) $(LD) $(LDELFFLAGS) -o $@ $^ -clean: +clean: $(call DELFILE, $(BIN)) $(call CLEAN) diff --git a/apps/examples/elf/tests/longjmp/longjmp.c b/apps/examples/elf/tests/longjmp/longjmp.c index 74d5594c4..8965440dc 100644 --- a/apps/examples/elf/tests/longjmp/longjmp.c +++ b/apps/examples/elf/tests/longjmp/longjmp.c @@ -77,7 +77,7 @@ static int leaf(int *some_arg) /* We should not get here */ - return -ERROR; + return -ERROR; } static int function(int some_arg) diff --git a/apps/examples/elf/tests/mutex/Makefile b/apps/examples/elf/tests/mutex/Makefile index 04c1e8975..e3085ad8e 100644 --- a/apps/examples/elf/tests/mutex/Makefile +++ b/apps/examples/elf/tests/mutex/Makefile @@ -50,7 +50,7 @@ $(BIN): $(OBJS) @echo "LD: $<" $(Q) $(LD) $(LDELFFLAGS) -o $@ $^ -clean: +clean: $(call DELFILE, $(BIN)) $(call CLEAN) diff --git a/apps/examples/elf/tests/pthread/Makefile b/apps/examples/elf/tests/pthread/Makefile index 05c7c4650..f201b12f5 100644 --- a/apps/examples/elf/tests/pthread/Makefile +++ b/apps/examples/elf/tests/pthread/Makefile @@ -50,7 +50,7 @@ $(BIN): $(OBJS) @echo "LD: $<" $(Q) $(LD) $(LDELFFLAGS) -o $@ $^ -clean: +clean: $(call DELFILE, $(BIN)) $(call CLEAN) diff --git a/apps/examples/elf/tests/signal/Makefile b/apps/examples/elf/tests/signal/Makefile index 55ef2e5b9..53a5d5721 100644 --- a/apps/examples/elf/tests/signal/Makefile +++ b/apps/examples/elf/tests/signal/Makefile @@ -50,7 +50,7 @@ $(BIN): $(OBJS) @echo "LD: $<" $(Q) $(LD) $(LDELFFLAGS) -o $@ $^ -clean: +clean: $(call DELFILE, $(BIN)) $(call CLEAN) diff --git a/apps/examples/elf/tests/struct/Makefile b/apps/examples/elf/tests/struct/Makefile index 369fcb368..80117a72f 100644 --- a/apps/examples/elf/tests/struct/Makefile +++ b/apps/examples/elf/tests/struct/Makefile @@ -51,7 +51,7 @@ $(BIN): $(OBJS) @echo "LD: $<" $(Q) $(LD) $(LDELFFLAGS) -o $@ $^ -clean: +clean: $(call DELFILE, $(BIN)) $(call CLEAN) diff --git a/apps/examples/elf/tests/struct/struct_main.c b/apps/examples/elf/tests/struct/struct_main.c index 3c8e86e7a..a8c0b83c2 100644 --- a/apps/examples/elf/tests/struct/struct_main.c +++ b/apps/examples/elf/tests/struct/struct_main.c @@ -46,7 +46,7 @@ * Public Data ****************************************************************************/ -const struct struct_dummy_s dummy_struct = +const struct struct_dummy_s dummy_struct = { DUMMY_SCALAR_VALUE3 }; diff --git a/apps/examples/flash_test/Makefile b/apps/examples/flash_test/Makefile index d8c9e5c74..b92a7aaa9 100644 --- a/apps/examples/flash_test/Makefile +++ b/apps/examples/flash_test/Makefile @@ -71,7 +71,7 @@ ROOTDEPPATH = --dep-path . # Common build -VPATH = +VPATH = all: .built .PHONY: context depend clean distclean diff --git a/apps/examples/flash_test/README.txt b/apps/examples/flash_test/README.txt index 60fcc4ebb..667903775 100644 --- a/apps/examples/flash_test/README.txt +++ b/apps/examples/flash_test/README.txt @@ -12,7 +12,7 @@ NOTE: This test uses internal OS interfaces and so is not available in the NUTT Usage: flash_test mtdblock_device - + Additional options: --force to replace existing installation diff --git a/apps/examples/flash_test/flash_test.c b/apps/examples/flash_test/flash_test.c index 7c67580d1..92821040b 100644 --- a/apps/examples/flash_test/flash_test.c +++ b/apps/examples/flash_test/flash_test.c @@ -100,9 +100,9 @@ int flash_test_main(int argc, char *argv[]) goto errout_with_driver; } - /* Test if the device is formatted. If not, then we must do a + /* Test if the device is formatted. If not, then we must do a * low-level format first */ - + if (!(fmt.flags & SMART_FMT_ISFORMATTED)) { /* Perform a low-level format */ @@ -160,16 +160,16 @@ int flash_test_main(int argc, char *argv[]) { /* Allocate a new sector */ - logsector = inode->u.i_bops->ioctl(inode, BIOC_ALLOCSECT, + logsector = inode->u.i_bops->ioctl(inode, BIOC_ALLOCSECT, (unsigned long) -1); if (logsector < 0) { fprintf(stderr, "Error allocating sector: %d\n", logsector); - goto errout_with_driver; + goto errout_with_driver; } /* Save the sector in our array */ - + sectors[x] = (uint16_t) logsector; seqs[x] = seq++; @@ -190,7 +190,7 @@ int flash_test_main(int argc, char *argv[]) printf("\r%d ", sectors[x]); } - /* Now read the data back to validate everything was written and can + /* Now read the data back to validate everything was written and can * be read. */ printf("\nDoing read verify test\n"); diff --git a/apps/examples/ftpc/Makefile b/apps/examples/ftpc/Makefile index cc966f8d6..3f1f79da7 100644 --- a/apps/examples/ftpc/Makefile +++ b/apps/examples/ftpc/Makefile @@ -66,7 +66,7 @@ ROOTDEPPATH = --dep-path . # Common build -VPATH = +VPATH = all: .built .PHONY: context depend clean distclean diff --git a/apps/examples/ftpc/ftpc_main.c b/apps/examples/ftpc/ftpc_main.c index deba62c1c..a66895e22 100644 --- a/apps/examples/ftpc/ftpc_main.c +++ b/apps/examples/ftpc/ftpc_main.c @@ -243,7 +243,7 @@ static int ftpc_execute(SESSION handle, int argc, char *argv[]) */ cmd = argv[0]; - + /* See if the command is one that we understand */ for (cmdmap = g_cmdmap; cmdmap->cmd; cmdmap++) diff --git a/apps/examples/ftpd/Makefile b/apps/examples/ftpd/Makefile index 61752931c..d1c4eb6b6 100644 --- a/apps/examples/ftpd/Makefile +++ b/apps/examples/ftpd/Makefile @@ -62,7 +62,7 @@ ROOTDEPPATH = --dep-path . # Common build -VPATH = +VPATH = all: .built diff --git a/apps/examples/ftpd/ftpd_main.c b/apps/examples/ftpd/ftpd_main.c index 1907da18c..a6f8506f9 100644 --- a/apps/examples/ftpd/ftpd_main.c +++ b/apps/examples/ftpd/ftpd_main.c @@ -226,7 +226,7 @@ int ftpd_main(int s_argc, char **s_argv) if (!g_ftpdglob.initialized) { - + /* Bring up the network */ printf("Initializing the network\n"); @@ -256,7 +256,7 @@ int ftpd_main(int s_argc, char **s_argv) { printf("Starting the FTP daemon\n"); g_ftpdglob.pid = TASK_CREATE("FTP daemon", CONFIG_EXAMPLES_FTPD_PRIO, - CONFIG_EXAMPLES_FTPD_STACKSIZE, + CONFIG_EXAMPLES_FTPD_STACKSIZE, ftpd_daemon, NULL); if (g_ftpdglob.pid < 0) { diff --git a/apps/examples/hello/Makefile b/apps/examples/hello/Makefile index d5adb86b0..19692e4bc 100644 --- a/apps/examples/hello/Makefile +++ b/apps/examples/hello/Makefile @@ -68,7 +68,7 @@ ROOTDEPPATH = --dep-path . # Common build -VPATH = +VPATH = all: .built .PHONY: clean depend distclean diff --git a/apps/examples/helloxx/Makefile b/apps/examples/helloxx/Makefile index 5cbe7dd59..c83ad5a3d 100644 --- a/apps/examples/helloxx/Makefile +++ b/apps/examples/helloxx/Makefile @@ -70,7 +70,7 @@ STACKSIZE = 2048 # Common build -VPATH = +VPATH = all: .built .PHONY: clean depend distclean chkcxx diff --git a/apps/examples/helloxx/helloxx_main.cxx b/apps/examples/helloxx/helloxx_main.cxx index 27a4e2695..940dccef8 100644 --- a/apps/examples/helloxx/helloxx_main.cxx +++ b/apps/examples/helloxx/helloxx_main.cxx @@ -123,7 +123,7 @@ class CHelloWorld // Define a statically constructed CHellowWorld instance if C++ static // initializers are supported by the platform -#ifdef CONFIG_HAVE_CXXINITIALIZE +#ifdef CONFIG_HAVE_CXXINITIALIZE static CHelloWorld g_HelloWorld; #endif diff --git a/apps/examples/hidkbd/Makefile b/apps/examples/hidkbd/Makefile index 7663250c7..a9a7aa681 100644 --- a/apps/examples/hidkbd/Makefile +++ b/apps/examples/hidkbd/Makefile @@ -62,7 +62,7 @@ ROOTDEPPATH = --dep-path . # Common build -VPATH = +VPATH = all: .built .PHONY: clean depend distclean diff --git a/apps/examples/i2schar/Makefile b/apps/examples/i2schar/Makefile index dcc51696a..57eb190fc 100644 --- a/apps/examples/i2schar/Makefile +++ b/apps/examples/i2schar/Makefile @@ -74,7 +74,7 @@ STACKSIZE = 2048 # Common build -VPATH = +VPATH = all: .built .PHONY: context clean depend distclean diff --git a/apps/examples/i2schar/i2schar_main.c b/apps/examples/i2schar/i2schar_main.c index 01ca7fd15..fa5806cf9 100644 --- a/apps/examples/i2schar/i2schar_main.c +++ b/apps/examples/i2schar/i2schar_main.c @@ -173,7 +173,7 @@ static void parse_args(FAR struct i2schar_state_s *i2schar, int argc, FAR char * long value; int index; int nargs; - + for (index = 1; index < argc; ) { ptr = argv[index]; @@ -218,7 +218,7 @@ static void parse_args(FAR struct i2schar_state_s *i2schar, int argc, FAR char * case 'h': i2schar_help(i2schar); exit(0); - + default: message("Unsupported option: %s\n", ptr); i2schar_help(i2schar); diff --git a/apps/examples/i2schar/i2schar_receiver.c b/apps/examples/i2schar/i2schar_receiver.c index 279076c6a..4575fd109 100644 --- a/apps/examples/i2schar/i2schar_receiver.c +++ b/apps/examples/i2schar/i2schar_receiver.c @@ -114,7 +114,7 @@ pthread_addr_t i2schar_receiver(pthread_addr_t arg) for (i = 0; i < CONFIG_EXAMPLES_I2SCHAR_TXBUFFERS; i++) { /* Allocate an audio buffer of the configured size */ - + desc.numbytes = CONFIG_EXAMPLES_I2SCHAR_BUFSIZE; desc.u.ppBuffer = &apb; diff --git a/apps/examples/i2schar/i2schar_transmitter.c b/apps/examples/i2schar/i2schar_transmitter.c index 601f9af39..8170c2956 100644 --- a/apps/examples/i2schar/i2schar_transmitter.c +++ b/apps/examples/i2schar/i2schar_transmitter.c @@ -117,7 +117,7 @@ pthread_addr_t i2schar_transmitter(pthread_addr_t arg) for (i = 0, crap = 0; i < CONFIG_EXAMPLES_I2SCHAR_TXBUFFERS; i++) { /* Allocate an audio buffer of the configured size */ - + desc.numbytes = CONFIG_EXAMPLES_I2SCHAR_BUFSIZE; desc.u.ppBuffer = &apb; diff --git a/apps/examples/igmp/Makefile b/apps/examples/igmp/Makefile index 8cfe69558..9128453ed 100644 --- a/apps/examples/igmp/Makefile +++ b/apps/examples/igmp/Makefile @@ -66,7 +66,7 @@ ROOTDEPPATH = --dep-path . # Common build -VPATH = +VPATH = all: .built .PHONY: clean depend distclean diff --git a/apps/examples/igmp/igmp.c b/apps/examples/igmp/igmp.c index ebb4feb07..d50ea4a93 100644 --- a/apps/examples/igmp/igmp.c +++ b/apps/examples/igmp/igmp.c @@ -89,7 +89,7 @@ int igmp_main(int argc, char *argv[]) #endif message("Configuring Ethernet...\n"); - + /* Many embedded network interfaces must have a software assigned MAC */ #ifdef CONFIG_EXAMPLES_IGMP_NOMAC diff --git a/apps/examples/json/Makefile b/apps/examples/json/Makefile index f6a38fb1a..96144f9ad 100644 --- a/apps/examples/json/Makefile +++ b/apps/examples/json/Makefile @@ -66,7 +66,7 @@ ROOTDEPPATH = --dep-path . # Common build -VPATH = +VPATH = all: .built .PHONY: clean depend distclean diff --git a/apps/examples/json/README b/apps/examples/json/README index de9a0b2ed..45682e02f 100644 --- a/apps/examples/json/README +++ b/apps/examples/json/README @@ -66,12 +66,12 @@ philosophy as JSON itself. Simple, dumb, out of the way. Some JSON: { - "name": "Jack (\"Bee\") Nimble", + "name": "Jack (\"Bee\") Nimble", "format": { - "type": "rect", - "width": 1920, - "height": 1080, - "interlace": false, + "type": "rect", + "width": 1920, + "height": 1080, + "interlace": false, "frame rate": 24 } } @@ -99,7 +99,7 @@ Finished? Delete the root (this takes care of everything else). That's AUTO mode. If you're going to use Auto mode, you really ought to check pointers before you dereference them. If you want to see how you'd build this struct in code? cJSON *root,*fmt; - root=cJSON_CreateObject(); + root=cJSON_CreateObject(); cJSON_AddItemToObject(root, "name", cJSON_CreateString("Jack (\"Bee\") Nimble")); cJSON_AddItemToObject(root, "format", fmt=cJSON_CreateObject()); cJSON_AddStringToObject(fmt,"type", "rect"); @@ -198,7 +198,7 @@ void parse_object(cJSON *item) int i; for (i=0;i<cJSON_GetArraySize(item);i++) { cJSON *subitem=cJSON_GetArrayItem(item,i); - // handle subitem. + // handle subitem. } } @@ -211,7 +211,7 @@ void parse_object(cJSON *item) { // handle subitem if (subitem->child) parse_object(subitem->child); - + subitem=subitem->next; } } @@ -240,7 +240,7 @@ cJSON *Create_array_of_anything(cJSON **items,int num) } return root; } - + and simply: Create_array_of_anything(objects,24); cJSON doesn't make any assumptions about what order you create things in. diff --git a/apps/examples/json/json_main.c b/apps/examples/json/json_main.c index 443be387b..26e6b2855 100644 --- a/apps/examples/json/json_main.c +++ b/apps/examples/json/json_main.c @@ -130,7 +130,7 @@ static void create_objects(void) int i; /* Our "days of the week" array */ - + static const char *strings[7] = { "Sunday", "Monday", "Tuesday", "Wednesday", @@ -138,7 +138,7 @@ static void create_objects(void) }; /* Our matrix: */ - + static const int numbers[3][3] = { {0, -1, 0}, {1, 0, 0}, {0, 0, 1} }; /* Our "gallery" item: */ @@ -229,10 +229,10 @@ static void create_objects(void) * Public Functions ****************************************************************************/ /**************************************************************************** - * Name: + * Name: * * Description: - * + * * ****************************************************************************/ @@ -252,7 +252,7 @@ int json_main(int argc, const char *argv[]) " }\n" "}"; - static const char text2[] = + static const char text2[] = "[\"Sunday\", \"Monday\", \"Tuesday\", \"Wednesday\", \"Thursday\", \"Friday\", \"Saturday\"]"; static const char text3[] = @@ -261,7 +261,7 @@ int json_main(int argc, const char *argv[]) " [1, 0, 0],\n" " [0, 0, 1]\n" "]\n"; - + static const char text4[] = "{\n" " \"Image\": {\n" diff --git a/apps/examples/lcdrw/Makefile b/apps/examples/lcdrw/Makefile index 59726f7c0..9a394632e 100644 --- a/apps/examples/lcdrw/Makefile +++ b/apps/examples/lcdrw/Makefile @@ -61,14 +61,14 @@ endif ROOTDEPPATH = --dep-path . # LCD R/W built-in application info - + APPNAME = lcdrw PRIORITY = SCHED_PRIORITY_DEFAULT STACKSIZE = 2048 # Common build -VPATH = +VPATH = all: .built .PHONY: clean depend distclean diff --git a/apps/examples/lcdrw/lcdrw_main.c b/apps/examples/lcdrw/lcdrw_main.c index 0852502f3..709859d1b 100644 --- a/apps/examples/lcdrw/lcdrw_main.c +++ b/apps/examples/lcdrw/lcdrw_main.c @@ -181,7 +181,7 @@ int lcdrw_main(int argc, char *argv[]) /* Create a dummy row. The important thing is to try all * bit combinations in a predictable way. */ - + ptr = (FAR uint16_t*)inst.pinfo.buffer; for (col = 0; col < CONFIG_EXAMPLES_LDCRW_XRES; col++) { @@ -214,7 +214,7 @@ int lcdrw_main(int argc, char *argv[]) for (row = 0; row < CONFIG_EXAMPLES_LDCRW_YRES; row++) { /* Read the row */ - + ret = inst.pinfo.getrun(row, 0, inst.pinfo.buffer, CONFIG_EXAMPLES_LDCRW_XRES); if (ret < 0) diff --git a/apps/examples/mm/Makefile b/apps/examples/mm/Makefile index 5ba7f4eec..d332e3845 100644 --- a/apps/examples/mm/Makefile +++ b/apps/examples/mm/Makefile @@ -62,7 +62,7 @@ ROOTDEPPATH = --dep-path . # Common build -VPATH = +VPATH = all: .built .PHONY: clean depend distclean diff --git a/apps/examples/modbus/Makefile b/apps/examples/modbus/Makefile index b2fba6764..ed1e19fab 100644 --- a/apps/examples/modbus/Makefile +++ b/apps/examples/modbus/Makefile @@ -68,7 +68,7 @@ ROOTDEPPATH = --dep-path . # Common build -VPATH = +VPATH = all: .built .PHONY: clean depend distclean diff --git a/apps/examples/modbus/modbus_main.c b/apps/examples/modbus/modbus_main.c index 2247fd675..7ff2b5b21 100644 --- a/apps/examples/modbus/modbus_main.c +++ b/apps/examples/modbus/modbus_main.c @@ -33,7 +33,7 @@ * **************************************************************************** * Leveraged from: - * + * * FreeModbus Libary: Linux Demo Application * Copyright (C) 2006 Christian Walter <wolti@sil.at> * @@ -149,7 +149,7 @@ static const uint8_t g_slaveid[] = { 0xaa, 0xbb, 0xcc }; * Name: modbus_initialize * * Description: - * Called from the ModBus polling thread in order to initialized the + * Called from the ModBus polling thread in order to initialized the * FreeModBus interface. * ****************************************************************************/ @@ -197,7 +197,7 @@ static inline int modbus_initialize(void) "ERROR: eMBInit failed: %d\n", mberr); goto errout_with_mutex; } - + /* Set the slave ID * * 0x34 = Slave ID @@ -274,7 +274,7 @@ static void *modbus_pollthread(void *pvarg) do { /* Poll */ - + mberr = eMBPoll(); if (mberr != MB_ENOERR) { diff --git a/apps/examples/mount/Makefile b/apps/examples/mount/Makefile index 133bdfa1f..8ac82a6c3 100644 --- a/apps/examples/mount/Makefile +++ b/apps/examples/mount/Makefile @@ -62,7 +62,7 @@ ROOTDEPPATH = --dep-path . # Common build -VPATH = +VPATH = all: .built .PHONY: clean depend distclean diff --git a/apps/examples/mount/ramdisk.c b/apps/examples/mount/ramdisk.c index 213a35cc9..21ec4c5e2 100644 --- a/apps/examples/mount/ramdisk.c +++ b/apps/examples/mount/ramdisk.c @@ -75,7 +75,7 @@ static struct fat_format_s g_fmt = FAT_FORMAT_INITIALIZER; /**************************************************************************** * Private Functions ****************************************************************************/ - + /**************************************************************************** * Public Functions ****************************************************************************/ diff --git a/apps/examples/mtdpart/Makefile b/apps/examples/mtdpart/Makefile index 56f9afa84..c3d9b8afe 100755 --- a/apps/examples/mtdpart/Makefile +++ b/apps/examples/mtdpart/Makefile @@ -62,7 +62,7 @@ ROOTDEPPATH = --dep-path . # Common build -VPATH = +VPATH = all: .built .PHONY: clean depend distclean diff --git a/apps/examples/mtdpart/mtdpart_main.c b/apps/examples/mtdpart/mtdpart_main.c index 3c1e98437..2dca73ff3 100644 --- a/apps/examples/mtdpart/mtdpart_main.c +++ b/apps/examples/mtdpart/mtdpart_main.c @@ -231,7 +231,7 @@ int mtdpart_main(int argc, char *argv[]) message(" blocksize: %lu\n", (unsigned long)geo.blocksize); message(" erasesize: %lu\n", (unsigned long)geo.erasesize); message(" neraseblocks: %lu\n", (unsigned long)geo.neraseblocks); - + /* Determine the size of each partition. Make each partition an even * multiple of the erase block size (perhaps not using some space at the * end of the FLASH). diff --git a/apps/examples/nettest/Makefile b/apps/examples/nettest/Makefile index 727773f69..f237669f5 100644 --- a/apps/examples/nettest/Makefile +++ b/apps/examples/nettest/Makefile @@ -39,7 +39,7 @@ include $(APPDIR)/Make.defs # Basic TCP networking test -TARG_ASRCS = +TARG_ASRCS = TARG_AOBJS = $(TARG_ASRCS:.S=$(OBJEXT)) TARG_CSRCS = nettest.c @@ -93,7 +93,7 @@ STACKSIZE = 2048 # Common build -VPATH = +VPATH = all: .built $(HOST_BIN) .PHONY: clean depend distclean diff --git a/apps/examples/nrf24l01_term/Makefile b/apps/examples/nrf24l01_term/Makefile index bf8ea760a..4274cc157 100644 --- a/apps/examples/nrf24l01_term/Makefile +++ b/apps/examples/nrf24l01_term/Makefile @@ -68,7 +68,7 @@ STACKSIZE = 2048 # Common build -VPATH = +VPATH = all: .built .PHONY: context clean depend distclean diff --git a/apps/examples/nsh/Makefile b/apps/examples/nsh/Makefile index c7d212fc2..028299183 100644 --- a/apps/examples/nsh/Makefile +++ b/apps/examples/nsh/Makefile @@ -62,7 +62,7 @@ ROOTDEPPATH = --dep-path . # Common build -VPATH = +VPATH = all: .built .PHONY: clean depend distclean diff --git a/apps/examples/null/Makefile b/apps/examples/null/Makefile index 47ec4cdaf..daeb49c27 100644 --- a/apps/examples/null/Makefile +++ b/apps/examples/null/Makefile @@ -62,7 +62,7 @@ ROOTDEPPATH = --dep-path . # Common build -VPATH = +VPATH = all: .built .PHONY: clean depend distclean diff --git a/apps/examples/nx/Makefile b/apps/examples/nx/Makefile index ea802d9e7..17e6e8640 100644 --- a/apps/examples/nx/Makefile +++ b/apps/examples/nx/Makefile @@ -71,7 +71,7 @@ STACKSIZE = 2048 # Common build -VPATH = +VPATH = all: .built .PHONY: context clean depend distclean diff --git a/apps/examples/nxconsole/Makefile b/apps/examples/nxconsole/Makefile index aa4cdc518..3e1892785 100644 --- a/apps/examples/nxconsole/Makefile +++ b/apps/examples/nxconsole/Makefile @@ -62,7 +62,7 @@ ROOTDEPPATH = --dep-path . # Common build -VPATH = +VPATH = all: .built .PHONY: context clean depend distclean diff --git a/apps/examples/nxconsole/nxcon_main.c b/apps/examples/nxconsole/nxcon_main.c index 02546750e..45223dcb1 100644 --- a/apps/examples/nxconsole/nxcon_main.c +++ b/apps/examples/nxconsole/nxcon_main.c @@ -337,7 +337,7 @@ int nxcon_main(int argc, char **argv) } /* Sleep a little bit to allow the server to catch up */ - + sleep(2); /* NxConsole Configuration ************************************************/ @@ -388,7 +388,7 @@ int nxcon_main(int argc, char **argv) /* And start the console task. It will inherit stdin, stdout, and stderr * from this task. */ - + g_nxcon_vars.pid = TASK_CREATE("NxConsole", CONFIG_EXAMPLES_NXCONSOLE_PRIO, CONFIG_EXAMPLES_NXCONSOLE_STACKSIZE, nxcon_task, NULL); diff --git a/apps/examples/nxffs/Makefile b/apps/examples/nxffs/Makefile index 9af03897f..6d9e4a3d8 100644 --- a/apps/examples/nxffs/Makefile +++ b/apps/examples/nxffs/Makefile @@ -62,7 +62,7 @@ ROOTDEPPATH = --dep-path . # Common build -VPATH = +VPATH = all: .built .PHONY: clean depend distclean diff --git a/apps/examples/nxffs/nxffs_main.c b/apps/examples/nxffs/nxffs_main.c index 154714246..443ef52fe 100644 --- a/apps/examples/nxffs/nxffs_main.c +++ b/apps/examples/nxffs/nxffs_main.c @@ -279,7 +279,7 @@ static inline void nxffs_randname(FAR struct nxffs_filedesc_s *file) { file->name[i] = nxffs_randchar(); } - + file->name[alloclen] = '\0'; } diff --git a/apps/examples/nxflat/Makefile b/apps/examples/nxflat/Makefile index 94092bd39..a750c8e2c 100644 --- a/apps/examples/nxflat/Makefile +++ b/apps/examples/nxflat/Makefile @@ -62,7 +62,7 @@ ROOTDEPPATH = --dep-path . # Common build -VPATH = +VPATH = all: .built .PHONY: headers clean depend distclean diff --git a/apps/examples/nxflat/tests/Makefile b/apps/examples/nxflat/tests/Makefile index 53e43288f..8a65d6494 100644 --- a/apps/examples/nxflat/tests/Makefile +++ b/apps/examples/nxflat/tests/Makefile @@ -57,7 +57,7 @@ $(foreach DIR, $(SUBDIRS), $(eval $(call DIR_template,$(DIR),build, all))) $(foreach DIR, $(SUBDIRS), $(eval $(call DIR_template,$(DIR),clean,clean))) $(foreach DIR, $(SUBDIRS), $(eval $(call DIR_template,$(DIR),install,install))) -# Build program(s) in each sud-directory +# Build program(s) in each sud-directory build: $(foreach DIR, $(SUBDIRS), $(DIR)_build) @@ -84,7 +84,7 @@ $(ROMFS_IMG): populate $(ROMFS_HDR) : $(ROMFS_IMG) @(cd $(TESTS_DIR); xxd -i romfs.img | sed -e "s/^unsigned/static const unsigned/g" >$@) -# Create the dirlist.h header file from the romfs directory +# Create the dirlist.h header file from the romfs directory $(ROMFS_DIRLIST) : populate @$(TESTS_DIR)/mkdirlist.sh $(ROMFS_DIR) >$@ diff --git a/apps/examples/nxflat/tests/errno/Makefile b/apps/examples/nxflat/tests/errno/Makefile index d8d75b227..d161a6496 100644 --- a/apps/examples/nxflat/tests/errno/Makefile +++ b/apps/examples/nxflat/tests/errno/Makefile @@ -69,7 +69,7 @@ $(BIN): $(BIN).r2 @echo "LD: $<" $(Q) $(LDNXFLAT) $(LDNXFLATFLAGS) -o $@ $^ -clean: +clean: $(call DELFILE, $(BIN)) $(call DELFILE, $(R2SRC)) $(call DELFILE, *.r1) diff --git a/apps/examples/nxflat/tests/hello++/Makefile b/apps/examples/nxflat/tests/hello++/Makefile index 739562905..fb8922a1b 100644 --- a/apps/examples/nxflat/tests/hello++/Makefile +++ b/apps/examples/nxflat/tests/hello++/Makefile @@ -162,7 +162,7 @@ $(BIN3): $(BIN3).r2 # @echo "LD: $<" # $(LDNXFLAT) $(LDNXFLATFLAGS) -o $@ $^ -clean: +clean: $(call DELFILE, $(BIN1)) $(call DELFILE, $(BIN2)) $(call DELFILE, $(BIN3)) diff --git a/apps/examples/nxflat/tests/hello++/hello++2.cpp b/apps/examples/nxflat/tests/hello++/hello++2.cpp index 3a1798a70..1c5a11fc5 100644 --- a/apps/examples/nxflat/tests/hello++/hello++2.cpp +++ b/apps/examples/nxflat/tests/hello++/hello++2.cpp @@ -61,7 +61,7 @@ public: printf("CThingSayer::CThingSayer: I am!\n"); szWhatToSay = (const char*)NULL; } - + ~CThingSayer(void) { printf("CThingSayer::~CThingSayer: I cease to be\n"); diff --git a/apps/examples/nxflat/tests/hello/Makefile b/apps/examples/nxflat/tests/hello/Makefile index b4521a74e..2efa6dbca 100644 --- a/apps/examples/nxflat/tests/hello/Makefile +++ b/apps/examples/nxflat/tests/hello/Makefile @@ -69,7 +69,7 @@ $(BIN): $(BIN).r2 @echo "LD: $<" $(Q) $(LDNXFLAT) $(LDNXFLATFLAGS) -o $@ $^ -clean: +clean: $(call DELFILE, $(BIN)) $(call DELFILE, $(R2SRC)) $(call DELFILE, *.r1) diff --git a/apps/examples/nxflat/tests/longjmp/Makefile b/apps/examples/nxflat/tests/longjmp/Makefile index 76d49417c..dbfd5fc91 100644 --- a/apps/examples/nxflat/tests/longjmp/Makefile +++ b/apps/examples/nxflat/tests/longjmp/Makefile @@ -69,7 +69,7 @@ $(BIN): $(BIN).r2 @echo "LD: $<" $(Q) $(LDNXFLAT) $(LDNXFLATFLAGS) -o $@ $^ -clean: +clean: $(call DELFILE, $(BIN)) $(call DELFILE, $(R2SRC)) $(call DELFILE, *.r1) diff --git a/apps/examples/nxflat/tests/longjmp/longjmp.c b/apps/examples/nxflat/tests/longjmp/longjmp.c index f43096514..12f3d99df 100644 --- a/apps/examples/nxflat/tests/longjmp/longjmp.c +++ b/apps/examples/nxflat/tests/longjmp/longjmp.c @@ -77,7 +77,7 @@ static int leaf(int *some_arg) /* We should not get here */ - return -ERROR; + return -ERROR; } static int function(int some_arg) diff --git a/apps/examples/nxflat/tests/mutex/Makefile b/apps/examples/nxflat/tests/mutex/Makefile index d45c49ddd..526099819 100644 --- a/apps/examples/nxflat/tests/mutex/Makefile +++ b/apps/examples/nxflat/tests/mutex/Makefile @@ -69,7 +69,7 @@ $(BIN): $(BIN).r2 @echo "LD: $<" $(Q) $(LDNXFLAT) $(LDNXFLATFLAGS) -o $@ $^ -clean: +clean: $(call DELFILE, $(BIN)) $(call DELFILE, $(R2SRC)) $(call DELFILE, *.r1) diff --git a/apps/examples/nxflat/tests/pthread/Makefile b/apps/examples/nxflat/tests/pthread/Makefile index fffb13dfb..e16a8f623 100644 --- a/apps/examples/nxflat/tests/pthread/Makefile +++ b/apps/examples/nxflat/tests/pthread/Makefile @@ -70,7 +70,7 @@ $(BIN): $(BIN).r2 @echo "LD: $<" $(Q) $(LDNXFLAT) $(LDNXFLATFLAGS) -o $@ $^ -clean: +clean: $(call DELFILE, $(BIN)) $(call DELFILE, $(R2SRC)) $(call DELFILE, *.r1) diff --git a/apps/examples/nxflat/tests/signal/Makefile b/apps/examples/nxflat/tests/signal/Makefile index 372100030..43e4742b5 100644 --- a/apps/examples/nxflat/tests/signal/Makefile +++ b/apps/examples/nxflat/tests/signal/Makefile @@ -69,7 +69,7 @@ $(BIN): $(BIN).r2 @echo "LD: $<" $(Q) $(LDNXFLAT) $(LDNXFLATFLAGS) -o $@ $^ -clean: +clean: $(call DELFILE, $(BIN)) $(call DELFILE, $(R2SRC)) $(call DELFILE, *.r1) diff --git a/apps/examples/nxflat/tests/struct/Makefile b/apps/examples/nxflat/tests/struct/Makefile index ff15256af..bee07d1e5 100644 --- a/apps/examples/nxflat/tests/struct/Makefile +++ b/apps/examples/nxflat/tests/struct/Makefile @@ -71,7 +71,7 @@ $(BIN): $(BIN).r2 @echo "LD: $<" $(Q) $(LDNXFLAT) $(LDNXFLATFLAGS) -o $@ $^ -clean: +clean: $(call DELFILE, $(BIN)) $(call DELFILE, $(R2SRC)) $(call DELFILE, *.r1) diff --git a/apps/examples/nxflat/tests/struct/struct_main.c b/apps/examples/nxflat/tests/struct/struct_main.c index f454b8ae7..8646a0c49 100644 --- a/apps/examples/nxflat/tests/struct/struct_main.c +++ b/apps/examples/nxflat/tests/struct/struct_main.c @@ -46,7 +46,7 @@ * Public Data ****************************************************************************/ -const struct struct_dummy_s dummy_struct = +const struct struct_dummy_s dummy_struct = { DUMMY_SCALAR_VALUE3 }; diff --git a/apps/examples/nxflat/tests/task/Makefile b/apps/examples/nxflat/tests/task/Makefile index a528c60b7..afd4754b6 100644 --- a/apps/examples/nxflat/tests/task/Makefile +++ b/apps/examples/nxflat/tests/task/Makefile @@ -69,7 +69,7 @@ $(BIN): $(BIN).r2 @echo "LD: $<" $(Q) $(LDNXFLAT) $(LDNXFLATFLAGS) -o $@ $^ -clean: +clean: $(call DELFILE, $(BIN)) $(call DELFILE, $(R2SRC)) $(call DELFILE, *.r1) diff --git a/apps/examples/nxhello/Makefile b/apps/examples/nxhello/Makefile index 7b8d5ed04..1aa1f5370 100644 --- a/apps/examples/nxhello/Makefile +++ b/apps/examples/nxhello/Makefile @@ -68,7 +68,7 @@ STACKSIZE = 2048 # Common build -VPATH = +VPATH = all: .built .PHONY: context clean depend distclean diff --git a/apps/examples/nximage/Makefile b/apps/examples/nximage/Makefile index 42ab1adeb..afaf6eb9d 100644 --- a/apps/examples/nximage/Makefile +++ b/apps/examples/nximage/Makefile @@ -68,7 +68,7 @@ STACKSIZE = 2048 # Common build -VPATH = +VPATH = all: .built .PHONY: context clean depend distclean diff --git a/apps/examples/nximage/nximage_bitmap.c b/apps/examples/nximage/nximage_bitmap.c index a7c304d31..a48c485a2 100644 --- a/apps/examples/nximage/nximage_bitmap.c +++ b/apps/examples/nximage/nximage_bitmap.c @@ -1075,7 +1075,7 @@ static const struct pix_run_s g_nuttx[] = { 77, 0}, { 76, 0}, { 1, 5}, { 4, 4}, { 1, 5}, { 78, 0} /* Row 159 */ }; - + #elif CONFIG_EXAMPLES_NXIMAGE_BPP == 16 static const struct pix_run_s g_nuttx[] = @@ -3545,7 +3545,7 @@ nxgl_mxpixel_t nximage_avgcolor(nxgl_mxpixel_t color1, nxgl_mxpixel_t color2) { b1 = 0xff; } - + /* Multiplex */ color1 = r1 << 16 | g1 << 8 | b1; @@ -3586,7 +3586,7 @@ nxgl_mxpixel_t nximage_avgcolor(nxgl_mxpixel_t color1, nxgl_mxpixel_t color2) { b1 = 0x1f; } - + /* Multiplex */ color1 = r1 << 11 | g1 << 5 | b1; @@ -3629,7 +3629,7 @@ nxgl_mxpixel_t nximage_avgcolor(nxgl_mxpixel_t color1, nxgl_mxpixel_t color2) { b1 = 0x03; } - + /* Multiplex */ color1 = r1 << 5 | g1 << 2 | b1; diff --git a/apps/examples/nximage/nximage_bkgd.c b/apps/examples/nximage/nximage_bkgd.c index 4a028f720..ddd7b4a72 100644 --- a/apps/examples/nximage/nximage_bkgd.c +++ b/apps/examples/nximage/nximage_bkgd.c @@ -295,7 +295,7 @@ void nximage_image(NXWINDOW hwnd) dest.pt1.x = pos.x; dest.pt2.x = pos.x + SCALED_WIDTH - 1; - + /* Now output the rows */ for (row = 0; row < IMAGE_HEIGHT; row += NINPUT_ROWS) diff --git a/apps/examples/nxlines/Makefile b/apps/examples/nxlines/Makefile index 54495b292..fbd61ed44 100644 --- a/apps/examples/nxlines/Makefile +++ b/apps/examples/nxlines/Makefile @@ -68,7 +68,7 @@ STACKSIZE = 2048 # Common build -VPATH = +VPATH = all: .built .PHONY: context clean depend distclean diff --git a/apps/examples/nxlines/nxlines_main.c b/apps/examples/nxlines/nxlines_main.c index 93e0436d8..d9512391e 100644 --- a/apps/examples/nxlines/nxlines_main.c +++ b/apps/examples/nxlines/nxlines_main.c @@ -254,7 +254,7 @@ int nxlines_main(int argc, char *argv[]) message("nxlines_main: Screen resolution (%d,%d)\n", g_nxlines.xres, g_nxlines.yres); /* Now, say perform the lines (these test does not return so the remaining - * logic is cosmetic). + * logic is cosmetic). */ nxlines_test(g_nxlines.hbkgd); diff --git a/apps/examples/nxtext/Makefile b/apps/examples/nxtext/Makefile index cabae0520..4091c577b 100644 --- a/apps/examples/nxtext/Makefile +++ b/apps/examples/nxtext/Makefile @@ -72,7 +72,7 @@ STACKSIZE = 2048 # Common build -VPATH = +VPATH = all: .built .PHONY: context clean depend distclean diff --git a/apps/examples/nxtext/nxtext_bkgd.c b/apps/examples/nxtext/nxtext_bkgd.c index 7817bf441..2d65cbeae 100644 --- a/apps/examples/nxtext/nxtext_bkgd.c +++ b/apps/examples/nxtext/nxtext_bkgd.c @@ -329,7 +329,7 @@ static inline void nxbg_scroll(NXWINDOW hwnd, int lineheight) bm->pos.y -= lineheight; /* We are keeping this one so increment to the next character */ - + i++; } } diff --git a/apps/examples/nxtext/nxtext_main.c b/apps/examples/nxtext/nxtext_main.c index 9bb94dcb8..9aa2a810e 100644 --- a/apps/examples/nxtext/nxtext_main.c +++ b/apps/examples/nxtext/nxtext_main.c @@ -455,7 +455,7 @@ int nxtext_main(int argc, char **argv) else if (popcnt == 5) { /* Destroy the pop-up window and restart the sequence */ - + message("nxtext_main: Close pop-up\n"); (void)nxpu_close(hwnd); popcnt = 0; diff --git a/apps/examples/nxtext/nxtext_popup.c b/apps/examples/nxtext/nxtext_popup.c index 4faaf3a35..f708292e5 100644 --- a/apps/examples/nxtext/nxtext_popup.c +++ b/apps/examples/nxtext/nxtext_popup.c @@ -137,7 +137,7 @@ static fb_coord_t nxpu_randpos(fb_coord_t value) { ndx = 0; } - + return (fb_coord_t)(((uint32_t)value * (uint32_t)rand8) >> 8); } diff --git a/apps/examples/nxtext/nxtext_putc.c b/apps/examples/nxtext/nxtext_putc.c index 13a441115..9bfc28f2c 100644 --- a/apps/examples/nxtext/nxtext_putc.c +++ b/apps/examples/nxtext/nxtext_putc.c @@ -128,7 +128,7 @@ nxtext_allocglyph(FAR struct nxtext_state_s *st) * track of the least used glyph as well. We need that if we have to replace * a glyph in the cache. */ - + for (i = 0; i < st->maxglyphs; i++) { /* Is this glyph in use? */ @@ -153,7 +153,7 @@ nxtext_allocglyph(FAR struct nxtext_state_s *st) /* If we get here, the glyph cache is full. We replace the least used * glyph with the one we need now. (luglyph can't be NULL). */ - + luusecnt = luglyph->usecnt; nxtext_freeglyph(luglyph); @@ -164,7 +164,7 @@ nxtext_allocglyph(FAR struct nxtext_state_s *st) if (luusecnt > 1) { uint8_t decr = luusecnt - 1; - + for (i = 0; i < st->maxglyphs; i++) { /* Is this glyph in use? */ diff --git a/apps/examples/ostest/Makefile b/apps/examples/ostest/Makefile index e8b6a176d..d0f347dfb 100644 --- a/apps/examples/ostest/Makefile +++ b/apps/examples/ostest/Makefile @@ -77,9 +77,9 @@ endif # CONFIG_DISABLE_SIGNALS ifneq ($(CONFIG_DISABLE_MQUEUE),y) ifneq ($(CONFIG_DISABLE_PTHREAD),y) -CSRCS += mqueue.c +CSRCS += mqueue.c ifneq ($(CONFIG_DISABLE_CLOCK),y) -CSRCS += timedmqueue.c +CSRCS += timedmqueue.c endif # CONFIG_DISABLE_CLOCK endif # CONFIG_DISABLE_PTHREAD endif # CONFIG_DISABLE_MQUEUE @@ -122,7 +122,7 @@ ROOTDEPPATH = --dep-path . # Common build -VPATH = +VPATH = all: .built .PHONY: clean depend distclean diff --git a/apps/examples/ostest/fpu.c b/apps/examples/ostest/fpu.c index 89a1034ce..2729348ed 100644 --- a/apps/examples/ostest/fpu.c +++ b/apps/examples/ostest/fpu.c @@ -215,7 +215,7 @@ static int fpu_task(int argc, char *argv[]) printf("FPU#%d: pass %d\n", id, i+1); fflush(stdout); - /* Set the FPU register save arrays to a known-but-illogical values so + /* Set the FPU register save arrays to a known-but-illogical values so * that we can verify that reading of the registers actually occurs. */ diff --git a/apps/examples/ostest/ostest_main.c b/apps/examples/ostest/ostest_main.c index 630262d0e..8591c5f3f 100644 --- a/apps/examples/ostest/ostest_main.c +++ b/apps/examples/ostest/ostest_main.c @@ -306,7 +306,7 @@ static int user_main(int argc, char *argv[]) #endif /* Top of test loop */ - + #if CONFIG_EXAMPLES_OSTEST_LOOPS > 1 for (i = 0; i < CONFIG_EXAMPLES_OSTEST_LOOPS; i++) #elif CONFIG_EXAMPLES_OSTEST_LOOPS == 0 diff --git a/apps/examples/ostest/prioinherit.c b/apps/examples/ostest/prioinherit.c index cd04df7e6..5d0c9b763 100644 --- a/apps/examples/ostest/prioinherit.c +++ b/apps/examples/ostest/prioinherit.c @@ -115,7 +115,7 @@ static int nhighpri_waiting(void) { int n = 0; int i; - + for (i = 0; i < NHIGHPRI_THREADS; i++) { if (g_highstate[i] == WAITING) @@ -134,7 +134,7 @@ static int nhighpri_running(void) { int n = 0; int i; - + for (i = 0; i < NHIGHPRI_THREADS; i++) { if (g_highstate[i] != DONE) @@ -268,7 +268,7 @@ static void *lowpri_thread(void *parameter) if (sparam.sched_priority != g_lowpri) { printf(" ERROR should have been %d\n", g_lowpri); - } + } } g_lowstate[threadno-1] = WAITING; @@ -378,14 +378,14 @@ static void *lowpri_thread(void *parameter) if (sparam.sched_priority != g_lowpri) { printf(" ERROR should have been %d\n", g_lowpri); - } + } } sem_enumholders(&g_sem); printf("lowpri_thread-%d: Okay... I'm done!\n", threadno); FFLUSH(); g_lowstate[threadno-1] = DONE; - return retval; + return retval; } #endif /* CONFIG_PRIORITY_INHERITANCE && !CONFIG_DISABLE_SIGNALS && !CONFIG_DISABLE_PTHREAD */ diff --git a/apps/examples/ostest/rmutex.c b/apps/examples/ostest/rmutex.c index ffd99c2df..5456cddb7 100644 --- a/apps/examples/ostest/rmutex.c +++ b/apps/examples/ostest/rmutex.c @@ -64,7 +64,7 @@ static void thread_inner(int id, int level) printf("thread_inner[%d, %d]: Locked\n", id, level); /* Give the other threads a chance */ - + pthread_yield(); thread_inner(id, level+1); pthread_yield(); @@ -127,7 +127,7 @@ void recursive_mutex_test(void) { printf("recursive_mutex_test: ERROR pthread_mutexattr_gettype return type=%d\n", type); } - + /* Initialize the mutex */ printf("recursive_mutex_test: Initializing mutex\n"); diff --git a/apps/examples/ostest/sem.c b/apps/examples/ostest/sem.c index 6f979dcc7..5c7f39cce 100644 --- a/apps/examples/ostest/sem.c +++ b/apps/examples/ostest/sem.c @@ -235,7 +235,7 @@ void sem_test(void) printf(" Canceling waiter threads\n"); pthread_cancel(waiter_thread1); - pthread_cancel(waiter_thread2); + pthread_cancel(waiter_thread2); } #ifdef SDCC diff --git a/apps/examples/pashello/Makefile b/apps/examples/pashello/Makefile index bb525c925..d5c482374 100644 --- a/apps/examples/pashello/Makefile +++ b/apps/examples/pashello/Makefile @@ -70,7 +70,7 @@ ROOTDEPPATH = --dep-path . # Common build -VPATH = +VPATH = all: .built .PHONY: clean depend distclean diff --git a/apps/examples/pipe/Makefile b/apps/examples/pipe/Makefile index bed319085..3efa943b3 100644 --- a/apps/examples/pipe/Makefile +++ b/apps/examples/pipe/Makefile @@ -62,7 +62,7 @@ ROOTDEPPATH = --dep-path . # Common build -VPATH = +VPATH = all: .built .PHONY: clean depend distclean diff --git a/apps/examples/pipe/interlock_test.c b/apps/examples/pipe/interlock_test.c index 9cdfaec5c..0391fe36f 100644 --- a/apps/examples/pipe/interlock_test.c +++ b/apps/examples/pipe/interlock_test.c @@ -102,7 +102,7 @@ static void *null_writer(pthread_addr_t pvarg) fprintf(stderr, "null_writer: close failed: %d\n", errno); } sleep(5); - + printf("null_writer: Returning success\n"); return (void*)0; } @@ -143,7 +143,7 @@ int interlock_test(void) ret = 2; goto errout_with_fifo; } - + /* Open one end of the FIFO for reading. This open call should block until the * null_writer thread opens the other end of the FIFO for writing. */ diff --git a/apps/examples/poll/Makefile b/apps/examples/poll/Makefile index 7507e6449..9431398f8 100644 --- a/apps/examples/poll/Makefile +++ b/apps/examples/poll/Makefile @@ -62,7 +62,7 @@ ROOTDEPPATH = --dep-path . # Common build -VPATH = +VPATH = all: .built .PHONY: clean depend distclean diff --git a/apps/examples/poll/poll_listener.c b/apps/examples/poll/poll_listener.c index 4c5e602c3..d7f4bf495 100644 --- a/apps/examples/poll/poll_listener.c +++ b/apps/examples/poll/poll_listener.c @@ -249,7 +249,7 @@ void *poll_listener(pthread_addr_t pvarg) } while (nbytes > 0); } - + /* Make sure that everything is displayed */ msgflush(); diff --git a/apps/examples/posix_spawn/filesystem/hello/Makefile b/apps/examples/posix_spawn/filesystem/hello/Makefile index ac67f84a0..dbb52d760 100644 --- a/apps/examples/posix_spawn/filesystem/hello/Makefile +++ b/apps/examples/posix_spawn/filesystem/hello/Makefile @@ -50,7 +50,7 @@ $(BIN): $(OBJS) @echo "LD: $<" $(Q) $(LD) $(LDELFFLAGS) -o $@ $^ -clean: +clean: $(call DELFILE, $(BIN)) $(call DELFILE, *.dSYM) $(call CLEAN) diff --git a/apps/examples/posix_spawn/filesystem/redirect/Makefile b/apps/examples/posix_spawn/filesystem/redirect/Makefile index 59aba9a75..5d6d499e1 100644 --- a/apps/examples/posix_spawn/filesystem/redirect/Makefile +++ b/apps/examples/posix_spawn/filesystem/redirect/Makefile @@ -50,7 +50,7 @@ $(BIN): $(OBJS) @echo "LD: $<" $(Q) $(LD) $(LDELFFLAGS) -o $@ $^ -clean: +clean: $(call DELFILE, $(BIN)) $(call DELFILE, *.dSYM) $(call CLEAN) diff --git a/apps/examples/posix_spawn/spawn_main.c b/apps/examples/posix_spawn/spawn_main.c index 7a39a24b0..efb6c1af1 100644 --- a/apps/examples/posix_spawn/spawn_main.c +++ b/apps/examples/posix_spawn/spawn_main.c @@ -404,7 +404,7 @@ int spawn_main(int argc, char *argv[]) err("ERROR: posix_spawn_file_actions_addopen failed: %d\n", ret); } posix_spawn_file_actions_dump(&file_actions); - + mm_update(&g_mmstep, "after adding file_actions"); /* If the binary loader does not support the PATH variable, then diff --git a/apps/examples/pwm/Makefile b/apps/examples/pwm/Makefile index ece901a99..d51bbf5db 100644 --- a/apps/examples/pwm/Makefile +++ b/apps/examples/pwm/Makefile @@ -68,7 +68,7 @@ STACKSIZE = 2048 # Common build -VPATH = +VPATH = all: .built .PHONY: context clean depend distclean diff --git a/apps/examples/pwm/pwm_main.c b/apps/examples/pwm/pwm_main.c index c524479b7..956ff04c5 100644 --- a/apps/examples/pwm/pwm_main.c +++ b/apps/examples/pwm/pwm_main.c @@ -185,7 +185,7 @@ static void parse_args(FAR struct pwm_state_s *pwm, int argc, FAR char **argv) long value; int index; int nargs; - + for (index = 1; index < argc; ) { ptr = argv[index]; @@ -256,7 +256,7 @@ static void parse_args(FAR struct pwm_state_s *pwm, int argc, FAR char **argv) case 'h': pwm_help(pwm); exit(0); - + default: message("Unsupported option: %s\n", ptr); pwm_help(pwm); @@ -340,7 +340,7 @@ int pwm_main(int argc, char *argv[]) info.frequency, info.duty); #endif - + ret = ioctl(fd, PWMIOC_SETCHARACTERISTICS, (unsigned long)((uintptr_t)&info)); if (ret < 0) { @@ -362,7 +362,7 @@ int pwm_main(int argc, char *argv[]) /* It a non-zero count was not specified, then wait for the selected * duration, then stop the PWM output. */ - + #ifdef CONFIG_PWM_PULSECOUNT if (info.count == 0) #endif diff --git a/apps/examples/qencoder/Makefile b/apps/examples/qencoder/Makefile index 9668796e6..18a3bb925 100644 --- a/apps/examples/qencoder/Makefile +++ b/apps/examples/qencoder/Makefile @@ -68,7 +68,7 @@ STACKSIZE = 2048 # Common build -VPATH = +VPATH = all: .built .PHONY: context clean depend distclean diff --git a/apps/examples/qencoder/qe_main.c b/apps/examples/qencoder/qe_main.c index 8c185ea1b..cad5ceb7d 100644 --- a/apps/examples/qencoder/qe_main.c +++ b/apps/examples/qencoder/qe_main.c @@ -222,7 +222,7 @@ static void parse_args(int argc, FAR char **argv) case 'h': qe_help(); exit(EXIT_SUCCESS); - + default: message("Unsupported option: %s\n", ptr); qe_help(); diff --git a/apps/examples/relays/Makefile b/apps/examples/relays/Makefile index 1ab4c8716..e5afd6fbf 100644 --- a/apps/examples/relays/Makefile +++ b/apps/examples/relays/Makefile @@ -68,7 +68,7 @@ STACKSIZE = 512 # Common build -VPATH = +VPATH = all: .built .PHONY: context clean depend distclean diff --git a/apps/examples/relays/relays_main.c b/apps/examples/relays/relays_main.c index c7ad6db0f..941ac2302 100644 --- a/apps/examples/relays/relays_main.c +++ b/apps/examples/relays/relays_main.c @@ -122,15 +122,15 @@ int relays_main(int argc, char *argv[]) printf("usage: relays [ -n <relay id> ] <switch-status>\n"); return -1; } - + if (optind == argc - 1) { stat = argv[optind]; set_stat = (!strcmp(stat,"on") || !strcmp(stat,"ON")) ? true : false ; } - + up_relaysinit(); - + if (n >= 0) { printf("set RELAY ID %d to %s\n", n , set_stat ? "ON" : "OFF"); diff --git a/apps/examples/rgmp/Makefile b/apps/examples/rgmp/Makefile index d94d6ec3c..049ad02a0 100644 --- a/apps/examples/rgmp/Makefile +++ b/apps/examples/rgmp/Makefile @@ -62,7 +62,7 @@ ROOTDEPPATH = --dep-path . # Common build -VPATH = +VPATH = all: .built .PHONY: clean depend distclean diff --git a/apps/examples/rgmp/rgmp_main.c b/apps/examples/rgmp/rgmp_main.c index e026852b8..1cf5a56c7 100644 --- a/apps/examples/rgmp/rgmp_main.c +++ b/apps/examples/rgmp/rgmp_main.c @@ -60,7 +60,7 @@ int rgmp_main(int argc, char *argv[]) { // TODO: add your code here - + return 0; } diff --git a/apps/examples/romfs/Makefile b/apps/examples/romfs/Makefile index 2b02952ed..d3c8e79cc 100644 --- a/apps/examples/romfs/Makefile +++ b/apps/examples/romfs/Makefile @@ -62,7 +62,7 @@ ROOTDEPPATH = --dep-path . # Common build -VPATH = +VPATH = all: .built .PHONY: checkgenromfs clean depend distclean diff --git a/apps/examples/romfs/romfs_main.c b/apps/examples/romfs/romfs_main.c index d39c8ec2b..980bd4455 100644 --- a/apps/examples/romfs/romfs_main.c +++ b/apps/examples/romfs/romfs_main.c @@ -461,7 +461,7 @@ int romfs_main(int argc, char *argv[]) /* Create a RAM disk for the test */ - ret = romdisk_register(CONFIG_EXAMPLES_ROMFS_RAMDEVNO, testdir_img, + ret = romdisk_register(CONFIG_EXAMPLES_ROMFS_RAMDEVNO, testdir_img, NSECTORS(testdir_img_len), CONFIG_EXAMPLES_ROMFS_SECTORSIZE); if (ret < 0) { diff --git a/apps/examples/romfs/testdir.txt b/apps/examples/romfs/testdir.txt index e321d6ded..c87815179 100644 --- a/apps/examples/romfs/testdir.txt +++ b/apps/examples/romfs/testdir.txt @@ -26,7 +26,7 @@ FILE HEADER 4: Name=adir 00000c0: 616e 6f74 6865 7266 696c 652e 7478 7400 anotherfile.txt. FILE CONTENT: - 00000d0: 5468 6973 2069 7320 616e 6f74 6865 7220 This is another + 00000d0: 5468 6973 2069 7320 616e 6f74 6865 7220 This is another 00000e0: 6669 6c65 0a00 0000 0000 0000 0000 0000 file............ FILE HEADER 4.2: Name=yafile.txt @@ -38,7 +38,7 @@ FILE HEADER 4: Name=adir 0000120: 6865 7220 6669 6c65 0a00 0000 0000 0000 her file........ FILE HEADER 4.3: Name=. - 0000130: 0000 0150 0000 0090 0000 0000 d1ff fe20 ...P........... + 0000130: 0000 0150 0000 0090 0000 0000 d1ff fe20 ...P........... 0000140: 2e00 0000 0000 0000 0000 0000 0000 0000 ................ FILE HEADER 4.4: Name=.. diff --git a/apps/examples/sendmail/Makefile b/apps/examples/sendmail/Makefile index a3b8b7288..57f4e4615 100644 --- a/apps/examples/sendmail/Makefile +++ b/apps/examples/sendmail/Makefile @@ -62,7 +62,7 @@ ROOTDEPPATH = --dep-path . # Common build -VPATH = +VPATH = all: .built .PHONY: clean depend distclean diff --git a/apps/examples/serloop/Makefile b/apps/examples/serloop/Makefile index 4a262884b..20f348269 100644 --- a/apps/examples/serloop/Makefile +++ b/apps/examples/serloop/Makefile @@ -62,7 +62,7 @@ ROOTDEPPATH = --dep-path . # Common build -VPATH = +VPATH = all: .built .PHONY: clean depend distclean diff --git a/apps/examples/slcd/Makefile b/apps/examples/slcd/Makefile index c7ac96950..54252879f 100644 --- a/apps/examples/slcd/Makefile +++ b/apps/examples/slcd/Makefile @@ -68,7 +68,7 @@ ROOTDEPPATH = --dep-path . # Common build -VPATH = +VPATH = all: .built .PHONY: clean depend distclean diff --git a/apps/examples/smart/Makefile b/apps/examples/smart/Makefile index 60614ca5d..d0a5f738a 100644 --- a/apps/examples/smart/Makefile +++ b/apps/examples/smart/Makefile @@ -62,7 +62,7 @@ ROOTDEPPATH = --dep-path . # Common build -VPATH = +VPATH = all: .built .PHONY: clean depend distclean diff --git a/apps/examples/smart/smart_main.c b/apps/examples/smart/smart_main.c index b373d78cd..d01f814f3 100644 --- a/apps/examples/smart/smart_main.c +++ b/apps/examples/smart/smart_main.c @@ -281,7 +281,7 @@ static inline void smart_randname(FAR struct smart_filedesc_s *file) { file->name[i] = smart_randchar(); } - + file->name[alloclen] = '\0'; } diff --git a/apps/examples/smart_test/Makefile b/apps/examples/smart_test/Makefile index 5864b1cdc..fb6100464 100644 --- a/apps/examples/smart_test/Makefile +++ b/apps/examples/smart_test/Makefile @@ -71,7 +71,7 @@ ROOTDEPPATH = --dep-path . # Common build -VPATH = +VPATH = all: .built .PHONY: context depend clean distclean diff --git a/apps/examples/smart_test/README.txt b/apps/examples/smart_test/README.txt index 4102df9e7..3cd9e5536 100644 --- a/apps/examples/smart_test/README.txt +++ b/apps/examples/smart_test/README.txt @@ -11,7 +11,7 @@ append and seek-with-write operations. Usage: flash_test mtdblock_device - + Additional options: --force to replace existing installation diff --git a/apps/examples/smart_test/smart_test.c b/apps/examples/smart_test/smart_test.c index efce1b0bf..bffb04c2c 100644 --- a/apps/examples/smart_test/smart_test.c +++ b/apps/examples/smart_test/smart_test.c @@ -104,12 +104,12 @@ static int smart_create_test_file(char *filename) sprintf(string, "This is line %d at offset %d\n", x, g_linePos[x]); g_lineLen[x] = strlen(string); - fprintf(fd, "%s", string); + fprintf(fd, "%s", string); printf("\r%d", x); fflush(stdout); - } - + } + /* Close the file */ printf("\r\nDone.\n"); @@ -203,7 +203,7 @@ static int smart_append_test(char *filename) /* Now seek to the end of the file and ensure that is where * pos is. */ - + fseek(fd, 0, SEEK_END); if (ftell(fd) != pos) { diff --git a/apps/examples/telnetd/Makefile b/apps/examples/telnetd/Makefile index 4391870c0..7ba00ba11 100644 --- a/apps/examples/telnetd/Makefile +++ b/apps/examples/telnetd/Makefile @@ -68,7 +68,7 @@ STACKSIZE = 2048 # Common build -VPATH = +VPATH = all: .built .PHONY: context clean depend distclean diff --git a/apps/examples/thttpd/Makefile b/apps/examples/thttpd/Makefile index 85a26d39f..b74dc70dd 100644 --- a/apps/examples/thttpd/Makefile +++ b/apps/examples/thttpd/Makefile @@ -62,7 +62,7 @@ ROOTDEPPATH = --dep-path . # Common build -VPATH = +VPATH = all: .built .PHONY: headers clean depend distclean diff --git a/apps/examples/thttpd/content/Makefile b/apps/examples/thttpd/content/Makefile index b4deddef5..9ef8fe98a 100644 --- a/apps/examples/thttpd/content/Makefile +++ b/apps/examples/thttpd/content/Makefile @@ -56,7 +56,7 @@ $(foreach DIR, $(SUBDIRS), $(eval $(call DIR_template,$(DIR),build, all))) $(foreach DIR, $(SUBDIRS), $(eval $(call DIR_template,$(DIR),clean,clean))) $(foreach DIR, $(SUBDIRS), $(eval $(call DIR_template,$(DIR),install,install))) -# Build program(s) in each sud-directory +# Build program(s) in each sud-directory build: $(foreach DIR, $(SUBDIRS), $(DIR)_build) diff --git a/apps/examples/thttpd/content/hello/Makefile b/apps/examples/thttpd/content/hello/Makefile index 2cdead59c..2856490ab 100644 --- a/apps/examples/thttpd/content/hello/Makefile +++ b/apps/examples/thttpd/content/hello/Makefile @@ -69,7 +69,7 @@ $(BIN): $(BIN).r2 @echo "LD: $<" $(Q) $(LDNXFLAT) $(LDNXFLATFLAGS) -o $@ $^ -clean: +clean: $(call DELFILE, $(BIN)) $(call DELFILE, $(R2SRC)) $(call DELFILE, *.r1) diff --git a/apps/examples/thttpd/content/hello/hello.c b/apps/examples/thttpd/content/hello/hello.c index 386759fc2..1187852d6 100644 --- a/apps/examples/thttpd/content/hello/hello.c +++ b/apps/examples/thttpd/content/hello/hello.c @@ -70,7 +70,7 @@ int main(int argc, char *argv[]) "</div>\r\n" "<div class=\"contentblock\">\r\n"); printf( - "<h2>Hello, World!</h2><p>Requested by: %s</p>\r\n", + "<h2>Hello, World!</h2><p>Requested by: %s</p>\r\n", getenv("REMOTE_ADDR")); puts( "</body>\r\n" diff --git a/apps/examples/thttpd/content/index.html b/apps/examples/thttpd/content/index.html index 1fba1fbf6..fba05f407 100644 --- a/apps/examples/thttpd/content/index.html +++ b/apps/examples/thttpd/content/index.html @@ -2,7 +2,7 @@ <html> <head> <title>NuttX examples/thttpd</title> - <link rel="stylesheet" type="text/css" href="style.css"> + <link rel="stylesheet" type="text/css" href="style.css"> </head> <body bgcolor="#fffeec" text="black"> diff --git a/apps/examples/thttpd/content/netstat/Makefile b/apps/examples/thttpd/content/netstat/Makefile index 98675bd88..6d89bcd88 100644 --- a/apps/examples/thttpd/content/netstat/Makefile +++ b/apps/examples/thttpd/content/netstat/Makefile @@ -69,7 +69,7 @@ $(BIN): $(BIN).r2 @echo "LD: $<" $(Q) $(LDNXFLAT) $(LDNXFLATFLAGS) -o $@ $^ -clean: +clean: $(call DELFILE, $(BIN)) $(call DELFILE, $(R2SRC)) $(call DELFILE, *.r1) diff --git a/apps/examples/thttpd/content/style.css b/apps/examples/thttpd/content/style.css index bfb0997a8..bd3395b34 100644 --- a/apps/examples/thttpd/content/style.css +++ b/apps/examples/thttpd/content/style.css @@ -1,10 +1,10 @@ -h1 +h1 { text-align: center; font-size:14pt; font-family:arial,helvetica; font-weight:bold; - padding:10px; + padding:10px; } body @@ -24,7 +24,7 @@ body background-color: #fffcd2; text-align:left; font-size:9pt; - font-family:arial,helvetica; + font-family:arial,helvetica; } div.menubox @@ -36,14 +36,14 @@ div.menubox } .contentblock -{ +{ margin: 4px; width:60%; padding:2px; border: 1px dotted; background-color: white; font-size:8pt; - font-family:arial,helvetica; + font-family:arial,helvetica; } p.intro @@ -51,20 +51,20 @@ p.intro margin-left:20px; margin-right:20px; font-size:10pt; - font-family:arial,helvetica; + font-family:arial,helvetica; } p.clink { font-size:12pt; - font-family:courier,monospace; + font-family:courier,monospace; text-align:center; } p.clink9 { font-size:9pt; - font-family:courier,monospace; + font-family:courier,monospace; text-align:center; } @@ -75,6 +75,6 @@ p p.right { - text-align:right; + text-align:right; } diff --git a/apps/examples/thttpd/content/tasks/Makefile b/apps/examples/thttpd/content/tasks/Makefile index bf9811524..418fca2b3 100644 --- a/apps/examples/thttpd/content/tasks/Makefile +++ b/apps/examples/thttpd/content/tasks/Makefile @@ -69,7 +69,7 @@ $(BIN): $(BIN).r2 @echo "LD: $<" $(Q) $(LDNXFLAT) $(LDNXFLATFLAGS) -o $@ $^ -clean: +clean: $(call DELFILE, $(BIN)) $(call DELFILE, $(R2SRC)) $(call DELFILE, *.r1) diff --git a/apps/examples/thttpd/content/tasks/tasks.c b/apps/examples/thttpd/content/tasks/tasks.c index 393ef5a23..a6cf14adc 100644 --- a/apps/examples/thttpd/content/tasks/tasks.c +++ b/apps/examples/thttpd/content/tasks/tasks.c @@ -64,15 +64,15 @@ static const char *g_statenames[] = { "INVALID ", "PENDING ", - "READY ", - "RUNNING ", - "INACTIVE", - "WAITSEM ", + "READY ", + "RUNNING ", + "INACTIVE", + "WAITSEM ", #ifndef CONFIG_DISABLE_MQUEUE - "WAITSIG ", + "WAITSIG ", #endif #ifndef CONFIG_DISABLE_MQUEUE - "MQNEMPTY", + "MQNEMPTY", "MQNFULL " #endif }; diff --git a/apps/examples/tiff/Makefile b/apps/examples/tiff/Makefile index 7be74a587..567a5dbe6 100644 --- a/apps/examples/tiff/Makefile +++ b/apps/examples/tiff/Makefile @@ -68,7 +68,7 @@ STACKSIZE = 2048 # Common build -VPATH = +VPATH = all: .built .PHONY: clean depend distclean diff --git a/apps/examples/tiff/tiff_main.c b/apps/examples/tiff/tiff_main.c index 357e29bf8..d3169d149 100644 --- a/apps/examples/tiff/tiff_main.c +++ b/apps/examples/tiff/tiff_main.c @@ -144,7 +144,7 @@ int tiff_main(int argc, char *argv[]) { *ptr++ = (green + blue) >> 1; *ptr++ = green; - *ptr++ = blue; + *ptr++ = blue; } ret = tiff_addstrip(&info, strip); diff --git a/apps/examples/touchscreen/Makefile b/apps/examples/touchscreen/Makefile index 6a3127f42..b9dea1d39 100644 --- a/apps/examples/touchscreen/Makefile +++ b/apps/examples/touchscreen/Makefile @@ -68,7 +68,7 @@ STACKSIZE = 2048 # Common build -VPATH = +VPATH = all: .built .PHONY: context clean depend distclean diff --git a/apps/examples/udp/Makefile b/apps/examples/udp/Makefile index 118c42307..60932024e 100644 --- a/apps/examples/udp/Makefile +++ b/apps/examples/udp/Makefile @@ -39,7 +39,7 @@ include $(APPDIR)/Make.defs # UDP Test -TARG_ASRCS = +TARG_ASRCS = TARG_CSRCS = target.c ifeq ($(CONFIG_EXAMPLES_UDP_SERVER),y) @@ -84,7 +84,7 @@ ROOTDEPPATH = --dep-path . # Common build -VPATH = +VPATH = all: .built .PHONY: clean depend distclean diff --git a/apps/examples/udp/udp-server.c b/apps/examples/udp/udp-server.c index 1f4774deb..191f89cc0 100644 --- a/apps/examples/udp/udp-server.c +++ b/apps/examples/udp/udp-server.c @@ -126,14 +126,14 @@ void recv_server(void) { message("server: %d. Receiving up 1024 bytes\n", offset); addrlen = sizeof(struct sockaddr_in); - nbytes = recvfrom(sockfd, inbuf, 1024, 0, + nbytes = recvfrom(sockfd, inbuf, 1024, 0, (struct sockaddr*)&client, &addrlen); tmpaddr = ntohl(client.sin_addr.s_addr); message("server: %d. Received %d bytes from %d.%d.%d.%d:%d\n", - offset, nbytes, - tmpaddr >> 24, (tmpaddr >> 16) & 0xff, - (tmpaddr >> 8) & 0xff, tmpaddr & 0xff, + offset, nbytes, + tmpaddr >> 24, (tmpaddr >> 16) & 0xff, + (tmpaddr >> 8) & 0xff, tmpaddr & 0xff, ntohs(client.sin_port)); if (nbytes < 0) diff --git a/apps/examples/uip/Makefile b/apps/examples/uip/Makefile index b154532b7..11da70050 100644 --- a/apps/examples/uip/Makefile +++ b/apps/examples/uip/Makefile @@ -62,7 +62,7 @@ ROOTDEPPATH = --dep-path . # Common build -VPATH = +VPATH = all: .built .PHONY: clean depend distclean diff --git a/apps/examples/uip/httpd-fs/header.html b/apps/examples/uip/httpd-fs/header.html index 70df07fa6..ce2659cd4 100644 --- a/apps/examples/uip/httpd-fs/header.html +++ b/apps/examples/uip/httpd-fs/header.html @@ -2,7 +2,7 @@ <html> <head> <title>Welcome to the uIP web server!</title> - <link rel="stylesheet" type="text/css" href="style.css"> + <link rel="stylesheet" type="text/css" href="style.css"> </head> <body bgcolor="#fffeec" text="black"> @@ -12,5 +12,5 @@ <div class="menubox"><a href="stats.shtml">Network statistics</a></div> <br> </div> - + <div class="contentblock"> diff --git a/apps/examples/uip/httpd-fs/style.css b/apps/examples/uip/httpd-fs/style.css index ba6df7f15..b35cd7efc 100644 --- a/apps/examples/uip/httpd-fs/style.css +++ b/apps/examples/uip/httpd-fs/style.css @@ -1,10 +1,10 @@ -h1 +h1 { text-align: center; font-size:14pt; font-family:arial,helvetica; font-weight:bold; - padding:10px; + padding:10px; } body @@ -27,9 +27,9 @@ body border: solid 1px; background-color: #fffcd2; text-align:left; - + font-size:9pt; - font-family:arial,helvetica; + font-family:arial,helvetica; } div.menubox @@ -41,7 +41,7 @@ text-align: center; } .contentblock -{ +{ margin: 4px; width:60%; @@ -51,7 +51,7 @@ text-align: center; background-color: white; font-size:8pt; - font-family:arial,helvetica; + font-family:arial,helvetica; } @@ -62,20 +62,20 @@ p.intro font-size:10pt; /* font-weight:bold; */ - font-family:arial,helvetica; + font-family:arial,helvetica; } p.clink { font-size:12pt; - font-family:courier,monospace; + font-family:courier,monospace; text-align:center; } p.clink9 { font-size:9pt; - font-family:courier,monospace; + font-family:courier,monospace; text-align:center; } @@ -87,6 +87,6 @@ p p.right { - text-align:right; + text-align:right; } diff --git a/apps/examples/usbserial/Makefile b/apps/examples/usbserial/Makefile index ec7219505..9f7c7a814 100644 --- a/apps/examples/usbserial/Makefile +++ b/apps/examples/usbserial/Makefile @@ -61,7 +61,7 @@ ROOTDEPPATH = --dep-path . # Common build -VPATH = +VPATH = all: .built .PHONY: clean depend distclean diff --git a/apps/examples/usbserial/Makefile.host b/apps/examples/usbserial/Makefile.host index a98ed8d5f..2dbaa7e92 100644 --- a/apps/examples/usbserial/Makefile.host +++ b/apps/examples/usbserial/Makefile.host @@ -33,7 +33,7 @@ # ############################################################################ -# TOPDIR must be defined on the make command line +# TOPDIR must be defined on the make command line -include $(TOPDIR)/Make.defs diff --git a/apps/examples/usbterm/Makefile b/apps/examples/usbterm/Makefile index bf27558c5..84608f586 100644 --- a/apps/examples/usbterm/Makefile +++ b/apps/examples/usbterm/Makefile @@ -68,7 +68,7 @@ STACKSIZE = 2048 # Common build -VPATH = +VPATH = all: .built .PHONY: context clean depend distclean diff --git a/apps/examples/usbterm/usbterm_main.c b/apps/examples/usbterm/usbterm_main.c index a3f6f03e0..4d25ad1ce 100644 --- a/apps/examples/usbterm/usbterm_main.c +++ b/apps/examples/usbterm/usbterm_main.c @@ -285,7 +285,7 @@ int usbterm_main(int argc, char *argv[]) /* Start the USB term listener thread */ message("usbterm_main: Starting the listener thread\n"); - + ret = pthread_attr_init(&attr); if (ret != OK) { diff --git a/apps/examples/watchdog/Makefile b/apps/examples/watchdog/Makefile index 076272fe3..f6b80652b 100644 --- a/apps/examples/watchdog/Makefile +++ b/apps/examples/watchdog/Makefile @@ -68,7 +68,7 @@ STACKSIZE = 2048 # Common build -VPATH = +VPATH = all: .built .PHONY: context clean depend distclean diff --git a/apps/examples/wget/Makefile b/apps/examples/wget/Makefile index 3e5f5d63d..5e6c1480c 100644 --- a/apps/examples/wget/Makefile +++ b/apps/examples/wget/Makefile @@ -62,7 +62,7 @@ ROOTDEPPATH = --dep-path . # Common build -VPATH = +VPATH = all: .built .PHONY: clean depend distclean diff --git a/apps/examples/wget/target.c b/apps/examples/wget/target.c index 9a1de83b3..62bb08978 100644 --- a/apps/examples/wget/target.c +++ b/apps/examples/wget/target.c @@ -36,7 +36,7 @@ /**************************************************************************** * Included Files ****************************************************************************/ - + #include <nuttx/config.h> #include <stdint.h> @@ -144,7 +144,7 @@ int wget_main(int argc, char *argv[]) uip_setnetmask("eth0", &addr); /* Then start the server */ - + wget(CONFIG_EXAMPLES_WGET_URL, g_iobuffer, 512, callback, NULL); return 0; } diff --git a/apps/examples/wgetjson/Makefile b/apps/examples/wgetjson/Makefile index 89cb3e11e..f40d86ba9 100644 --- a/apps/examples/wgetjson/Makefile +++ b/apps/examples/wgetjson/Makefile @@ -68,7 +68,7 @@ STACKSIZE = 2048 # Common build -VPATH = +VPATH = all: .built .PHONY: context clean depend distclean diff --git a/apps/examples/wgetjson/webserver/wgetjson/json_cmd.php b/apps/examples/wgetjson/webserver/wgetjson/json_cmd.php index 2b66ff18f..458c910a4 100644 --- a/apps/examples/wgetjson/webserver/wgetjson/json_cmd.php +++ b/apps/examples/wgetjson/webserver/wgetjson/json_cmd.php @@ -1,13 +1,13 @@ -<?php
-/*
-$json = "{\n\"name\": \"Jack (\\\"Bee\\\") Nimble\", \n\"format\": {\"type\": \"rect\", \n\"width\": 1920, \n\"height\": 1080, \n\"interlace\": false,\"frame rate\": 24\n}\n}";
-*/
-$ja["name"] = "Jack (\"Bee\") Nimble";
-$ja["format"]["type"] = "rect";
-$ja["format"]["width"] = 1920;
-$ja["format"]["height"] = 1080;
-$ja["format"]["interlace"] = false;
-$ja["format"]["frame rate"] = 24;
-
-echo json_encode($ja);
+<?php +/* +$json = "{\n\"name\": \"Jack (\\\"Bee\\\") Nimble\", \n\"format\": {\"type\": \"rect\", \n\"width\": 1920, \n\"height\": 1080, \n\"interlace\": false,\"frame rate\": 24\n}\n}"; +*/ +$ja["name"] = "Jack (\"Bee\") Nimble"; +$ja["format"]["type"] = "rect"; +$ja["format"]["width"] = 1920; +$ja["format"]["height"] = 1080; +$ja["format"]["interlace"] = false; +$ja["format"]["frame rate"] = 24; + +echo json_encode($ja); ?>
\ No newline at end of file diff --git a/apps/examples/xmlrpc/Makefile b/apps/examples/xmlrpc/Makefile index b103fd7ed..305e94285 100644 --- a/apps/examples/xmlrpc/Makefile +++ b/apps/examples/xmlrpc/Makefile @@ -69,7 +69,7 @@ ROOTDEPPATH = --dep-path . # Common build -VPATH = +VPATH = all: .built .PHONY: clean depend distclean diff --git a/apps/examples/xmlrpc/calls.c b/apps/examples/xmlrpc/calls.c index bda164f4d..d839404b5 100644 --- a/apps/examples/xmlrpc/calls.c +++ b/apps/examples/xmlrpc/calls.c @@ -1,6 +1,6 @@ /**************************************************************************** * apps/examples/xmlrpc/calls.c - * + * * Copyright (C) 2012 Max Holtzberg. All rights reserved. * Author: Max Holtzberg <mh@uvc.de> * @@ -9,34 +9,34 @@ * an-embeddable-lightweight-xml-rpc-server/184405364 * * Copyright (c) 2002 Cogito LLC. All rights reserved. - * - * Redistribution and use in source and binary forms, with or - * without modification, is hereby granted without fee provided + * + * Redistribution and use in source and binary forms, with or + * without modification, is hereby granted without fee provided * that the following conditions are met: - * - * 1. Redistributions of source code must retain the above - * copyright notice, this list of conditions and the + * + * 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 + * 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 of Cogito LLC nor the names of its - * contributors may be used to endorse or promote products - * derived from this software without specific prior + * 3. Neither the name of Cogito LLC 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 COGITO LLC AND CONTRIBUTERS 'AS IS' - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED - * TO, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A - * PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL COGITO LLC - * OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARAY, 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 + * + * THIS SOFTWARE IS PROVIDED BY COGITO LLC AND CONTRIBUTERS 'AS IS' + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED + * TO, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A + * PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL COGITO LLC + * OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARAY, 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. ****************************************************************************/ diff --git a/apps/examples/xmlrpc/xmlrpc_main.c b/apps/examples/xmlrpc/xmlrpc_main.c index 6c3ddfc24..d28d6eae6 100644 --- a/apps/examples/xmlrpc/xmlrpc_main.c +++ b/apps/examples/xmlrpc/xmlrpc_main.c @@ -1,6 +1,6 @@ /**************************************************************************** * apps/examples/xmlrpc/xmlrpc_main.c - * + * * Copyright (C) 2012 Max Holtzberg. All rights reserved. * Author: Max Holtzberg <mh@uvc.de> * @@ -9,34 +9,34 @@ * an-embeddable-lightweight-xml-rpc-server/184405364 * * Copyright (c) 2002 Cogito LLC. All rights reserved. - * - * Redistribution and use in source and binary forms, with or - * without modification, is hereby granted without fee provided + * + * Redistribution and use in source and binary forms, with or + * without modification, is hereby granted without fee provided * that the following conditions are met: - * - * 1. Redistributions of source code must retain the above - * copyright notice, this list of conditions and the + * + * 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 + * 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 of Cogito LLC nor the names of its - * contributors may be used to endorse or promote products - * derived from this software without specific prior + * 3. Neither the name of Cogito LLC 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 COGITO LLC AND CONTRIBUTERS 'AS IS' - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED - * TO, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A - * PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL COGITO LLC - * OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARAY, 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 + * + * THIS SOFTWARE IS PROVIDED BY COGITO LLC AND CONTRIBUTERS 'AS IS' + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED + * TO, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A + * PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL COGITO LLC + * OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARAY, 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. ****************************************************************************/ diff --git a/apps/graphics/Makefile b/apps/graphics/Makefile index 20f54c517..52d42c563 100644 --- a/apps/graphics/Makefile +++ b/apps/graphics/Makefile @@ -41,7 +41,7 @@ SUBDIRS = tiff screenshot # Sub-directories that might need context setup -CNTXTDIRS = +CNTXTDIRS = all: nothing .PHONY: nothing context depend clean distclean diff --git a/apps/graphics/screenshot/Makefile b/apps/graphics/screenshot/Makefile index 04bc48d05..08a6f351f 100644 --- a/apps/graphics/screenshot/Makefile +++ b/apps/graphics/screenshot/Makefile @@ -72,7 +72,7 @@ STACKSIZE = 4096 # Common build -VPATH = +VPATH = all: .built .PHONY: clean depend distclean diff --git a/apps/graphics/screenshot/screenshot_main.c b/apps/graphics/screenshot/screenshot_main.c index 04f4e9281..c058081a7 100644 --- a/apps/graphics/screenshot/screenshot_main.c +++ b/apps/graphics/screenshot/screenshot_main.c @@ -88,17 +88,17 @@ static void replace_extension(FAR const char *filename, FAR const char *newext, { FAR char *p = strrchr(filename, '.'); int len = strlen(filename); - + if (p != NULL) { len = p - filename; } - + if (len > size) { len = size - strlen(newext); } - + strncpy(dest, filename, size); strncpy(dest + len, newext, size - len); } @@ -133,25 +133,25 @@ int save_screenshot(FAR const char *filename) replace_extension(filename, ".tm2", tempf2, sizeof(tempf2)); /* Connect to NX server */ - + server = nx_connect(); if (!server) { perror("nx_connect"); return 1; } - + /* Wait for "connected" event */ - + if (nx_eventhandler(server) < 0) { perror("nx_eventhandler"); nx_disconnect(server); return 1; } - + /* Open invisible dummy window for communication */ - + window = nx_openwindow(server, &cb, NULL); if (!window) { @@ -159,9 +159,9 @@ int save_screenshot(FAR const char *filename) nx_disconnect(server); return 1; } - + nx_setsize(window, &size); - + /* Configure the TIFF structure */ memset(&info, 0, sizeof(struct tiff_info_s)); @@ -174,7 +174,7 @@ int save_screenshot(FAR const char *filename) info.imgheight = size.h; info.iobuffer = (uint8_t *)malloc(300); info.iosize = 300; - + /* Initialize the TIFF library */ ret = tiff_initialize(&info); @@ -187,12 +187,12 @@ int save_screenshot(FAR const char *filename) /* Add each strip to the TIFF file */ strip = malloc(size.w * 3); - + for (int y = 0; y < size.h; y++) { struct nxgl_rect_s rect = {{0, y}, {size.w - 1, y}}; nx_getrectangle(window, &rect, 0, strip, 0); - + ret = tiff_addstrip(&info, strip); if (ret < 0) { @@ -200,9 +200,9 @@ int save_screenshot(FAR const char *filename) break; } } - + free(strip); - + /* Then finalize the TIFF file */ ret = tiff_finalize(&info); @@ -210,11 +210,11 @@ int save_screenshot(FAR const char *filename) { printf("tiff_finalize() failed: %d\n", ret); } - + free(info.iobuffer); nx_closewindow(window); nx_disconnect(server); - + return 0; } @@ -233,6 +233,6 @@ int screenshot_main(int argc, char *argv[]) fprintf(stderr, "Usage: screenshot file.tif\n"); return 1; } - + return save_screenshot(argv[1]); } diff --git a/apps/graphics/tiff/Makefile b/apps/graphics/tiff/Makefile index b5f6c5b73..8eff3a0cd 100644 --- a/apps/graphics/tiff/Makefile +++ b/apps/graphics/tiff/Makefile @@ -62,7 +62,7 @@ ROOTDEPPATH = --dep-path . # Common build -VPATH = +VPATH = all: .built .PHONY: context clean depend distclean diff --git a/apps/graphics/tiff/tiff_addstrip.c b/apps/graphics/tiff/tiff_addstrip.c index 7b5c4fb8f..2abd25120 100644 --- a/apps/graphics/tiff/tiff_addstrip.c +++ b/apps/graphics/tiff/tiff_addstrip.c @@ -216,7 +216,7 @@ int tiff_addstrip(FAR struct tiff_info_s *info, FAR const uint8_t *strip) /* Increment the size of tmp2file. */ info->tmp2size += info->bps; - + /* Pad tmpfile2 as necessary achieve word alignment */ newsize = tiff_wordalign(info->tmp2fd, info->tmp2size); diff --git a/apps/graphics/tiff/tiff_finalize.c b/apps/graphics/tiff/tiff_finalize.c index abae79b63..d2c6b9c19 100644 --- a/apps/graphics/tiff/tiff_finalize.c +++ b/apps/graphics/tiff/tiff_finalize.c @@ -97,7 +97,7 @@ static int tiff_readifdentry(int fd, off_t offset, { return -errno; } - + /* Then read the IFD entry. Anything returned by tiff_read other than the * size of the IFD entry would be an error. */ @@ -179,8 +179,8 @@ static void tiff_cleanup(FAR struct tiff_info_s *info) /* And remove the temporary files */ - (void)unlink(info->tmpfile1); - (void)unlink(info->tmpfile2); + (void)unlink(info->tmpfile1); + (void)unlink(info->tmpfile2); } /**************************************************************************** @@ -434,6 +434,6 @@ void tiff_abort(FAR struct tiff_info_s *info) /* But then delete the output file as well */ - (void)unlink(info->outfile); + (void)unlink(info->outfile); } diff --git a/apps/graphics/tiff/tiff_initialize.c b/apps/graphics/tiff/tiff_initialize.c index ddd5fc29d..2d6f66a50 100644 --- a/apps/graphics/tiff/tiff_initialize.c +++ b/apps/graphics/tiff/tiff_initialize.c @@ -58,7 +58,7 @@ * * Offset Description Contents/Notes * Header: 0 Byte Order "II" or "MM" - * 2 Magic Number 42 + * 2 Magic Number 42 * 4 1st IFD offset 10 * 8 [2 bytes padding] * IFD: 10 Number of Directory Entries 13 @@ -110,7 +110,7 @@ /* Greyscale Images have one additional IFD entry: BitsPerSample (4 or 8) * * Header: 0 Byte Order "II" or "MM" - * 2 Magic Number 42 + * 2 Magic Number 42 * 4 1st IFD offset 10 * 8 [2 bytes padding] * IFD: 10 Number of Directory Entries 14 @@ -156,7 +156,7 @@ * SamplesPerPixel (3): * * Header: 0 Byte Order "II" or "MM" - * 2 Magic Number 42 + * 2 Magic Number 42 * 4 1st IFD offset 10 * 8 [2 bytes padding] * IFD: 10 Number of Directory Entries 15 @@ -397,7 +397,7 @@ static int tiff_putifdentry16(FAR struct tiff_info_s *info, uint16_t tag, * Get the DateTime string * * Input Parameters: - * + * * * Returned Value: * Zero (OK) on success. A negated errno value on failure. @@ -526,7 +526,7 @@ int tiff_initialize(FAR struct tiff_info_s *info) /* Write the TIFF header data to the outfile: * * Header: 0 Byte Order "II" or "MM" - * 2 Magic Number 42 + * 2 Magic Number 42 * 4 1st IFD offset 10 * 8 [2 bytes padding] */ @@ -793,11 +793,11 @@ int tiff_initialize(FAR struct tiff_info_s *info) tiff_offset(offset, 4); /* Now we begin the value section of the file */ - + tiff_checkoffs(offset, info->filefmt->valoffset); /* Write the XResolution and YResolution data: - * + * * Bi-level Images: Offset 172 Count, Hard-coded to 300/1 * Offset 180 Count, Hard-coded to 300/1 * Greyscale: Offset 184 Count, Hard-coded to 300/1 @@ -857,7 +857,7 @@ int tiff_initialize(FAR struct tiff_info_s *info) * Greyscale: Offset 200, Hard-coded "NuttX" * RGB: Offset 220, Hard-coded "NuttX" */ - + tiff_checkoffs(offset, info->filefmt->swoffset); ret = tiff_putstring(info->outfd, TIFF_SOFTWARE_STRING, TIFF_SOFTWARE_STRLEN); if (ret < 0) diff --git a/apps/graphics/tiff/tiff_utils.c b/apps/graphics/tiff/tiff_utils.c index 33886d796..499be096d 100644 --- a/apps/graphics/tiff/tiff_utils.c +++ b/apps/graphics/tiff/tiff_utils.c @@ -286,7 +286,7 @@ int tiff_write(int fd, FAR const void *buffer, size_t count) int tiff_putint16(int fd, uint16_t value) { uint8_t bytes[2]; - + /* Write the two bytes to the output file */ tiff_put16(bytes, value); @@ -311,7 +311,7 @@ int tiff_putint16(int fd, uint16_t value) int tiff_putint32(int fd, uint32_t value) { uint8_t bytes[4]; - + /* Write the four bytes to the output file */ tiff_put32(bytes, value); @@ -375,7 +375,7 @@ ssize_t tiff_wordalign(int fd, size_t size) { return (ssize_t)ret; } - size += nbytes; + size += nbytes; } return size; } diff --git a/apps/include/modbus/mb.h b/apps/include/modbus/mb.h index be7c0df90..e6f76b1d5 100644 --- a/apps/include/modbus/mb.h +++ b/apps/include/modbus/mb.h @@ -1,4 +1,4 @@ -/* +/* * FreeModbus Libary: A portable Modbus implementation for Modbus ASCII/RTU. * Copyright (c) 2006 Christian Walter <wolti@sil.at> * All rights reserved. @@ -73,7 +73,7 @@ PR_BEGIN_EXTERN_C /*! \ingroup modbus * \brief Use the default Modbus TCP port (502) */ -#define MB_TCP_PORT_USE_DEFAULT 0 +#define MB_TCP_PORT_USE_DEFAULT 0 /* ----------------------- Type definitions ---------------------------------*/ @@ -99,7 +99,7 @@ PR_BEGIN_EXTERN_C * registers should be updated and reading means that the modbus protocol * stack needs to know the current register values. * - * \see eMBRegHoldingCB( ), eMBRegCoilsCB( ), eMBRegDiscreteCB( ) and + * \see eMBRegHoldingCB( ), eMBRegCoilsCB( ), eMBRegDiscreteCB( ) and * eMBRegInputCB( ). */ typedef enum @@ -143,7 +143,7 @@ typedef enum * * \return If no error occurs the function returns eMBErrorCode::MB_ENOERR. * The protocol is then in the disabled state and ready for activation - * by calling eMBEnable( ). Otherwise one of the following error codes + * by calling eMBEnable( ). Otherwise one of the following error codes * is returned: * - eMBErrorCode::MB_EINVAL If the slave address was not valid. Valid * slave addresses are in the range 1 - 247. @@ -172,10 +172,10 @@ eMBErrorCode eMBTCPInit( uint16_t usTCPPort ); * \brief Release resources used by the protocol stack. * * This function disables the Modbus protocol stack and release all - * hardware resources. It must only be called when the protocol stack - * is disabled. + * hardware resources. It must only be called when the protocol stack + * is disabled. * - * \note Note all ports implement this function. A port which wants to + * \note Note all ports implement this function. A port which wants to * get an callback must define the macro MB_PORT_HAS_CLOSE to 1. * * \return If the resources where released it return eMBErrorCode::MB_ENOERR. @@ -190,8 +190,8 @@ eMBErrorCode eMBClose( void ); * This function enables processing of Modbus frames. Enabling the protocol * stack is only possible if it is in the disabled state. * - * \return If the protocol stack is now in the state enabled it returns - * eMBErrorCode::MB_ENOERR. If it was not in the disabled state it + * \return If the protocol stack is now in the state enabled it returns + * eMBErrorCode::MB_ENOERR. If it was not in the disabled state it * return eMBErrorCode::MB_EILLSTATE. */ eMBErrorCode eMBEnable( void ); @@ -201,7 +201,7 @@ eMBErrorCode eMBEnable( void ); * * This function disables processing of Modbus frames. * - * \return If the protocol stack has been disabled it returns + * \return If the protocol stack has been disabled it returns * eMBErrorCode::MB_ENOERR. If it was not in the enabled state it returns * eMBErrorCode::MB_EILLSTATE. */ @@ -213,10 +213,10 @@ eMBErrorCode eMBDisable( void ); * This function must be called periodically. The timer interval required * is given by the application dependent Modbus slave timeout. Internally the * function calls xMBPortEventGet() and waits for an event from the receiver or - * transmitter state machines. + * transmitter state machines. * * \return If the protocol stack is not in the enabled state the function - * returns eMBErrorCode::MB_EILLSTATE. Otherwise it returns + * returns eMBErrorCode::MB_EILLSTATE. Otherwise it returns * eMBErrorCode::MB_ENOERR. */ eMBErrorCode eMBPoll( void ); @@ -250,7 +250,7 @@ eMBErrorCode eMBSetSlaveID( uint8_t ucSlaveID, bool xIsRunning, * The callback handler supplied is responsible for interpreting the Modbus PDU and * the creation of an appropriate response. In case of an error it should return * one of the possible Modbus exceptions which results in a Modbus exception frame - * sent by the protocol stack. + * sent by the protocol stack. * * \param ucFunctionCode The Modbus function code for which this handler should * be registers. Valid function codes are in the range 1 to 127. @@ -263,7 +263,7 @@ eMBErrorCode eMBSetSlaveID( uint8_t ucSlaveID, bool xIsRunning, * case the values in config.h should be adjusted. If the argument was not * valid it returns eMBErrorCode::MB_EINVAL. */ -eMBErrorCode eMBRegisterCB( uint8_t ucFunctionCode, +eMBErrorCode eMBRegisterCB( uint8_t ucFunctionCode, pxMBFunctionHandler pxHandler ); /* ----------------------- Callback -----------------------------------------*/ @@ -301,7 +301,7 @@ eMBErrorCode eMBRegisterCB( uint8_t ucFunctionCode, * - eMBErrorCode::MB_ENOERR If no error occurred. In this case a normal * Modbus response is sent. * - eMBErrorCode::MB_ENOREG If the application can not supply values - * for registers within this range. In this case a + * for registers within this range. In this case a * <b>ILLEGAL DATA ADDRESS</b> exception frame is sent as a response. * - eMBErrorCode::MB_ETIMEDOUT If the requested register block is * currently not available and the application dependent response @@ -325,18 +325,18 @@ eMBErrorCode eMBRegInputCB( uint8_t * pucRegBuffer, uint16_t usAddress, * this buffer. * \param usAddress The starting address of the register. * \param usNRegs Number of registers to read or write. - * \param eMode If eMBRegisterMode::MB_REG_WRITE the application register + * \param eMode If eMBRegisterMode::MB_REG_WRITE the application register * values should be updated from the values in the buffer. For example - * this would be the case when the Modbus master has issued an + * this would be the case when the Modbus master has issued an * <b>WRITE SINGLE REGISTER</b> command. - * If the value eMBRegisterMode::MB_REG_READ the application should copy + * If the value eMBRegisterMode::MB_REG_READ the application should copy * the current values into the buffer \c pucRegBuffer. * * \return The function must return one of the following error codes: * - eMBErrorCode::MB_ENOERR If no error occurred. In this case a normal * Modbus response is sent. * - eMBErrorCode::MB_ENOREG If the application can not supply values - * for registers within this range. In this case a + * for registers within this range. In this case a * <b>ILLEGAL DATA ADDRESS</b> exception frame is sent as a response. * - eMBErrorCode::MB_ETIMEDOUT If the requested register block is * currently not available and the application dependent response @@ -371,7 +371,7 @@ eMBErrorCode eMBRegHoldingCB( uint8_t * pucRegBuffer, uint16_t usAddress, * - eMBErrorCode::MB_ENOERR If no error occurred. In this case a normal * Modbus response is sent. * - eMBErrorCode::MB_ENOREG If the application does not map an coils - * within the requested address range. In this case a + * within the requested address range. In this case a * <b>ILLEGAL DATA ADDRESS</b> is sent as a response. * - eMBErrorCode::MB_ETIMEDOUT If the requested register block is * currently not available and the application dependent response @@ -400,7 +400,7 @@ eMBErrorCode eMBRegCoilsCB( uint8_t * pucRegBuffer, uint16_t usAddress, * - eMBErrorCode::MB_ENOERR If no error occurred. In this case a normal * Modbus response is sent. * - eMBErrorCode::MB_ENOREG If no such discrete inputs exists. - * In this case a <b>ILLEGAL DATA ADDRESS</b> exception frame is sent + * In this case a <b>ILLEGAL DATA ADDRESS</b> exception frame is sent * as a response. * - eMBErrorCode::MB_ETIMEDOUT If the requested register block is * currently not available and the application dependent response diff --git a/apps/include/modbus/mbframe.h b/apps/include/modbus/mbframe.h index 0f701e6e5..5519437bf 100644 --- a/apps/include/modbus/mbframe.h +++ b/apps/include/modbus/mbframe.h @@ -1,4 +1,4 @@ -/* +/* * FreeModbus Libary: A portable Modbus implementation for Modbus ASCII/RTU. * Copyright (c) 2006 Christian Walter <wolti@sil.at> * All rights reserved. diff --git a/apps/include/modbus/mbfunc.h b/apps/include/modbus/mbfunc.h index 68ccdb1d9..b0384fb69 100644 --- a/apps/include/modbus/mbfunc.h +++ b/apps/include/modbus/mbfunc.h @@ -1,4 +1,4 @@ -/* +/* * FreeModbus Libary: A portable Modbus implementation for Modbus ASCII/RTU. * Copyright (c) 2006 Christian Walter <wolti@sil.at> * All rights reserved. @@ -38,7 +38,7 @@ PR_BEGIN_EXTERN_C eMBException eMBFuncReportSlaveID( uint8_t * pucFrame, uint16_t * usLen ); #endif -#ifdef CONFIG_MB_FUNC_READ_INPUT_ENABLED +#ifdef CONFIG_MB_FUNC_READ_INPUT_ENABLED eMBException eMBFuncReadInputRegister( uint8_t * pucFrame, uint16_t * usLen ); #endif diff --git a/apps/include/modbus/mbport.h b/apps/include/modbus/mbport.h index 9301d8c90..fbc1c260d 100644 --- a/apps/include/modbus/mbport.h +++ b/apps/include/modbus/mbport.h @@ -1,4 +1,4 @@ -/* +/* * FreeModbus Libary: A portable Modbus implementation for Modbus ASCII/RTU. * Copyright (c) 2006 Christian Walter <wolti@sil.at> * All rights reserved. diff --git a/apps/include/modbus/mbproto.h b/apps/include/modbus/mbproto.h index 24b0c98e7..c6cd07c21 100644 --- a/apps/include/modbus/mbproto.h +++ b/apps/include/modbus/mbproto.h @@ -1,4 +1,4 @@ -/* +/* * FreeModbus Libary: A portable Modbus implementation for Modbus ASCII/RTU. * Copyright (c) 2006 Christian Walter <wolti@sil.at> * All rights reserved. diff --git a/apps/include/modbus/mbutils.h b/apps/include/modbus/mbutils.h index 5f17376cc..6f026f5f1 100644 --- a/apps/include/modbus/mbutils.h +++ b/apps/include/modbus/mbutils.h @@ -1,4 +1,4 @@ -/* +/* * FreeModbus Libary: A portable Modbus implementation for Modbus ASCII/RTU. * Copyright (c) 2006 Christian Walter <wolti@sil.at> * All rights reserved. diff --git a/apps/include/netutils/cJSON.h b/apps/include/netutils/cJSON.h index 3526782bd..6fc8474d6 100644 --- a/apps/include/netutils/cJSON.h +++ b/apps/include/netutils/cJSON.h @@ -53,13 +53,13 @@ extern "C" #define cJSON_String 4 #define cJSON_Array 5 #define cJSON_Object 6 - + #define cJSON_IsReference 256 #define cJSON_AddNullToObject(object,name) \ cJSON_AddItemToObject(object, name, cJSON_CreateNull()) #define cJSON_AddTrueToObject(object,name) \ - cJSON_AddItemToObject(object, name, cJSON_CreateTrue())cd + cJSON_AddItemToObject(object, name, cJSON_CreateTrue())cd #define cJSON_AddFalseToObject(object,name) \ cJSON_AddItemToObject(object, name, cJSON_CreateFalse()) #define cJSON_AddNumberToObject(object,name,n) \ @@ -79,13 +79,13 @@ typedef struct cJSON * GetArraySize/GetArrayItem/GetObjectItem */ - struct cJSON *next,*prev; + struct cJSON *next,*prev; /* An array or object item will have a child pointer pointing to a chain * of the items in the array/object. */ - struct cJSON *child; + struct cJSON *child; int type; /* The type of the item, as above. */ char *valuestring; /* The item's string, if type==cJSON_String */ @@ -155,7 +155,7 @@ cJSON *cJSON_GetObjectItem(cJSON *object, const char *string); */ const char *cJSON_GetErrorPtr(); - + /* These calls create a cJSON item of the appropriate type. */ cJSON *cJSON_CreateNull(); @@ -193,7 +193,7 @@ cJSON *cJSON_DetachItemFromArray(cJSON *array, int which); void cJSON_DeleteItemFromArray(cJSON *array, int which); cJSON *cJSON_DetachItemFromObject(cJSON *object, const char *string); void cJSON_DeleteItemFromObject(cJSON *object, const char *string); - + /* Update array items. */ void cJSON_ReplaceItemInArray(cJSON *array, int which, cJSON *newitem); diff --git a/apps/include/netutils/httpd.h b/apps/include/netutils/httpd.h index 2eb0d5bde..706c3fd24 100644 --- a/apps/include/netutils/httpd.h +++ b/apps/include/netutils/httpd.h @@ -159,7 +159,7 @@ struct httpd_cgi_call * This macro is used for declaring a HTTPD CGI function. This function is * then added to the list of HTTPD CGI functions with the httpd_cgi_register() * function. - + * Input Paramters: * * name The C variable name of the function diff --git a/apps/include/netutils/webclient.h b/apps/include/netutils/webclient.h index 85ca759e9..ae46c9d13 100644 --- a/apps/include/netutils/webclient.h +++ b/apps/include/netutils/webclient.h @@ -143,7 +143,7 @@ EXTERN int web_posts_strlen(FAR char **name, FAR char **value, int len); * * Returned Value: * 0: if the GET operation completed successfully; - * -1: On a failure with errno set appropriately + * -1: On a failure with errno set appropriately * ****************************************************************************/ diff --git a/apps/include/netutils/xmlrpc.h b/apps/include/netutils/xmlrpc.h index 3136e35ef..8df9e0206 100644 --- a/apps/include/netutils/xmlrpc.h +++ b/apps/include/netutils/xmlrpc.h @@ -1,6 +1,6 @@ /**************************************************************************** * apps/include/netutils/xmlrpc.h - * + * * Copyright (C) 2012 Max Holtzberg. All rights reserved. * Author: Max Holtzberg <mh@uvc.de> * @@ -9,34 +9,34 @@ * an-embeddable-lightweight-xml-rpc-server/184405364 * * Copyright (c) 2002 Cogito LLC. All rights reserved. - * - * Redistribution and use in source and binary forms, with or - * without modification, is hereby granted without fee provided + * + * Redistribution and use in source and binary forms, with or + * without modification, is hereby granted without fee provided * that the following conditions are met: - * - * 1. Redistributions of source code must retain the above - * copyright notice, this list of conditions and the + * + * 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 + * 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 of Cogito LLC nor the names of its - * contributors may be used to endorse or promote products - * derived from this software without specific prior + * 3. Neither the name of Cogito LLC 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 COGITO LLC AND CONTRIBUTERS 'AS IS' - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED - * TO, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A - * PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL COGITO LLC - * OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARAY, 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 + * + * THIS SOFTWARE IS PROVIDED BY COGITO LLC AND CONTRIBUTERS 'AS IS' + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED + * TO, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A + * PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL COGITO LLC + * OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARAY, 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. ****************************************************************************/ diff --git a/apps/include/nsh.h b/apps/include/nsh.h index 8e469a555..ff9eb22dd 100644 --- a/apps/include/nsh.h +++ b/apps/include/nsh.h @@ -83,7 +83,7 @@ #ifdef __cplusplus #define EXTERN extern "C" -extern "C" +extern "C" { #else #define EXTERN extern @@ -119,7 +119,7 @@ void nsh_initialize(void); * single an NSH instance that operates on stdin and stdout. This * function does not return. * - * This function handles generic /dev/console character devices, or + * This function handles generic /dev/console character devices, or * special USB console devices. The USB console requires some special * operations to handle the cases where the session is lost when the * USB device is unplugged and restarted when the USB device is plugged @@ -133,7 +133,7 @@ void nsh_initialize(void); * This function does not normally return. exit() is usually called to * terminate the NSH session. This function will return in the event of * an error. In that case, a nonzero value is returned (EXIT_FAILURE=1). - * + * ****************************************************************************/ int nsh_consolemain(int argc, char *argv[]); @@ -153,7 +153,7 @@ int nsh_consolemain(int argc, char *argv[]); * Returned Values: * The task ID of the Telnet daemon was successfully started. A negated * errno value will be returned on failure. - * + * ****************************************************************************/ int nsh_telnetstart(void); diff --git a/apps/include/tiff.h b/apps/include/tiff.h index e4567641f..c3277c8f4 100644 --- a/apps/include/tiff.h +++ b/apps/include/tiff.h @@ -89,7 +89,7 @@ #define IFD_TAG_IMAGEWIDTH 256 /* ImageLength, SHORT or LONG (Required) */ #define IFD_TAG_IMAGELENGTH 257 /* ImageWidth, SHORT or LONG (Required) */ #define IFD_TAG_BITSPERSAMPLE 258 /* BitsPerSample, SHORT (Required - * in greyscale and pallette-color image files) */ + * in greyscale and pallette-color image files) */ #define IFD_TAG_COMPRESSION 259 /* Compression, SHORT (Required) */ # define TAG_COMP_NONE 1 /* No compression */ # define TAG_COMP_CCITT 2 /* CCITT Group 3 1-Dimensional Modified Huffman @@ -253,7 +253,7 @@ struct tiff_ifdentry_s #define SIZEOF_IFD_ENTRY 12 /************************************************************************************/ -/* Structures needed to interface with the TIFF file creation library )and also +/* Structures needed to interface with the TIFF file creation library )and also * structures used only internally by the TIFF file creation library). */ @@ -349,7 +349,7 @@ struct tiff_info_s off_t tmp2size; /* Current size of tmpfile2 */ /* Points to an internal constant structure of file offsets */ - + FAR const struct tiff_filefmt_s *filefmt; }; diff --git a/apps/include/usbmonitor.h b/apps/include/usbmonitor.h index 01fa060b0..396cf9f32 100644 --- a/apps/include/usbmonitor.h +++ b/apps/include/usbmonitor.h @@ -54,7 +54,7 @@ #ifdef __cplusplus #define EXTERN extern "C" -extern "C" +extern "C" { #else #define EXTERN extern diff --git a/apps/modbus/Kconfig b/apps/modbus/Kconfig index a4194e475..51d3c0c3e 100644 --- a/apps/modbus/Kconfig +++ b/apps/modbus/Kconfig @@ -44,7 +44,7 @@ config MB_ASCII_TIMEOUT_WAIT_BEFORE_SEND_MS MB_ASCII_TIMEOUT_WAIT_BEFORE_SEND_MS to allow for a delay before the serial transmitter is enabled. This is required because some targets are so fast that there is no time between receiving and - transmitting the frame. If the master is to slow with enabling its + transmitting the frame. If the master is to slow with enabling its receiver then he will not receive the response correctly. config MB_FUNC_HANDLERS_MAX diff --git a/apps/modbus/Makefile b/apps/modbus/Makefile index 27548f3d6..49d47abcd 100644 --- a/apps/modbus/Makefile +++ b/apps/modbus/Makefile @@ -114,6 +114,6 @@ distclean: clean $(call DELFILE, Make.dep) $(call DELFILE, .depend) - + -include Make.dep diff --git a/apps/modbus/ascii/mbascii.c b/apps/modbus/ascii/mbascii.c index 4b8a56e01..57ea368a7 100644 --- a/apps/modbus/ascii/mbascii.c +++ b/apps/modbus/ascii/mbascii.c @@ -1,4 +1,4 @@ -/* +/* * FreeModbus Libary: A portable Modbus implementation for Modbus ASCII/RTU. * Copyright (c) 2006 Christian Walter <wolti@sil.at> * All rights reserved. @@ -110,7 +110,7 @@ eMBASCIIInit( uint8_t ucSlaveAddress, uint8_t ucPort, speed_t ulBaudRate, eMBPar { eMBErrorCode eStatus = MB_ENOERR; ( void )ucSlaveAddress; - + ENTER_CRITICAL_SECTION( ); ucMBLFCharacter = MB_ASCII_DEFAULT_LF; diff --git a/apps/modbus/ascii/mbascii.h b/apps/modbus/ascii/mbascii.h index 96001404a..983383d03 100644 --- a/apps/modbus/ascii/mbascii.h +++ b/apps/modbus/ascii/mbascii.h @@ -1,4 +1,4 @@ -/* +/* * FreeModbus Libary: A portable Modbus implementation for Modbus ASCII/RTU. * Copyright (c) 2006 Christian Walter <wolti@sil.at> * All rights reserved. diff --git a/apps/modbus/functions/mbfunccoils.c b/apps/modbus/functions/mbfunccoils.c index d5f23c855..d6e539779 100644 --- a/apps/modbus/functions/mbfunccoils.c +++ b/apps/modbus/functions/mbfunccoils.c @@ -1,4 +1,4 @@ -/* +/* * FreeModbus Libary: A portable Modbus implementation for Modbus ASCII/RTU. * Copyright (c) 2006 Christian Walter <wolti@sil.at> * All rights reserved. @@ -86,7 +86,7 @@ eMBFuncReadCoils( uint8_t * pucFrame, uint16_t * usLen ) usCoilCount |= ( uint16_t )( pucFrame[MB_PDU_FUNC_READ_COILCNT_OFF + 1] ); /* Check if the number of registers to read is valid. If not - * return Modbus illegal data value exception. + * return Modbus illegal data value exception. */ if( ( usCoilCount >= 1 ) && ( usCoilCount < MB_PDU_FUNC_READ_COILCNT_MAX ) ) @@ -124,7 +124,7 @@ eMBFuncReadCoils( uint8_t * pucFrame, uint16_t * usLen ) else { /* The response contains the function code, the starting address - * and the quantity of registers. We reuse the old values in the + * and the quantity of registers. We reuse the old values in the * buffer because they are still valid. */ *usLen += ucNBytes;; } @@ -246,7 +246,7 @@ eMBFuncWriteMultipleCoils( uint8_t * pucFrame, uint16_t * usLen ) else { /* The response contains the function code, the starting address - * and the quantity of registers. We reuse the old values in the + * and the quantity of registers. We reuse the old values in the * buffer because they are still valid. */ *usLen = MB_PDU_FUNC_WRITE_MUL_BYTECNT_OFF; } diff --git a/apps/modbus/functions/mbfuncdiag.c b/apps/modbus/functions/mbfuncdiag.c index d75ffc0f7..8f7b9675b 100644 --- a/apps/modbus/functions/mbfuncdiag.c +++ b/apps/modbus/functions/mbfuncdiag.c @@ -1,4 +1,4 @@ -/* +/* * FreeModbus Libary: A portable Modbus implementation for Modbus ASCII/RTU. * Copyright (c) 2006 Christian Walter <wolti@sil.at> * All rights reserved. diff --git a/apps/modbus/functions/mbfuncdisc.c b/apps/modbus/functions/mbfuncdisc.c index 6f291bf2f..46204d3ce 100644 --- a/apps/modbus/functions/mbfuncdisc.c +++ b/apps/modbus/functions/mbfuncdisc.c @@ -64,7 +64,7 @@ eMBFuncReadDiscreteInputs( uint8_t * pucFrame, uint16_t * usLen ) usDiscreteCnt |= ( uint16_t )( pucFrame[MB_PDU_FUNC_READ_DISCCNT_OFF + 1] ); /* Check if the number of registers to read is valid. If not - * return Modbus illegal data value exception. + * return Modbus illegal data value exception. */ if( ( usDiscreteCnt >= 1 ) && ( usDiscreteCnt < MB_PDU_FUNC_READ_DISCCNT_MAX ) ) @@ -101,7 +101,7 @@ eMBFuncReadDiscreteInputs( uint8_t * pucFrame, uint16_t * usLen ) else { /* The response contains the function code, the starting address - * and the quantity of registers. We reuse the old values in the + * and the quantity of registers. We reuse the old values in the * buffer because they are still valid. */ *usLen += ucNBytes;; } diff --git a/apps/modbus/functions/mbfuncholding.c b/apps/modbus/functions/mbfuncholding.c index 885ce34ca..7e0dee86b 100644 --- a/apps/modbus/functions/mbfuncholding.c +++ b/apps/modbus/functions/mbfuncholding.c @@ -1,4 +1,4 @@ -/* +/* * FreeModbus Libary: A portable Modbus implementation for Modbus ASCII/RTU. * Copyright (c) 2006 Christian Walter <wolti@sil.at> * All rights reserved. @@ -186,7 +186,7 @@ eMBFuncReadHoldingRegister( uint8_t * pucFrame, uint16_t * usLen ) usRegCount = ( uint16_t )( pucFrame[MB_PDU_FUNC_READ_REGCNT_OFF + 1] ); /* Check if the number of registers to read is valid. If not - * return Modbus illegal data value exception. + * return Modbus illegal data value exception. */ if( ( usRegCount >= 1 ) && ( usRegCount <= MB_PDU_FUNC_READ_REGCNT_MAX ) ) { diff --git a/apps/modbus/functions/mbfuncinput.c b/apps/modbus/functions/mbfuncinput.c index 3061340f6..6c87e699a 100644 --- a/apps/modbus/functions/mbfuncinput.c +++ b/apps/modbus/functions/mbfuncinput.c @@ -1,4 +1,4 @@ -/* +/* * FreeModbus Libary: A portable Modbus implementation for Modbus ASCII/RTU. * Copyright (c) 2006 Christian Walter <wolti@sil.at> * All rights reserved. @@ -75,7 +75,7 @@ eMBFuncReadInputRegister( uint8_t * pucFrame, uint16_t * usLen ) usRegCount |= ( uint16_t )( pucFrame[MB_PDU_FUNC_READ_REGCNT_OFF + 1] ); /* Check if the number of registers to read is valid. If not - * return Modbus illegal data value exception. + * return Modbus illegal data value exception. */ if( ( usRegCount >= 1 ) && ( usRegCount < MB_PDU_FUNC_READ_REGCNT_MAX ) ) diff --git a/apps/modbus/functions/mbfuncother.c b/apps/modbus/functions/mbfuncother.c index ea733e905..1082fda50 100644 --- a/apps/modbus/functions/mbfuncother.c +++ b/apps/modbus/functions/mbfuncother.c @@ -1,4 +1,4 @@ -/* +/* * FreeModbus Libary: A portable Modbus implementation for Modbus ASCII/RTU. * Copyright (c) 2006 Christian Walter <wolti@sil.at> * All rights reserved. diff --git a/apps/modbus/functions/mbutils.c b/apps/modbus/functions/mbutils.c index cbe02872b..305abb17a 100644 --- a/apps/modbus/functions/mbutils.c +++ b/apps/modbus/functions/mbutils.c @@ -1,4 +1,4 @@ -/* +/* * FreeModbus Libary: A portable Modbus implementation for Modbus ASCII/RTU. * Copyright (c) 2006 Christian Walter <wolti@sil.at> * All rights reserved. diff --git a/apps/modbus/mb.c b/apps/modbus/mb.c index 54e96460d..a86ce343f 100644 --- a/apps/modbus/mb.c +++ b/apps/modbus/mb.c @@ -1,4 +1,4 @@ -/* +/* * FreeModbus Libary: A portable Modbus implementation for Modbus ASCII/RTU. * Copyright (c) 2006 Christian Walter <wolti@sil.at> * All rights reserved. @@ -160,7 +160,7 @@ eMBInit( eMBMode eMode, uint8_t ucSlaveAddress, uint8_t ucPort, speed_t ulBaudRa eStatus = eMBRTUInit( ucMBAddress, ucPort, ulBaudRate, eParity ); break; #endif -#ifdef CONFIG_MB_ASCII_ENABLED +#ifdef CONFIG_MB_ASCII_ENABLED case MB_ASCII: pvMBFrameStartCur = eMBASCIIStart; pvMBFrameStopCur = eMBASCIIStop; diff --git a/apps/modbus/nuttx/portserial.c b/apps/modbus/nuttx/portserial.c index 68c02830a..fdeb9bc6b 100644 --- a/apps/modbus/nuttx/portserial.c +++ b/apps/modbus/nuttx/portserial.c @@ -174,7 +174,7 @@ bool xMBPortSerialInit(uint8_t ucPort, speed_t ulBaudRate, * cfsetospeed(), and * (3) In NuttX, the input value to cfiset[i|o]speed is not * encoded, but is the absolute baud value. The following might - * not be + * not be */ if (cfsetispeed(&xNewTIO, ulBaudRate) != 0 /* || cfsetospeed(&xNewTIO, ulBaudRate) != 0 */) diff --git a/apps/modbus/rtu/mbcrc.c b/apps/modbus/rtu/mbcrc.c index 82fe3c3fb..3b34edd77 100644 --- a/apps/modbus/rtu/mbcrc.c +++ b/apps/modbus/rtu/mbcrc.c @@ -1,4 +1,4 @@ -/* +/* * FreeModbus Libary: A portable Modbus implementation for Modbus ASCII/RTU. * Copyright (c) 2006 Christian Walter <wolti@sil.at> * All rights reserved. @@ -43,12 +43,12 @@ static const uint8_t aucCRCHi[] = { 0x00, 0xC1, 0x81, 0x40, 0x01, 0xC0, 0x80, 0x41, 0x01, 0xC0, 0x80, 0x41, 0x00, 0xC1, 0x81, 0x40, 0x01, 0xC0, 0x80, 0x41, 0x00, 0xC1, 0x81, 0x40, 0x00, 0xC1, 0x81, 0x40, 0x01, 0xC0, 0x80, 0x41, 0x01, 0xC0, 0x80, 0x41, - 0x00, 0xC1, 0x81, 0x40, 0x00, 0xC1, 0x81, 0x40, 0x01, 0xC0, 0x80, 0x41, + 0x00, 0xC1, 0x81, 0x40, 0x00, 0xC1, 0x81, 0x40, 0x01, 0xC0, 0x80, 0x41, 0x00, 0xC1, 0x81, 0x40, 0x01, 0xC0, 0x80, 0x41, 0x01, 0xC0, 0x80, 0x41, - 0x00, 0xC1, 0x81, 0x40, 0x00, 0xC1, 0x81, 0x40, 0x01, 0xC0, 0x80, 0x41, + 0x00, 0xC1, 0x81, 0x40, 0x00, 0xC1, 0x81, 0x40, 0x01, 0xC0, 0x80, 0x41, 0x01, 0xC0, 0x80, 0x41, 0x00, 0xC1, 0x81, 0x40, 0x01, 0xC0, 0x80, 0x41, 0x00, 0xC1, 0x81, 0x40, 0x00, 0xC1, 0x81, 0x40, 0x01, 0xC0, 0x80, 0x41, - 0x00, 0xC1, 0x81, 0x40, 0x01, 0xC0, 0x80, 0x41, 0x01, 0xC0, 0x80, 0x41, + 0x00, 0xC1, 0x81, 0x40, 0x01, 0xC0, 0x80, 0x41, 0x01, 0xC0, 0x80, 0x41, 0x00, 0xC1, 0x81, 0x40, 0x01, 0xC0, 0x80, 0x41, 0x00, 0xC1, 0x81, 0x40, 0x00, 0xC1, 0x81, 0x40, 0x01, 0xC0, 0x80, 0x41, 0x01, 0xC0, 0x80, 0x41, 0x00, 0xC1, 0x81, 0x40, 0x00, 0xC1, 0x81, 0x40, 0x01, 0xC0, 0x80, 0x41, @@ -64,12 +64,12 @@ static const uint8_t aucCRCLo[] = { 0x14, 0xD4, 0xD5, 0x15, 0xD7, 0x17, 0x16, 0xD6, 0xD2, 0x12, 0x13, 0xD3, 0x11, 0xD1, 0xD0, 0x10, 0xF0, 0x30, 0x31, 0xF1, 0x33, 0xF3, 0xF2, 0x32, 0x36, 0xF6, 0xF7, 0x37, 0xF5, 0x35, 0x34, 0xF4, 0x3C, 0xFC, 0xFD, 0x3D, - 0xFF, 0x3F, 0x3E, 0xFE, 0xFA, 0x3A, 0x3B, 0xFB, 0x39, 0xF9, 0xF8, 0x38, + 0xFF, 0x3F, 0x3E, 0xFE, 0xFA, 0x3A, 0x3B, 0xFB, 0x39, 0xF9, 0xF8, 0x38, 0x28, 0xE8, 0xE9, 0x29, 0xEB, 0x2B, 0x2A, 0xEA, 0xEE, 0x2E, 0x2F, 0xEF, 0x2D, 0xED, 0xEC, 0x2C, 0xE4, 0x24, 0x25, 0xE5, 0x27, 0xE7, 0xE6, 0x26, 0x22, 0xE2, 0xE3, 0x23, 0xE1, 0x21, 0x20, 0xE0, 0xA0, 0x60, 0x61, 0xA1, 0x63, 0xA3, 0xA2, 0x62, 0x66, 0xA6, 0xA7, 0x67, 0xA5, 0x65, 0x64, 0xA4, - 0x6C, 0xAC, 0xAD, 0x6D, 0xAF, 0x6F, 0x6E, 0xAE, 0xAA, 0x6A, 0x6B, 0xAB, + 0x6C, 0xAC, 0xAD, 0x6D, 0xAF, 0x6F, 0x6E, 0xAE, 0xAA, 0x6A, 0x6B, 0xAB, 0x69, 0xA9, 0xA8, 0x68, 0x78, 0xB8, 0xB9, 0x79, 0xBB, 0x7B, 0x7A, 0xBA, 0xBE, 0x7E, 0x7F, 0xBF, 0x7D, 0xBD, 0xBC, 0x7C, 0xB4, 0x74, 0x75, 0xB5, 0x77, 0xB7, 0xB6, 0x76, 0x72, 0xB2, 0xB3, 0x73, 0xB1, 0x71, 0x70, 0xB0, diff --git a/apps/modbus/rtu/mbcrc.h b/apps/modbus/rtu/mbcrc.h index 9ff06e25d..abde43f2c 100644 --- a/apps/modbus/rtu/mbcrc.h +++ b/apps/modbus/rtu/mbcrc.h @@ -1,4 +1,4 @@ -/* +/* * FreeModbus Libary: A portable Modbus implementation for Modbus ASCII/RTU. * Copyright (c) 2006 Christian Walter <wolti@sil.at> * All rights reserved. diff --git a/apps/modbus/rtu/mbrtu.c b/apps/modbus/rtu/mbrtu.c index 196473c17..ee4f95fca 100644 --- a/apps/modbus/rtu/mbrtu.c +++ b/apps/modbus/rtu/mbrtu.c @@ -1,4 +1,4 @@ -/* +/* * FreeModbus Libary: A portable Modbus implementation for Modbus ASCII/RTU. * Copyright (c) 2006 Christian Walter <wolti@sil.at> * All rights reserved. diff --git a/apps/modbus/rtu/mbrtu.h b/apps/modbus/rtu/mbrtu.h index ca35b94a7..bea5d1eeb 100644 --- a/apps/modbus/rtu/mbrtu.h +++ b/apps/modbus/rtu/mbrtu.h @@ -1,4 +1,4 @@ -/* +/* * FreeModbus Libary: A portable Modbus implementation for Modbus ASCII/RTU. * Copyright (c) 2006 Christian Walter <wolti@sil.at> * All rights reserved. diff --git a/apps/modbus/tcp/mbtcp.c b/apps/modbus/tcp/mbtcp.c index b841f078a..7a8f5095f 100644 --- a/apps/modbus/tcp/mbtcp.c +++ b/apps/modbus/tcp/mbtcp.c @@ -1,4 +1,4 @@ -/* +/* * FreeModbus Libary: A portable Modbus implementation for Modbus ASCII/RTU. * Copyright (c) 2006 Christian Walter <wolti@sil.at> * All rights reserved. @@ -55,10 +55,10 @@ * +-----------+---------------+------------------------------------------+ * | TID | PID | Length | UID |Code | Data | * +-----------+---------------+------------------------------------------+ - * | | | | | - * (2) (3) (4) (5) (6) + * | | | | | + * (2) (3) (4) (5) (6) * - * (2) ... MB_TCP_TID = 0 (Transaction Identifier - 2 Byte) + * (2) ... MB_TCP_TID = 0 (Transaction Identifier - 2 Byte) * (3) ... MB_TCP_PID = 2 (Protocol Identifier - 2 Byte) * (4) ... MB_TCP_LEN = 4 (Number of bytes - 2 Byte) * (5) ... MB_TCP_UID = 6 (Unit Identifier - 1 Byte) @@ -142,9 +142,9 @@ eMBTCPSend( uint8_t _unused, const uint8_t * pucFrame, uint16_t usLength ) uint16_t usTCPLength = usLength + MB_TCP_FUNC; /* The MBAP header is already initialized because the caller calls this - * function with the buffer returned by the previous call. Therefore we - * only have to update the length in the header. Note that the length - * header includes the size of the Modbus PDU and the UID Byte. Therefore + * function with the buffer returned by the previous call. Therefore we + * only have to update the length in the header. Note that the length + * header includes the size of the Modbus PDU and the UID Byte. Therefore * the length is usLength plus one. */ pucMBTCPFrame[MB_TCP_LEN] = ( usLength + 1 ) >> 8U; diff --git a/apps/modbus/tcp/mbtcp.h b/apps/modbus/tcp/mbtcp.h index 1ded9c5d4..f00152810 100644 --- a/apps/modbus/tcp/mbtcp.h +++ b/apps/modbus/tcp/mbtcp.h @@ -1,4 +1,4 @@ -/* +/* * FreeModbus Libary: A portable Modbus implementation for Modbus ASCII/RTU. * Copyright (c) 2006 Christian Walter <wolti@sil.at> * All rights reserved. diff --git a/apps/netutils/codecs/Makefile b/apps/netutils/codecs/Makefile index 5d2fe9ce6..f0b55c5f8 100644 --- a/apps/netutils/codecs/Makefile +++ b/apps/netutils/codecs/Makefile @@ -60,7 +60,7 @@ ROOTDEPPATH = --dep-path . # Common build -VPATH = +VPATH = all: .built .PHONY: context depend clean distclean diff --git a/apps/netutils/dhcpc/Makefile b/apps/netutils/dhcpc/Makefile index 3d4185886..f8a680e32 100644 --- a/apps/netutils/dhcpc/Makefile +++ b/apps/netutils/dhcpc/Makefile @@ -40,7 +40,7 @@ include $(APPDIR)/Make.defs # DHCP Client Library ASRCS = -CSRCS = +CSRCS = ifeq ($(CONFIG_NET_UDP),y) CSRCS += dhcpc.c @@ -66,7 +66,7 @@ ROOTDEPPATH = --dep-path . # Common build -VPATH = +VPATH = all: .built .PHONY: context depend clean distclean diff --git a/apps/netutils/dhcpd/Makefile b/apps/netutils/dhcpd/Makefile index 302b2ad43..5eedf758f 100644 --- a/apps/netutils/dhcpd/Makefile +++ b/apps/netutils/dhcpd/Makefile @@ -40,7 +40,7 @@ include $(APPDIR)/Make.defs # DHCP Daemn Library ASRCS = -CSRCS = +CSRCS = ifeq ($(CONFIG_NET_UDP),y) CSRCS += dhcpd.c @@ -66,7 +66,7 @@ ROOTDEPPATH = --dep-path . # Common build -VPATH = +VPATH = all: .built .PHONY: context depend clean distclean diff --git a/apps/netutils/dhcpd/dhcpd.c b/apps/netutils/dhcpd/dhcpd.c index 0f89daa81..c600be2fa 100644 --- a/apps/netutils/dhcpd/dhcpd.c +++ b/apps/netutils/dhcpd/dhcpd.c @@ -830,7 +830,7 @@ static inline int dhcpd_openresponder(void) static void dhcpd_initpacket(uint8_t mtype) { uint32_t nulladdr = 0; - + /* Set up the generic parts of the DHCP server message */ memset(&g_state.ds_outpacket, 0, sizeof(struct dhcpmsg_s)); @@ -889,7 +889,7 @@ static int dhcpd_sendpacket(int bbroadcast) * (1) If he caller know that it needs to multicast the response, it will set bbroadcast. * (2) Otherwise, if the client already has and address (ciaddr), then use that for uni-cast * (3) Broadcast if the client says it can't handle uni-cast (BOOTP_BROADCAST set) - * (4) Otherwise, the client claims it can handle the uni-casst response and we + * (4) Otherwise, the client claims it can handle the uni-casst response and we * will uni-cast to the offered address (yiaddr). * * NOTE: We really should also check the giaddr field. If no zero, the server should @@ -936,7 +936,7 @@ static int dhcpd_sendpacket(int bbroadcast) len = (g_state.ds_optend - (uint8_t*)&g_state.ds_outpacket) + 1; nvdbg("sendto %08lx:%04x len=%d\n", (long)ntohl(addr.sin_addr.s_addr), ntohs(addr.sin_port), len); - + ret = sendto(sockfd, &g_state.ds_outpacket, len, 0, (struct sockaddr *)&addr, sizeof(struct sockaddr_in)); close(sockfd); @@ -1138,7 +1138,7 @@ static inline int dhcpd_request(void) if (g_state.ds_optserverip) { /* ACK if the serverip is correct and the requested IP address is the one - * already offered to the client. + * already offered to the client. */ if (g_state.ds_optserverip == ntohl(g_state.ds_serverip) && diff --git a/apps/netutils/discover/Makefile b/apps/netutils/discover/Makefile index 2cee70b4b..5054e52fe 100644 --- a/apps/netutils/discover/Makefile +++ b/apps/netutils/discover/Makefile @@ -43,7 +43,7 @@ include $(APPDIR)/Make.defs # Telnet daemon ASRCS = -CSRCS = +CSRCS = ifeq ($(CONFIG_NET_UDP),y) CSRCS += discover.c @@ -69,7 +69,7 @@ ROOTDEPPATH = --dep-path . # Common build -VPATH = +VPATH = all: .built .PHONY: context depend clean distclean diff --git a/apps/netutils/dnsclient/Makefile b/apps/netutils/dnsclient/Makefile index e3909ebe3..9b5f11631 100644 --- a/apps/netutils/dnsclient/Makefile +++ b/apps/netutils/dnsclient/Makefile @@ -66,7 +66,7 @@ ROOTDEPPATH = --dep-path . # Common build -VPATH = +VPATH = all: .built .PHONY: context depend clean distclean diff --git a/apps/netutils/ftpc/Makefile b/apps/netutils/ftpc/Makefile index b610961d8..09ed62cdb 100644 --- a/apps/netutils/ftpc/Makefile +++ b/apps/netutils/ftpc/Makefile @@ -40,11 +40,11 @@ include $(APPDIR)/Make.defs # DHCP Daemn Library ASRCS = -CSRCS = +CSRCS = ifeq ($(CONFIG_NET_TCP),y) # FTP connection management -CSRCS = ftpc_connect.c ftpc_disconnect.c +CSRCS = ftpc_connect.c ftpc_disconnect.c # FTP commands CSRCS += ftpc_cdup.c ftpc_chdir.c ftpc_chmod.c ftpc_filesize.c ftpc_filetime.c @@ -82,7 +82,7 @@ ROOTDEPPATH = --dep-path . # Common build -VPATH = +VPATH = all: .built .PHONY: context depend clean distclean diff --git a/apps/netutils/ftpc/ftpc_cdup.c b/apps/netutils/ftpc/ftpc_cdup.c index d65b5789f..47e9620d9 100644 --- a/apps/netutils/ftpc/ftpc_cdup.c +++ b/apps/netutils/ftpc/ftpc_cdup.c @@ -74,7 +74,7 @@ * Make the parent of the current directory be the new current directory. * ****************************************************************************/ - + int ftpc_cdup(SESSION handle) { FAR struct ftpc_session_s *session = (FAR struct ftpc_session_s *)handle; diff --git a/apps/netutils/ftpc/ftpc_cmd.c b/apps/netutils/ftpc/ftpc_cmd.c index cb1f9e496..11fc90152 100644 --- a/apps/netutils/ftpc/ftpc_cmd.c +++ b/apps/netutils/ftpc/ftpc_cmd.c @@ -133,7 +133,7 @@ int ftpc_cmd(struct ftpc_session_s *session, const char *cmd, ...) int ret; /* Verify that we are still connecte to the server */ - + if (!ftpc_sockconnected(&session->cmd)) { ndbg("Cmd channel si not connected\n"); @@ -169,7 +169,7 @@ int ftpc_cmd(struct ftpc_session_s *session, const char *cmd, ...) } /* Get the response to the command */ - + ret = fptc_getreply(session); if (ret < 0) { diff --git a/apps/netutils/ftpc/ftpc_getfile.c b/apps/netutils/ftpc/ftpc_getfile.c index add07125f..a7c398adf 100644 --- a/apps/netutils/ftpc/ftpc_getfile.c +++ b/apps/netutils/ftpc/ftpc_getfile.c @@ -101,20 +101,20 @@ static int ftpc_recvinit(struct ftpc_session_s *session, FAR const char *path, /* Handle the resume offset (caller is responsible for fseeking in the * file) */ - + if (offset > 0) { /* Send the REST command. This command sets the offset where the * transfer should start. This must come after PORT or PASV commands. */ - + ret = ftpc_cmd(session, "REST %ld", offset); if (ret < 0) { ndbg("REST command failed: %d\n", errno); return ERROR; } - + session->size = offset; } @@ -217,7 +217,7 @@ static int ftpc_recvbinary(FAR struct ftpc_session_s *session, } /* Increment the size of the file written */ - + session->size += nwritten; } } diff --git a/apps/netutils/ftpc/ftpc_getreply.c b/apps/netutils/ftpc/ftpc_getreply.c index 3a9952daf..f07f83f60 100644 --- a/apps/netutils/ftpc/ftpc_getreply.c +++ b/apps/netutils/ftpc/ftpc_getreply.c @@ -137,7 +137,7 @@ static int ftpc_gets(struct ftpc_session_s *session) else if (ch == ISO_cr) { /* What follows the carriage return? */ - + ch = ftpc_sockgetc(&session->cmd); if (ch == '\0') { @@ -184,7 +184,7 @@ static int ftpc_gets(struct ftpc_session_s *session) if (ndx < CONFIG_FTP_MAXREPLY) { /* Yes.. put the character in the reply buffer */ - + session->reply[ndx++] = (char)ch; } else @@ -212,7 +212,7 @@ int fptc_getreply(struct ftpc_session_s *session) int ret; /* Set up a timeout */ - + if (session->replytimeo) { ret = wd_start(session->wdog, session->replytimeo, ftpc_timeout, 1, session); @@ -244,7 +244,7 @@ int fptc_getreply(struct ftpc_session_s *session) return ERROR; } - nvdbg("Reply: %s\n", session->reply); + nvdbg("Reply: %s\n", session->reply); if (session->reply[3] == '-') { diff --git a/apps/netutils/ftpc/ftpc_internal.h b/apps/netutils/ftpc/ftpc_internal.h index 4370f8dab..a2a6fffce 100644 --- a/apps/netutils/ftpc/ftpc_internal.h +++ b/apps/netutils/ftpc/ftpc_internal.h @@ -222,7 +222,7 @@ extern "C" { * Public Functions ****************************************************************************/ /* Low-level string management */ - + EXTERN void ftpc_stripcrlf(FAR char *str); EXTERN void ftpc_stripslash(FAR char *str); EXTERN FAR char *ftpc_dequote(FAR const char *hostname); diff --git a/apps/netutils/ftpc/ftpc_noop.c b/apps/netutils/ftpc/ftpc_noop.c index 6932b1489..5682400dc 100644 --- a/apps/netutils/ftpc/ftpc_noop.c +++ b/apps/netutils/ftpc/ftpc_noop.c @@ -74,7 +74,7 @@ * No operation command. Using NOOP allows us to make sure that commands * are passed over the control connection without changing the status of * any data transaction or server status. This is useful for (1) - * maintaining connections during long IDLE times and (2) It can also be + * maintaining connections during long IDLE times and (2) It can also be * used as a harmless way of detecting timeouts. * ****************************************************************************/ diff --git a/apps/netutils/ftpc/ftpc_putfile.c b/apps/netutils/ftpc/ftpc_putfile.c index d59c4c99e..751597259 100644 --- a/apps/netutils/ftpc/ftpc_putfile.c +++ b/apps/netutils/ftpc/ftpc_putfile.c @@ -321,7 +321,7 @@ static int ftpc_sendfile(struct ftpc_session_s *session, const char *path, * * - "450 Requested file action not taken", "452 - Requested action not * taken" or "553 Requested action not taken" without first responding - * with a mark. + * with a mark. */ /* In active mode, we need to accept a connection on the data socket diff --git a/apps/netutils/ftpc/ftpc_rename.c b/apps/netutils/ftpc/ftpc_rename.c index abda04657..34c067a62 100644 --- a/apps/netutils/ftpc/ftpc_rename.c +++ b/apps/netutils/ftpc/ftpc_rename.c @@ -109,7 +109,7 @@ int ftpc_rename(SESSION handle, FAR const char *oldname, FAR const char *newname newcopy = strdup(newname); ftpc_stripslash(newcopy); - + /* A RNTO request asks the server to finish renaming a file. RNTO must * come immediately after RNFR; otherwise the server may reject RNTO with: * diff --git a/apps/netutils/ftpc/ftpc_rpwd.c b/apps/netutils/ftpc/ftpc_rpwd.c index ed60cfeb0..91dd1504f 100644 --- a/apps/netutils/ftpc/ftpc_rpwd.c +++ b/apps/netutils/ftpc/ftpc_rpwd.c @@ -105,7 +105,7 @@ FAR char *ftpc_rpwd(SESSION handle) return NULL; } start++; - + end = strchr(start, '\"'); if (!end) { @@ -120,7 +120,7 @@ FAR char *ftpc_rpwd(SESSION handle) * * len = end - start + 1 = 11 (+ NUL terminator) */ - + len = end - start + 1; pwd = (char *)malloc(len + 1); if (!pwd) @@ -128,7 +128,7 @@ FAR char *ftpc_rpwd(SESSION handle) ndbg("Failed to allocate string\n"); return NULL; } - + /* Copy the string into the allocated memory */ memcpy(pwd, start, len); diff --git a/apps/netutils/ftpc/ftpc_socket.c b/apps/netutils/ftpc/ftpc_socket.c index f904688fd..b2e76b44b 100644 --- a/apps/netutils/ftpc/ftpc_socket.c +++ b/apps/netutils/ftpc/ftpc_socket.c @@ -210,14 +210,14 @@ void ftpc_sockcopy(FAR struct ftpc_socket_s *dest, * * Description: * Accept a connection on the data socket. This function is onlly used - * in active mode. + * in active mode. * * In active mode FTP the client connects from a random port (N>1023) to the * FTP server's command port, port 21. Then, the client starts listening to * port N+1 and sends the FTP command PORT N+1 to the FTP server. The server * will then connect back to the client's specified data port from its local * data port, which is port 20. In passive mode FTP the client initiates - * both connections to the server, solving the problem of firewalls filtering + * both connections to the server, solving the problem of firewalls filtering * the incoming data port connection to the client from the server. When * opening an FTP connection, the client opens two random ports locally * (N>1023 and N+1). The first port contacts the server on port 21, but @@ -225,7 +225,7 @@ void ftpc_sockcopy(FAR struct ftpc_socket_s *dest, * back to its data port, the client will issue the PASV command. The result * of this is that the server then opens a random unprivileged port (P > * 1023) and sends the PORT P command back to the client. The client then - * initiates the connection from port N+1 to port P on the server to transfer + * initiates the connection from port N+1 to port P on the server to transfer * data. * ****************************************************************************/ diff --git a/apps/netutils/ftpc/ftpc_transfer.c b/apps/netutils/ftpc/ftpc_transfer.c index 46ec88ec9..e26d7e87b 100644 --- a/apps/netutils/ftpc/ftpc_transfer.c +++ b/apps/netutils/ftpc/ftpc_transfer.c @@ -85,7 +85,7 @@ * port N+1 and sends the FTP command PORT N+1 to the FTP server. The server * will then connect back to the client's specified data port from its local * data port, which is port 20. In passive mode FTP the client initiates - * both connections to the server, solving the problem of firewalls filtering + * both connections to the server, solving the problem of firewalls filtering * the incoming data port connection to the client from the server. When * opening an FTP connection, the client opens two random ports locally * (N>1023 and N+1). The first port contacts the server on port 21, but @@ -93,7 +93,7 @@ * back to its data port, the client will issue the PASV command. The result * of this is that the server then opens a random unprivileged port (P > * 1023) and sends the PORT P command back to the client. The client then - * initiates the connection from port N+1 to port P on the server to transfer + * initiates the connection from port N+1 to port P on the server to transfer * data. * ****************************************************************************/ @@ -137,7 +137,7 @@ static int ftp_pasvmode(struct ftpc_session_s *session, /* The response is then 6 integer values: four representing the * IP address and two representing the port number. */ - + nscan = sscanf(ptr, "%d,%d,%d,%d,%d,%d", &tmpap[0], &tmpap[1], &tmpap[2], &tmpap[3], &tmpap[4], &tmpap[5]); @@ -149,7 +149,7 @@ static int ftp_pasvmode(struct ftpc_session_s *session, /* Then copy the sscanf'ed values as bytes */ - + for (i = 0; i < 6; i++) { addrport[i] = (uint8_t)(tmpap[i] & 0xff); @@ -185,7 +185,7 @@ static FAR char *ftpc_abspath(FAR struct ftpc_session_s *session, if (relpath[0] == '~') { /* Is the relative path only '~' */ - + if (relpath[1] == '\0') { return strdup(homedir); @@ -209,7 +209,7 @@ static FAR char *ftpc_abspath(FAR struct ftpc_session_s *session, /* No tilde expansion. Check for a path relative to the current * directory. */ - + else if (strncmp(relpath, "./", 2) == 0) { ret = asprintf(&ptr, "%s%s", curdir, relpath+1); @@ -278,7 +278,7 @@ int ftpc_xfrinit(FAR struct ftpc_session_s *session) if (FTPC_IS_PASSIVE(session)) { /* Yes.. going passive. */ - + ret = ftp_pasvmode(session, addrport); if (ret != OK) { @@ -370,7 +370,7 @@ int ftpc_xfrmode(struct ftpc_session_s *session, uint8_t xfrmode) * * The server accepts the TYPE request with code 200. */ - + ret = ftpc_cmd(session, "TYPE %c", xfrmode == FTPC_XFRMODE_ASCII ? 'A' : 'I'); session->xfrmode = xfrmode; } @@ -405,7 +405,7 @@ int ftpc_xfrabort(FAR struct ftpc_session_s *session, FAR FILE *stream) if (ret > 0) { /* Read data from command channel */ - + nvdbg("Flush cmd channel data\n"); while (stream && fread(session->buffer, 1, CONFIG_FTP_BUFSIZE, stream) > 0); return OK; @@ -428,7 +428,7 @@ int ftpc_xfrabort(FAR struct ftpc_session_s *session, FAR FILE *stream) while (stream && fread(session->buffer, 1, CONFIG_FTP_BUFSIZE, stream) > 0); /* Get the ABORt reply */ - + fptc_getreply(session); /* Expected replys are: "226 Closing data connection" or @@ -448,7 +448,7 @@ int ftpc_xfrabort(FAR struct ftpc_session_s *session, FAR FILE *stream) /* Expected replys are: or "225 Data connection open; no transfer in progress" * "226 Closing data connection" */ - + if (session->code != 226 && session->code != 225) { nvdbg("Expected 225 or 226 reply\n"); diff --git a/apps/netutils/ftpc/ftpc_utils.c b/apps/netutils/ftpc/ftpc_utils.c index 50b1a6e4e..ef67c1f05 100644 --- a/apps/netutils/ftpc/ftpc_utils.c +++ b/apps/netutils/ftpc/ftpc_utils.c @@ -226,7 +226,7 @@ FAR char *ftpc_dequote(FAR const char *str) if (allocstr) { /* Search the string */ - + ptr = allocstr; while (*str) { diff --git a/apps/netutils/ftpd/Makefile b/apps/netutils/ftpd/Makefile index b537e6d86..1a779f4ba 100644 --- a/apps/netutils/ftpd/Makefile +++ b/apps/netutils/ftpd/Makefile @@ -40,7 +40,7 @@ include $(APPDIR)/Make.defs # Telnet daemon ASRCS = -CSRCS = +CSRCS = ifeq ($(CONFIG_NET_TCP),y) CSRCS += ftpd.c @@ -66,7 +66,7 @@ ROOTDEPPATH = --dep-path . # Common build -VPATH = +VPATH = all: .built .PHONY: context depend clean distclean diff --git a/apps/netutils/ftpd/ftpd.c b/apps/netutils/ftpd/ftpd.c index 807bd82f1..4262b2619 100644 --- a/apps/netutils/ftpd/ftpd.c +++ b/apps/netutils/ftpd/ftpd.c @@ -218,7 +218,7 @@ static const struct ftpd_cmd_s g_ftpdcmdtab[] = {"XMKD", ftpd_command_mkd , FTPD_CMDFLAG_LOGIN}, /* XMKD <SP> <pathname> <CRLF> */ {"DELE", ftpd_command_dele, FTPD_CMDFLAG_LOGIN}, /* DELE <SP> <pathname> <CRLF> */ {"PASV", ftpd_command_pasv, FTPD_CMDFLAG_LOGIN}, /* PASV <CRLF> */ - {"EPSV", ftpd_command_epsv, FTPD_CMDFLAG_LOGIN}, /* EPSV <SP> <net-prt> <CRLF> OR EPSV <SP> ALL <CRLF> */ + {"EPSV", ftpd_command_epsv, FTPD_CMDFLAG_LOGIN}, /* EPSV <SP> <net-prt> <CRLF> OR EPSV <SP> ALL <CRLF> */ {"LPSV", ftpd_command_epsv, FTPD_CMDFLAG_LOGIN}, /* LPSV ??? */ {"LIST", ftpd_command_list, FTPD_CMDFLAG_LOGIN}, /* LIST [<SP> <pathname>] <CRLF> */ {"NLST", ftpd_command_nlst, FTPD_CMDFLAG_LOGIN}, /* NLST [<SP> <pathname>] <CRLF> */ @@ -242,7 +242,7 @@ static const struct ftpd_cmd_s g_ftpdcmdtab[] = {"STAT", ftpd_command_stat, FTPD_CMDFLAG_LOGIN}, /* STAT [<SP> <pathname>] <CRLF> */ {"ALLO", ftpd_command_stat, FTPD_CMDFLAG_LOGIN}, /* ALLO <SP> <decimal-integer> [<SP> R <SP> <decimal-integer>] <CRLF> */ #endif - {NULL, (ftpd_cmdhandler_t)0, 0} + {NULL, (ftpd_cmdhandler_t)0, 0} }; static const char g_cdup[] = ".."; @@ -350,7 +350,7 @@ static void ftpd_account_free(FAR struct ftpd_account_s *account) { free(prev->home); } - + if (prev->password) { free(prev->password); @@ -385,7 +385,7 @@ static int ftpd_account_setpassword(FAR struct ftpd_account_s *account, } /* Free any existing password string */ - + if (account->password) { free(account->password); @@ -425,7 +425,7 @@ static int ftpd_account_add(FAR struct ftpd_server_s *server, } /* Handle the case where the list is empty */ - + if (!server->head) { server->head = head; @@ -486,7 +486,7 @@ ftpd_account_search_user(FAR struct ftpd_session_s *session, { FAR struct ftpd_account_s *newaccount = NULL; FAR struct ftpd_account_s *account; - uint8_t accountflags; + uint8_t accountflags; account = session->head; while (account) @@ -647,7 +647,7 @@ static FAR char *ftpd_strtok(bool skipspace, FAR const char *delimiters, FAR const char *dptr; FAR char *sptr; FAR char *ret; - + sptr = *str; /* Skip any leading spaces */ @@ -681,7 +681,7 @@ static FAR char *ftpd_strtok(bool skipspace, FAR const char *delimiters, sptr++; } - + /* Save the place where we will resuming searching */ *str = sptr; @@ -940,7 +940,7 @@ static ssize_t ftpd_recv(int sd, FAR void *data, size_t size, int timeout) static ssize_t ftpd_send(int sd, FAR const void *data, size_t size, int timeout) { ssize_t ret; - + /* Handle any requested timetout */ if (timeout >= 0) @@ -1052,7 +1052,7 @@ static int ftpd_dataopen(FAR struct ftpd_session_s *session) return OK; } - + /* PASV session */ session->data.addrlen = sizeof(session->data.addr); @@ -1109,7 +1109,7 @@ static FAR struct ftpd_server_s *ftpd_openserver(int port) sa_family_t family; socklen_t addrlen; FAR const void *addr; -#if defined(SOMAXCONN) +#if defined(SOMAXCONN) int backlog = SOMAXCONN; #else int backlog = 5; @@ -1142,14 +1142,14 @@ static FAR struct ftpd_server_s *ftpd_openserver(int port) } family = AF_INET6; - addrlen = (socklen_t)sizeof(server->addr.in6); + addrlen = (socklen_t)sizeof(server->addr.in6); addr = (FAR void *)(&server->addr.in6); server->addr.in6.sin6_family = family; server->addr.in6.sin6_flowinfo = 0; server->addr.in6.sin6_addr = in6addr_any; server->addr.in6.sin6_port = htons(port); -#else +#else server->sd = socket(PF_INET, SOCK_STREAM, IPPROTO_TCP); if (server->sd < 0) { @@ -1158,13 +1158,13 @@ static FAR struct ftpd_server_s *ftpd_openserver(int port) } family = AF_INET; - addrlen = (socklen_t)sizeof(server->addr.in4); + addrlen = (socklen_t)sizeof(server->addr.in4); addr = (FAR void *)(&server->addr.in4); server->addr.in4.sin_family = family; server->addr.in4.sin_addr.s_addr = htonl(INADDR_ANY); server->addr.in4.sin_port = htons(port); -#endif +#endif #ifdef CONFIG_NET_HAVE_REUSEADDR { @@ -1214,14 +1214,14 @@ static int ftpd_pathignore(FAR struct ftpd_pathnode_s *currpath) { currpath->ignore = true; } - + return OK; } if (strcmp(currpath->name, "..") == 0) { currpath->ignore = true; - + node = currpath->blink; while (node) { @@ -1251,7 +1251,7 @@ static int ftpd_pathignore(FAR struct ftpd_pathnode_s *currpath) } /**************************************************************************** - * Name: + * Name: ****************************************************************************/ static void ftpd_nodefree(FAR struct ftpd_pathnode_s *node) @@ -1286,7 +1286,7 @@ static FAR struct ftpd_pathnode_s *ftpd_path2node(FAR const char *path) { return NULL; } - + while (path[0] != '\0') { name = ftpd_strtok_alloc(false, "/\\", &path); @@ -1326,7 +1326,7 @@ static FAR struct ftpd_pathnode_s *ftpd_path2node(FAR const char *path) (void)ftpd_pathignore(newnode); } - + return head; } @@ -1371,7 +1371,7 @@ static FAR char *ftpd_node2path(FAR struct ftpd_pathnode_s *node, node2 = node2->flink; } - + namelen = !node1->name ? 0 : strlen(node1->name); if (!node2) { @@ -1391,7 +1391,7 @@ static FAR char *ftpd_node2path(FAR struct ftpd_pathnode_s *node, node1 = node1->flink; } - + path = (FAR char *)malloc(allocsize); if (!path) { @@ -1421,7 +1421,7 @@ static FAR char *ftpd_node2path(FAR struct ftpd_pathnode_s *node, node2 = node2->flink; } - + namelen = !node1->name ? 0 : strlen(node1->name); if (!node2) @@ -1461,7 +1461,7 @@ ftpd_nodeappend(FAR struct ftpd_pathnode_s *head, if (node && node->name && strlen(node->name) <= 0) { ftpd_nodefree(head); - head = NULL; + head = NULL; } } @@ -1475,7 +1475,7 @@ ftpd_nodeappend(FAR struct ftpd_pathnode_s *head, head = node; node = NULL; } - + if (node) { temp = head; @@ -1487,7 +1487,7 @@ ftpd_nodeappend(FAR struct ftpd_pathnode_s *head, node->blink = temp; temp->flink = node; } - + /* clear ignore */ temp = head; @@ -1532,7 +1532,7 @@ static int ftpd_getpath(FAR struct ftpd_session_s *session, { *workpath = NULL; } - + worknode = ftpd_path2node(!session->work ? "" : session->work); if (!worknode) { @@ -1664,8 +1664,8 @@ static off_t ftpd_offsatoi(FAR const char *filename, off_t offset) return -errval; } - ret = 0; - temp = 0; + ret = 0; + temp = 0; if (offset == (off_t)(-1)) { @@ -1805,7 +1805,7 @@ static int ftpd_stream(FAR struct ftpd_session_s *session, int cmdtype) g_respfmt1, 550, ' ', "Can not open file !"); goto errout_with_data; } - + /* Restart position */ if (session->restartpos > 0) @@ -2005,7 +2005,7 @@ static int ftpd_stream(FAR struct ftpd_session_s *session, int cmdtype) pos += (off_t)wrbytes; } - + errout_with_session:; close(session->fd); session->fd = -1; @@ -2254,7 +2254,7 @@ static int ftpd_listbuffer(FAR struct ftpd_session_s *session, FAR char *path, offset += snprintf(&buffer[offset], buflen - offset, " %02u:%02u", tm.tm_hour, tm.tm_min); } - + /* basename */ offset += snprintf(&buffer[offset], buflen - offset, " %s", name); @@ -2318,7 +2318,7 @@ static int fptd_listscan(FAR struct ftpd_session_s *session, FAR char *path, if (!S_ISDIR(st.st_mode)) { ret = ftpd_listbuffer(session, path, &st, session->data.buffer, - session->data.buflen, opton); + session->data.buflen, opton); if (ret == 0) { ret = ftpd_response(session->data.sd, session->txtimeout, @@ -2351,7 +2351,7 @@ static int fptd_listscan(FAR struct ftpd_session_s *session, FAR char *path, continue; } } - + asprintf(&temp, "%s/%s", path, entry->d_name); if (!temp) { @@ -2366,7 +2366,7 @@ static int fptd_listscan(FAR struct ftpd_session_s *session, FAR char *path, } ret = ftpd_listbuffer(session, temp, &st, session->data.buffer, - session->data.buflen, opton); + session->data.buflen, opton); if (ret >= 0) { ret = ftpd_response(session->data.sd, session->txtimeout, @@ -2414,7 +2414,7 @@ static int ftpd_command_user(FAR struct ftpd_session_s *session) { int ret; - /* Clear session status */ + /* Clear session status */ session->flags = 0; session->restartpos = 0; @@ -2586,7 +2586,7 @@ static int ftpd_command_type(FAR struct ftpd_session_s *session) } } } - + session->type = FTPD_SESSIONTYPE_NONE; return ftpd_response(session->cmd.sd, session->txtimeout, g_respfmt1, 500, ' ', "TYPE not understood !"); @@ -2708,7 +2708,7 @@ static int ftpd_command_port(FAR struct ftpd_session_s *session) utemp = (value[0] << 24) | (value[1] << 16) | (value[2] << 8) | (value[3]); session->data.addr.in4.sin_addr.s_addr = htonl((long)utemp); - + utemp = (value[4] << 8) | (value[5]); session->data.addr.in4.sin_port = htons((short)utemp); @@ -2724,11 +2724,11 @@ static int ftpd_command_port(FAR struct ftpd_session_s *session) memset(&session->data.addr, 0, sizeof(session->data.addr)); session->data.addr.in4.sin_family = AF_INET; - + utemp = (value[0] << 24) | (value[1] << 16) | (value[2] << 8) | (value[3]); session->data.addr.in4.sin_addr.s_addr = htonl(utemp); } - + utemp = (value[4] << 8) | (value[5]); session->data.addr.in4.sin_port = htons(utemp); } @@ -2737,7 +2737,7 @@ static int ftpd_command_port(FAR struct ftpd_session_s *session) memset(&session->data.addr, 0, sizeof(session->data.addr)); session->data.addr.in4.sin_family = AF_INET; - + utemp = (value[0] << 24) | (value[1] << 16) | (value[2] << 8) | (value[3]); session->data.addr.in4.sin_addr.s_addr = htonl(utemp); } @@ -2798,13 +2798,13 @@ static int ftpd_command_eprt(FAR struct ftpd_session_s *session) "EPRT command not implemented !"); return -EINVAL; } - + count = 3; for (index = 0; index < count; index++) { field[index] = NULL; } - + str = (FAR const char *)&session->param[left]; for (index = 0; index < count && *str != '\0'; index++) { @@ -2844,7 +2844,7 @@ static int ftpd_command_eprt(FAR struct ftpd_session_s *session) if (family == 1) { family = AF_INET; - + session->data.addr.in4.sin_family = family; (void)inet_pton(family, field[1], &session->data.addr.in4.sin_addr); session->data.addr.in4.sin_port = htons((short)atoi(field[2])); @@ -2855,7 +2855,7 @@ static int ftpd_command_eprt(FAR struct ftpd_session_s *session) if (family == 2) { family = AF_INET6; - + session->data.addr.in6.sin6_family = family; (void)inet_pton(family, field[1], &session->data.addr.in6.sin6_addr); session->data.addr.in6.sin6_port = htons((short)atoi(field[2])); @@ -2866,7 +2866,7 @@ static int ftpd_command_eprt(FAR struct ftpd_session_s *session) ndbg("Unrecognized family: %d\n", family); family = AF_UNSPEC; } - + for (index = 0;index < count;index++) { if (field[index]) @@ -2975,7 +2975,7 @@ static int ftpd_command_rmd(FAR struct ftpd_session_s *session) g_respfmt1, 550, ' ', "Can not remove directory !"); } - + free(abspath); free(workpath); @@ -3008,7 +3008,7 @@ static int ftpd_command_mkd(FAR struct ftpd_session_s *session) return ftpd_response(session->cmd.sd, session->txtimeout, g_respfmt1, 550, ' ', "Can not make directory !"); } - + free(abspath); return ftpd_response(session->cmd.sd, session->txtimeout, g_respfmt1, 250, ' ', "MKD command successful"); @@ -3060,7 +3060,7 @@ static int ftpd_command_dele(FAR struct ftpd_session_s *session) return ftpd_response(session->cmd.sd, session->txtimeout, g_respfmt1, 550, ' ', "Can not delete file !"); } - + free(abspath); free(workpath); @@ -3154,7 +3154,7 @@ static int ftpd_command_pasv(FAR struct ftpd_session_s *session) g_respfmt1, 425, ' ', "PASV getsockname fail !"); } - ret = listen(session->data.sd, 1); + ret = listen(session->data.sd, 1); if (ret < 0) { (void)ftpd_dataclose(session); @@ -3213,10 +3213,10 @@ static int ftpd_command_epsv(FAR struct ftpd_session_s *session) } else { -#if defined(IPPROTO_IPV6) && defined(IPV6_V6ONLY) +#if defined(IPPROTO_IPV6) && defined(IPV6_V6ONLY) int ipv6only = 0; (void)setsockopt(session->data.sd, IPPROTO_IPV6, IPV6_V6ONLY, &ipv6only, sizeof(ipv6only)); -#endif +#endif } #else session->data.sd = socket(PF_INET, SOCK_STREAM, IPPROTO_TCP); @@ -3251,7 +3251,7 @@ static int ftpd_command_epsv(FAR struct ftpd_session_s *session) } #else session->data.addr.in4.sin_port = htons(0); -#endif +#endif ret = bind(session->data.sd, (FAR const struct sockaddr *)&session->data.addr, session->data.addrlen); @@ -3420,7 +3420,7 @@ static int ftpd_command_size(FAR struct ftpd_session_s *session) g_respfmt1, 550, ' ', "Unknown size !"); } path = abspath; - + ret = 0; switch (session->type) { @@ -3442,14 +3442,14 @@ static int ftpd_command_size(FAR struct ftpd_session_s *session) ": not a regular file."); } else - { + { ret = ftpd_response(session->cmd.sd, session->txtimeout, "%03u%c%llu\r\n", 213, ' ', (unsigned long long)st.st_size); } } break; - case FTPD_SESSIONTYPE_A: + case FTPD_SESSIONTYPE_A: { status = stat(path, &st); if (status < 0) @@ -3530,7 +3530,7 @@ static int ftpd_command_stru(FAR struct ftpd_session_s *session) } /**************************************************************************** - * Name: + * Name: ****************************************************************************/ static int ftpd_command_rnfr(FAR struct ftpd_session_s *session) @@ -3562,7 +3562,7 @@ static int ftpd_command_rnfr(FAR struct ftpd_session_s *session) g_respfmt2, 550, ' ', session->param, ": No such file or directory."); } - + session->renamefrom = abspath; session->flags |= FTPD_SESSIONFLAG_RENAMEFROM; @@ -3578,7 +3578,7 @@ static int ftpd_command_rnto(FAR struct ftpd_session_s *session) { FAR char *abspath; int ret; - + if (!session->renamefrom) { return ftpd_response(session->cmd.sd, session->txtimeout, @@ -3591,7 +3591,7 @@ static int ftpd_command_rnto(FAR struct ftpd_session_s *session) return ftpd_response(session->cmd.sd, session->txtimeout, g_respfmt1, 550, ' ', "RNTO error !"); } - + ret = rename(session->renamefrom, abspath); if (ret < 0) { @@ -3641,7 +3641,7 @@ static int ftpd_command_rest(FAR struct ftpd_session_s *session) { #ifdef CONFIG_HAVE_LONG_LONG session->restartpos = (off_t)atoll(session->param); -#else +#else session->restartpos = (off_t)atoi(session->param); #endif session->flags |= FTPD_SESSIONFLAG_RESTARTPOS; @@ -3686,10 +3686,10 @@ static int ftpd_command_mdtm(FAR struct ftpd_session_s *session) g_respfmt2, 550, ' ', session->param, ": not a plain file."); } - + free(abspath); - - memcpy(&tm, gmtime(&st.st_mtime), sizeof(tm)); + + memcpy(&tm, gmtime(&st.st_mtime), sizeof(tm)); return ftpd_response(session->cmd.sd, session->txtimeout, "%03u%c%04u%02u%02u%02u%02u%02u\r\n", 213, ' ', tm.tm_year + 1900, tm.tm_mon + 1, tm.tm_mday, @@ -3826,7 +3826,7 @@ static int ftpd_command(FAR struct ftpd_session_s *session) int index = 0; /* Search the command table for a matching command */ - + for (index = 0; g_ftpdcmdtab[index].command; index++) { /* Does the command string match this entry? */ @@ -3834,7 +3834,7 @@ static int ftpd_command(FAR struct ftpd_session_s *session) if (strcmp(session->command, g_ftpdcmdtab[index].command) == 0) { /* Yes.. is a login required to execute this command? */ - + if ((g_ftpdcmdtab[index].flags & FTPD_CMDFLAG_LOGIN) != 0) { /* Yes... Check if the user is logged in */ @@ -4049,7 +4049,7 @@ static FAR void *ftpd_worker(FAR void *arg) recvbytes = ftpd_recv(session->cmd.sd, session->cmd.buffer, session->cmd.buflen - 1, session->rxtimeout); - /* recbytes < 0 is a receive failure (posibily a timeout); + /* recbytes < 0 is a receive failure (posibily a timeout); * recbytes == 0 indicates that we have lost the connection. */ @@ -4063,7 +4063,7 @@ static FAR void *ftpd_worker(FAR void *arg) /* Make sure that the recevied string is NUL terminated */ session->cmd.buffer[recvbytes] = '\0'; - + /* TELNET protocol (RFC854) * IAC 255(FFH) interpret as command: * IP 244(F4H) interrupt process--permanently @@ -4093,7 +4093,7 @@ static FAR void *ftpd_worker(FAR void *arg) } /* Make command message */ - + session->command = &session->cmd.buffer[offset]; while (session->cmd.buffer[offset] != '\0') { @@ -4103,7 +4103,7 @@ static FAR void *ftpd_worker(FAR void *arg) session->cmd.buffer[offset] = '\0'; break; } - offset++; + offset++; } /* Parse command and param tokens */ @@ -4214,7 +4214,7 @@ int ftpd_adduser(FTPD_SESSION handle, uint8_t accountflags, ndbg("ftpd_account_setpassword failed: %d\n", ret); goto errout_with_account; } - + ret = ftpd_account_sethome(newaccount, home); if (ret < 0) { @@ -4234,7 +4234,7 @@ int ftpd_adduser(FTPD_SESSION handle, uint8_t accountflags, errout_with_account: ftpd_account_free(newaccount); - + errout: return ret; } @@ -4287,8 +4287,8 @@ int ftpd_session(FTPD_SESSION handle, int timeout) session->head = server->head; session->curr = NULL; session->flags = 0; - session->txtimeout = -1; - session->rxtimeout = -1; + session->txtimeout = -1; + session->rxtimeout = -1; session->cmd.sd = (int)(-1); session->cmd.addrlen = (socklen_t)sizeof(session->cmd.addr); session->cmd.buflen = (size_t)CONFIG_FTPD_CMDBUFFERSIZE; @@ -4318,7 +4318,7 @@ int ftpd_session(FTPD_SESSION handle, int timeout) } /* Allocate a data buffer */ - + session->data.buffer = (FAR char *)malloc(session->data.buflen); if (!session->data.buffer) { diff --git a/apps/netutils/json/Makefile b/apps/netutils/json/Makefile index b818ede81..17eb55e71 100644 --- a/apps/netutils/json/Makefile +++ b/apps/netutils/json/Makefile @@ -60,7 +60,7 @@ ROOTDEPPATH = --dep-path . # Common build -VPATH = +VPATH = all: .built .PHONY: context depend clean distclean diff --git a/apps/netutils/json/README b/apps/netutils/json/README index 6d60da934..058644f52 100644 --- a/apps/netutils/json/README +++ b/apps/netutils/json/README @@ -66,12 +66,12 @@ philosophy as JSON itself. Simple, dumb, out of the way. Some JSON: { - "name": "Jack (\"Bee\") Nimble", + "name": "Jack (\"Bee\") Nimble", "format": { - "type": "rect", - "width": 1920, - "height": 1080, - "interlace": false, + "type": "rect", + "width": 1920, + "height": 1080, + "interlace": false, "frame rate": 24 } } @@ -99,7 +99,7 @@ Finished? Delete the root (this takes care of everything else). That's AUTO mode. If you're going to use Auto mode, you really ought to check pointers before you dereference them. If you want to see how you'd build this struct in code? cJSON *root,*fmt; - root=cJSON_CreateObject(); + root=cJSON_CreateObject(); cJSON_AddItemToObject(root, "name", cJSON_CreateString("Jack (\"Bee\") Nimble")); cJSON_AddItemToObject(root, "format", fmt=cJSON_CreateObject()); cJSON_AddStringToObject(fmt,"type", "rect"); @@ -198,7 +198,7 @@ void parse_object(cJSON *item) int i; for (i=0;i<cJSON_GetArraySize(item);i++) { cJSON *subitem=cJSON_GetArrayItem(item,i); - // handle subitem. + // handle subitem. } } @@ -211,7 +211,7 @@ void parse_object(cJSON *item) { // handle subitem if (subitem->child) parse_object(subitem->child); - + subitem=subitem->next; } } @@ -240,7 +240,7 @@ cJSON *Create_array_of_anything(cJSON **items,int num) } return root; } - + and simply: Create_array_of_anything(objects,24); cJSON doesn't make any assumptions about what order you create things in. diff --git a/apps/netutils/json/cJSON.c b/apps/netutils/json/cJSON.c index e5120ec42..322b30869 100644 --- a/apps/netutils/json/cJSON.c +++ b/apps/netutils/json/cJSON.c @@ -52,7 +52,7 @@ /**************************************************************************** * Private Data ****************************************************************************/ - + static const char *ep; static const unsigned char firstByteMark[7] = @@ -75,7 +75,7 @@ static char *print_object(cJSON *item, int depth, int fmt); /**************************************************************************** * Private Functions ****************************************************************************/ - + static char *cJSON_strdup(const char *str) { size_t len; @@ -168,7 +168,7 @@ static const char *parse_number(cJSON *item, const char *num) do { n = (n * 10.0) + (*num++ - '0'), scale--; - } + } while (*num >= '0' && *num <= '9'); } @@ -652,7 +652,7 @@ static const char *parse_array(cJSON *item, const char *value) /* Skip any spacing, get the value. */ - value = skip(parse_value(child, skip(value))); + value = skip(parse_value(child, skip(value))); if (!value) { return 0; @@ -845,7 +845,7 @@ static const char *parse_object(cJSON *item, const char *value) /* Skip any spacing, get the value. */ - value = skip(parse_value(child, skip(value + 1))); + value = skip(parse_value(child, skip(value + 1))); if (!value) { return 0; @@ -1089,7 +1089,7 @@ static cJSON *create_reference(cJSON *item) /**************************************************************************** * Public Functions ****************************************************************************/ - + const char *cJSON_GetErrorPtr(void) { return ep; diff --git a/apps/netutils/ntpclient/Kconfig b/apps/netutils/ntpclient/Kconfig index c7c0731a5..83986cfb3 100755 --- a/apps/netutils/ntpclient/Kconfig +++ b/apps/netutils/ntpclient/Kconfig @@ -18,7 +18,7 @@ config NETUTILS_NTPCLIENT_SERVERIP config NETUTILS_NTPCLIENT_PORTNO int "NTP server port number" - default 123 + default 123 config NETUTILS_NTPCLIENT_STACKSIZE int "NTP client daemon stack stack size" @@ -26,11 +26,11 @@ config NETUTILS_NTPCLIENT_STACKSIZE config NETUTILS_NTPCLIENT_SERVERPRIO int "NTP client daemon priority" - default 100 + default 100 config NETUTILS_NTPCLIENT_POLLDELAYSEC int "NTP client poll interval (seconds)" - default 60 + default 60 config NETUTILS_NTPCLIENT_SIGWAKEUP int "NTP client wakeup signal number" diff --git a/apps/netutils/ntpclient/Makefile b/apps/netutils/ntpclient/Makefile index e3d0f5075..cbde46060 100755 --- a/apps/netutils/ntpclient/Makefile +++ b/apps/netutils/ntpclient/Makefile @@ -40,7 +40,7 @@ include $(APPDIR)/Make.defs # NTP client daemon Library ASRCS = -CSRCS = +CSRCS = ifeq ($(CONFIG_NET_UDP),y) CSRCS += ntpclient.c @@ -66,7 +66,7 @@ ROOTDEPPATH = --dep-path . # Common build -VPATH = +VPATH = all: .built .PHONY: context depend clean distclean diff --git a/apps/netutils/smtp/Makefile b/apps/netutils/smtp/Makefile index b465b4f0b..d3dbaebf8 100644 --- a/apps/netutils/smtp/Makefile +++ b/apps/netutils/smtp/Makefile @@ -40,7 +40,7 @@ include $(APPDIR)/Make.defs # SMTP Library ASRCS = -CSRCS = +CSRCS = ifeq ($(CONFIG_NET_TCP),y) CSRCS += smtp.c @@ -66,7 +66,7 @@ ROOTDEPPATH = --dep-path . # Common build -VPATH = +VPATH = all: .built .PHONY: context depend clean distclean diff --git a/apps/netutils/telnetd/Makefile b/apps/netutils/telnetd/Makefile index 129162aca..99caf425f 100644 --- a/apps/netutils/telnetd/Makefile +++ b/apps/netutils/telnetd/Makefile @@ -40,7 +40,7 @@ include $(APPDIR)/Make.defs # Telnet daemon ASRCS = -CSRCS = +CSRCS = ifeq ($(CONFIG_NET_TCP),y) CSRCS += telnetd_daemon.c telnetd_driver.c @@ -66,7 +66,7 @@ ROOTDEPPATH = --dep-path . # Common build -VPATH = +VPATH = all: .built .PHONY: context depend clean distclean diff --git a/apps/netutils/telnetd/telnetd.h b/apps/netutils/telnetd/telnetd.h index 957c6c550..0d0d69cac 100644 --- a/apps/netutils/telnetd/telnetd.h +++ b/apps/netutils/telnetd/telnetd.h @@ -63,7 +63,7 @@ struct telnetd_s * connection is accepted. */ }; -/* This structure is used to passed information to telnet daemon when it +/* This structure is used to passed information to telnet daemon when it * started. It contains global information visable to all telnet daemons. */ @@ -80,7 +80,7 @@ struct telnetd_common_s * Public Data ****************************************************************************/ -/* This structure is used to passed information to telnet daemon when it +/* This structure is used to passed information to telnet daemon when it * started. It contains global information visable to all telnet daemons. */ @@ -105,7 +105,7 @@ extern struct telnetd_common_s g_telnetdcommon; * Return: * An allocated string represent the full path to the created driver. The * receiver of the string must de-allocate this memory when it is no longer - * needed. NULL is returned on a failure. + * needed. NULL is returned on a failure. * ****************************************************************************/ diff --git a/apps/netutils/telnetd/telnetd_daemon.c b/apps/netutils/telnetd/telnetd_daemon.c index aea9eb483..24c11bef4 100644 --- a/apps/netutils/telnetd/telnetd_daemon.c +++ b/apps/netutils/telnetd/telnetd_daemon.c @@ -70,7 +70,7 @@ * Public Data ****************************************************************************/ -/* This structure is used to passed information to telnet daemon when it +/* This structure is used to passed information to telnet daemon when it * started. */ diff --git a/apps/netutils/telnetd/telnetd_driver.c b/apps/netutils/telnetd/telnetd_driver.c index 7f87b8c70..f189d5613 100644 --- a/apps/netutils/telnetd/telnetd_driver.c +++ b/apps/netutils/telnetd/telnetd_driver.c @@ -136,7 +136,7 @@ static void telnetd_sendopt(FAR struct telnetd_dev_s *priv, uint8_t option, uint8_t value); /* Character driver methods */ - + static int telnetd_open(FAR struct file *filep); static int telnetd_close(FAR struct file *filep); static ssize_t telnetd_read(FAR struct file *, FAR char *, size_t); @@ -181,7 +181,7 @@ static inline void telnetd_dumpbuffer(FAR const char *msg, /* CONFIG_DEBUG, CONFIG_DEBUG_VERBOSE, and CONFIG_DEBUG_NET have to be * defined or the following does nothing. */ - + nvdbgdumpbuffer(msg, (FAR const uint8_t*)buffer, nbytes); } #endif @@ -741,7 +741,7 @@ static int telnetd_poll(FAR struct file *filep, FAR struct pollfd *fds, * Return: * An allocated string represent the full path to the created driver. The * receiver of the string must de-allocate this memory when it is no longer - * needed. NULL is returned on a failure. + * needed. NULL is returned on a failure. * ****************************************************************************/ diff --git a/apps/netutils/tftpc/Makefile b/apps/netutils/tftpc/Makefile index cd0792a4e..952bc620e 100644 --- a/apps/netutils/tftpc/Makefile +++ b/apps/netutils/tftpc/Makefile @@ -40,7 +40,7 @@ include $(APPDIR)/Make.defs # TFTP Client Library ASRCS = -CSRCS = +CSRCS = ifeq ($(CONFIG_NET_UDP),y) ifneq ($(CONFIG_NFILE_DESCRIPTORS),0) @@ -68,7 +68,7 @@ ROOTDEPPATH = --dep-path . # Common build -VPATH = +VPATH = all: .built .PHONY: context depend clean distclean diff --git a/apps/netutils/thttpd/Kconfig b/apps/netutils/thttpd/Kconfig index 403ce8092..3229ff403 100644 --- a/apps/netutils/thttpd/Kconfig +++ b/apps/netutils/thttpd/Kconfig @@ -218,7 +218,7 @@ choice is an error. Typical values, if they're defined, are "users" for THTTPD_TILDE_MAP1 - and "public_html" for THTTPD_TILDE_MAP2. + and "public_html" for THTTPD_TILDE_MAP2. config THTTPD_USE_TILDE_MAP1 bool "Tilde mapping 1" @@ -244,7 +244,7 @@ config THTTPD_USE_TILDE_MAP2 the name of a subdirectory off of the user's actual home dir, something like "public_html". - The typical value THTTPD_TILDE_MAP2 is "public_html". + The typical value THTTPD_TILDE_MAP2 is "public_html". config THTTPD_TILDE_MAP_NONE bool "No tilde mapping" @@ -286,7 +286,7 @@ config THTTPD_TILDE_MAP2 the name of a subdirectory off of the user's actual home dir, something like "public_html". - The typical value THTTPD_TILDE_MAP2 is "public_html". + The typical value THTTPD_TILDE_MAP2 is "public_html". config THTTPD_GENERATE_INDICES bool "Generate name indices" diff --git a/apps/netutils/thttpd/Makefile b/apps/netutils/thttpd/Makefile index 02a86f477..a2eaa3476 100644 --- a/apps/netutils/thttpd/Makefile +++ b/apps/netutils/thttpd/Makefile @@ -40,7 +40,7 @@ include $(APPDIR)/Make.defs # THTTPD Library ASRCS = -CSRCS = +CSRCS = ifeq ($(CONFIG_NET_TCP),y) CSRCS += thttpd.c libhttpd.c thttpd_cgi.c thttpd_alloc.c thttpd_strings.c timers.c fdwatch.c tdate_parse.c diff --git a/apps/netutils/thttpd/cgi-src/ssi.c b/apps/netutils/thttpd/cgi-src/ssi.c index c8bdab4ed..12d59d271 100644 --- a/apps/netutils/thttpd/cgi-src/ssi.c +++ b/apps/netutils/thttpd/cgi-src/ssi.c @@ -187,7 +187,7 @@ static int get_filename(char *vfilename, char *filename, /* Used for the various commands that accept a file name. These commands * accept two tags: virtual Gives a virtual path to a document on the - * server. file Gives a pathname relative to the current directory. ../ + * server. file Gives a pathname relative to the current directory. ../ * cannot be used in this pathname, nor can absolute paths be used. */ @@ -208,7 +208,7 @@ static int get_filename(char *vfilename, char *filename, { return -1; } - + if (fl - vl + strlen(val) >= fnsize) { return -1; @@ -403,7 +403,7 @@ static void do_config(FILE *instream, char *vfilename, char *filename, * strftime library call. g_sizefmt Determines the formatting to be used * when displaying the size of a file. Valid choices are bytes, for a * formatted byte count (formatted as 1,234,567), or abbrev for an - * abbreviated version displaying the number of kilobytes or megabytes the + * abbreviated version displaying the number of kilobytes or megabytes the * file occupies. */ @@ -495,7 +495,7 @@ static void do_include(FILE *instream, char *vfilename, char *filename, (void)fclose(instream2); } -static void do_echo(FILE *instream, char *vfilename, char *filename, +static void do_echo(FILE *instream, char *vfilename, char *filename, char *directive, char *tag, char *val) { char *cp; diff --git a/apps/netutils/thttpd/config.h b/apps/netutils/thttpd/config.h index e7bbb5ad9..56690adda 100644 --- a/apps/netutils/thttpd/config.h +++ b/apps/netutils/thttpd/config.h @@ -232,7 +232,7 @@ * about tildes. Enabling both options is an error. * * Typical values, if they're defined, are "users" for CONFIG_THTTPD_TILDE_MAP1 and "public_html" - * for CONFIG_THTTPD_TILDE_MAP2. + * for CONFIG_THTTPD_TILDE_MAP2. */ # if defined(CONFIG_THTTPD_TILDE_MAP1) && defined(CONFIG_THTTPD_TILDE_MAP2) diff --git a/apps/netutils/thttpd/fdwatch.c b/apps/netutils/thttpd/fdwatch.c index 50ea65e78..8a578b40c 100644 --- a/apps/netutils/thttpd/fdwatch.c +++ b/apps/netutils/thttpd/fdwatch.c @@ -107,7 +107,7 @@ static void fdwatch_dump(const char *msg, FAR struct fdwatch_s *fw) { int i; - + fwvdbg("%s\n", msg); fwvdbg("nwatched: %d nfds: %d\n", fw->nwatched, fw->nfds); for (i = 0; i < fw->nwatched; i++) diff --git a/apps/netutils/thttpd/libhttpd.c b/apps/netutils/thttpd/libhttpd.c index f147125d5..2b4b9767c 100644 --- a/apps/netutils/thttpd/libhttpd.c +++ b/apps/netutils/thttpd/libhttpd.c @@ -532,7 +532,7 @@ static void send_authenticate(httpd_conn *hc, char *realm) (void)snprintf(header, maxheader, "%s%s\"\r\n", headstr, realm); httpd_send_err(hc, 401, err401title, header, err401form, hc->encodedurl); - /* If the request was a POST then there might still be data to be read, so + /* If the request was a POST then there might still be data to be read, so * we need to do a lingering close. */ @@ -1046,8 +1046,8 @@ static int vhost_map(httpd_conn *hc) { /* Skip dots in the hostname. If we don't, then we get vhost * directories in higher level of filestructure if dot gets involved - * into path construction. It's `while' used here instead of `if' for - * it's possible to have a hostname formed with two dots at the end of + * into path construction. It's `while' used here instead of `if' for + * it's possible to have a hostname formed with two dots at the end of * it. */ @@ -1146,9 +1146,9 @@ static char *expand_filename(char *path, char **restP, bool tildemapped) if ((path[0] == '/' && strncmp(path, httpd_root, strlen(httpd_root)) != 0) || path[0] != '/') { /* Start out with httpd_root in checked. Allow space in the reallocation - * include NULL terminator and possibly a '/' + * include NULL terminator and possibly a '/' */ - + checkedlen = strlen(httpd_root); httpd_realloc_str(&checked, &maxchecked, checkedlen+2); strcpy(checked, httpd_root); @@ -1175,7 +1175,7 @@ static char *expand_filename(char *path, char **restP, bool tildemapped) httpd_realloc_str(&checked, &maxchecked, 1); checked[0] = '\0'; checkedlen = 0; - } + } /* Copy the whole filename (minus the leading '.') into rest. */ @@ -1725,7 +1725,7 @@ static void ls_child(int argc, char **argv) break; } - /* Now the world permissions. Owner and group permissions are + /* Now the world permissions. Owner and group permissions are * not of interest to web clients. */ @@ -2531,7 +2531,7 @@ int httpd_got_request(httpd_conn *hc) break; } break; - + case CHST_LF: switch (c) { @@ -2994,7 +2994,7 @@ int httpd_parse_request(httpd_conn *hc) } } - /* Ok, the request has been parsed. Now we resolve stuff that may require + /* Ok, the request has been parsed. Now we resolve stuff that may require * the entire request. */ @@ -3169,7 +3169,7 @@ int httpd_start_request(httpd_conn *hc, struct timeval *nowP) } /* Is it world-readable or world-executable? We check explicitly instead - * of just trying to open it, so that no one ever gets surprised by a file + * of just trying to open it, so that no one ever gets surprised by a file * that's not set world-readable and yet somehow is readable by the HTTP * server and therefore the *whole* world. */ @@ -3374,7 +3374,7 @@ int httpd_start_request(httpd_conn *hc, struct timeval *nowP) } #endif - /* It's not CGI. If it's executable or there's pathinfo, someone's trying + /* It's not CGI. If it's executable or there's pathinfo, someone's trying * to either serve or run a non-CGI file as CGI. Either case is * prohibited. */ diff --git a/apps/netutils/thttpd/thttpd.c b/apps/netutils/thttpd/thttpd.c index 57fe43514..6f082fc23 100644 --- a/apps/netutils/thttpd/thttpd.c +++ b/apps/netutils/thttpd/thttpd.c @@ -173,7 +173,7 @@ static int handle_newconnect(struct timeval *tv, int listen_fd) struct connect_s *conn; ClientData client_data; - /* This loops until the accept() fails, trying to start new connections as + /* This loops until the accept() fails, trying to start new connections as * fast as possible so we don't overrun the listen queue. */ @@ -183,7 +183,7 @@ static int handle_newconnect(struct timeval *tv, int listen_fd) /* Get the next free connection from the free list */ conn = free_connections; - + /* Are there any free connections? */ if (!conn) @@ -234,7 +234,7 @@ static int handle_newconnect(struct timeval *tv, int listen_fd) } nvdbg("New connection fd %d\n", conn->hc->conn_fd); - + /* Remove the connection entry from the free list */ conn->conn_state = CNST_READING; @@ -246,7 +246,7 @@ static int handle_newconnect(struct timeval *tv, int listen_fd) conn->wakeup_timer = NULL; conn->linger_timer = NULL; conn->offset = 0; - + /* Set the connection file descriptor to no-delay mode */ httpd_set_ndelay(conn->hc->conn_fd); @@ -294,7 +294,7 @@ static void handle_read(struct connect_s *conn, struct timeval *tv) { return; } - + ndbg("read(fd=%d) failed: %d\n", hc->conn_fd, errno); BADREQUEST("read"); goto errout_with_400; @@ -448,7 +448,7 @@ static void handle_send(struct connect_s *conn, struct timeval *tv) /* httpd_write does not return until all bytes have been sent * (or an error occurs). */ - + nwritten = httpd_write(hc->conn_fd, hc->buffer, hc->buflen); if (nwritten < 0) { @@ -488,8 +488,8 @@ static void handle_linger(struct connect_s *conn, struct timeval *tv) httpd_conn *hc = conn->hc; int ret; - /* In lingering-close mode we just read and ignore bytes. An error or EOF - * ends things, otherwise we go until a timeout + /* In lingering-close mode we just read and ignore bytes. An error or EOF + * ends things, otherwise we go until a timeout */ ret = read(conn->hc->conn_fd, hc->buffer, CONFIG_THTTPD_IOBUFFERSIZE); @@ -533,7 +533,7 @@ static void clear_connection(struct connect_s *conn, struct timeval *tv) * this unless it's necessary, because it ties up a connection slot and * file descriptor which means our maximum connection-handling rateis * lower. So, elsewhere we set a flag when we detect the few - * circumstances that make a lingering close necessary. If the flag isn't + * circumstances that make a lingering close necessary. If the flag isn't * set we do the real close now. */ @@ -790,7 +790,7 @@ int thttpd_main(int argc, char **argv) { if (!handle_newconnect(&tv, hs->listen_fd)) { - /* Go around the loop and do another fdwatch, rather than + /* Go around the loop and do another fdwatch, rather than * dropping through and processing existing connections. New * connections always get priority. */ @@ -820,7 +820,7 @@ int thttpd_main(int argc, char **argv) */ if (conn->conn_state != CNST_SENDING) - { + { break; } } diff --git a/apps/netutils/thttpd/thttpd_cgi.c b/apps/netutils/thttpd/thttpd_cgi.c index 9e63b25b4..1c931bb22 100644 --- a/apps/netutils/thttpd/thttpd_cgi.c +++ b/apps/netutils/thttpd/thttpd_cgi.c @@ -530,7 +530,7 @@ static inline int cgi_interpose_output(struct cgi_conn_s *cc) return 1; } - /* Figure out the status. Look for a Status: or Location: header; else if + /* Figure out the status. Look for a Status: or Location: header; else if * there's an HTTP header line, get it from there; else default to 200. */ @@ -811,7 +811,7 @@ static int cgi_child(int argc, char **argv) cc->rdfd = pipefd[0]; close(pipefd[1]); - + if (ret < 0) { nlldbg("STDOUT dup2: %d\n", errno); diff --git a/apps/netutils/thttpd/timers.c b/apps/netutils/thttpd/timers.c index dc94306b0..cd97cb3f8 100644 --- a/apps/netutils/thttpd/timers.c +++ b/apps/netutils/thttpd/timers.c @@ -293,7 +293,7 @@ void tmr_run(struct timeval *now) { next = tmr->next; - /* Since the lists are sorted, as soon as we find a timer * that isn'tmr + /* Since the lists are sorted, as soon as we find a timer * that isn'tmr * ready yet, we can go on to the next list */ diff --git a/apps/netutils/uiplib/Makefile b/apps/netutils/uiplib/Makefile index 4d33255a5..76daf985e 100644 --- a/apps/netutils/uiplib/Makefile +++ b/apps/netutils/uiplib/Makefile @@ -82,7 +82,7 @@ ROOTDEPPATH = --dep-path . # Common build -VPATH = +VPATH = all: .built .PHONY: context depend clean distclean diff --git a/apps/netutils/uiplib/uip_parsehttpurl.c b/apps/netutils/uiplib/uip_parsehttpurl.c index da973b46f..fbb2a9046 100644 --- a/apps/netutils/uiplib/uip_parsehttpurl.c +++ b/apps/netutils/uiplib/uip_parsehttpurl.c @@ -112,7 +112,7 @@ int uip_parsehttpurl(const char *url, uint16_t *port, { uint16_t accum = 0; src++; /* Skip over the colon */ - + while (*src >= '0' && *src <= '9') { accum = 10*accum + *src - '0'; @@ -141,7 +141,7 @@ int uip_parsehttpurl(const char *url, uint16_t *port, bytesleft--; /* The copy the rest of the file name to the user buffer */ - + strncpy(dest, src, namelen); filename[namelen-1] = '\0'; return ret; diff --git a/apps/netutils/uiplib/uip_server.c b/apps/netutils/uiplib/uip_server.c index 16be6f42f..b3e1759ab 100644 --- a/apps/netutils/uiplib/uip_server.c +++ b/apps/netutils/uiplib/uip_server.c @@ -104,7 +104,7 @@ void uip_server(uint16_t portno, pthread_startroutine_t handler, int stacksize) for (;;) { /* Accept the next connectin */ - + addrlen = sizeof(struct sockaddr_in); acceptsd = accept(listensd, (struct sockaddr*)&myaddr, &addrlen); if (acceptsd < 0) diff --git a/apps/netutils/webclient/Makefile b/apps/netutils/webclient/Makefile index d0b43621d..aacbe0dc3 100644 --- a/apps/netutils/webclient/Makefile +++ b/apps/netutils/webclient/Makefile @@ -40,7 +40,7 @@ include $(APPDIR)/Make.defs # Web client library ASRCS = -CSRCS = +CSRCS = ifeq ($(CONFIG_NET_TCP),y) CSRCS = webclient.c @@ -66,7 +66,7 @@ ROOTDEPPATH = --dep-path . # Common build -VPATH = +VPATH = all: .built .PHONY: context depend clean distclean diff --git a/apps/netutils/webserver/Kconfig b/apps/netutils/webserver/Kconfig index b011f94a2..d984427a3 100644 --- a/apps/netutils/webserver/Kconfig +++ b/apps/netutils/webserver/Kconfig @@ -20,7 +20,7 @@ config NETUTILS_HTTPD_SINGLECONNECT default y if DISABLE_PTHREAD ---help--- By default, the uIP web server will create a new, independent thread - for each connection. This can, however, use a lot of stack space + for each connection. This can, however, use a lot of stack space if there are many connections and that can be a problem is RAM is limited. If this option is selected, then a single thread will service all HTTP requests and, in this case, only a single connection diff --git a/apps/netutils/webserver/Makefile b/apps/netutils/webserver/Makefile index 1f3936f6e..06b528006 100644 --- a/apps/netutils/webserver/Makefile +++ b/apps/netutils/webserver/Makefile @@ -40,7 +40,7 @@ include $(APPDIR)/Make.defs # Web server library ASRCS = -CSRCS = +CSRCS = ifeq ($(CONFIG_NET_TCP),y) CSRCS = httpd.c httpd_cgi.c @@ -73,7 +73,7 @@ ROOTDEPPATH = --dep-path . # Common build -VPATH = +VPATH = all: .built .PHONY: context depend clean distclean diff --git a/apps/netutils/webserver/httpd_cgi.c b/apps/netutils/webserver/httpd_cgi.c index fa11f12ec..96e2eb0bd 100644 --- a/apps/netutils/webserver/httpd_cgi.c +++ b/apps/netutils/webserver/httpd_cgi.c @@ -60,7 +60,7 @@ struct httpd_cgi_call *cgi_calls = NULL; void httpd_cgi_register(struct httpd_cgi_call *cgi_call) { - if (cgi_calls == NULL) + if (cgi_calls == NULL) { cgi_calls = cgi_call; } diff --git a/apps/netutils/webserver/httpd_mmap.c b/apps/netutils/webserver/httpd_mmap.c index 042c9932f..c5033d866 100644 --- a/apps/netutils/webserver/httpd_mmap.c +++ b/apps/netutils/webserver/httpd_mmap.c @@ -89,13 +89,13 @@ int httpd_mmap_open(const char *name, struct httpd_fs_file *file) return ERROR; } - if (S_ISDIR(st.st_mode)) + if (S_ISDIR(st.st_mode)) { errno = EISDIR; return ERROR; } - if (!S_ISREG(st.st_mode)) + if (!S_ISREG(st.st_mode)) { errno = ENOENT; return ERROR; diff --git a/apps/netutils/xmlrpc/Makefile b/apps/netutils/xmlrpc/Makefile index 7bc404b47..a00436511 100644 --- a/apps/netutils/xmlrpc/Makefile +++ b/apps/netutils/xmlrpc/Makefile @@ -41,7 +41,7 @@ include $(APPDIR)/Make.defs ASRCS = -CSRCS = +CSRCS = ifeq ($(CONFIG_NET_TCP),y) CSRCS += xmlparser.c response.c @@ -67,7 +67,7 @@ ROOTDEPPATH = --dep-path . # Common build -VPATH = +VPATH = all: .built .PHONY: context depend clean distclean diff --git a/apps/netutils/xmlrpc/response.c b/apps/netutils/xmlrpc/response.c index 2ae7414a7..2bbe74cf1 100644 --- a/apps/netutils/xmlrpc/response.c +++ b/apps/netutils/xmlrpc/response.c @@ -1,6 +1,6 @@ /**************************************************************************** * apps/netutils/xmlrpc/response.c - * + * * Copyright (C) 2012 Max Holtzberg. All rights reserved. * Author: Max Holtzberg <mh@uvc.de> * @@ -9,34 +9,34 @@ * an-embeddable-lightweight-xml-rpc-server/184405364 * * Copyright (c) 2002 Cogito LLC. All rights reserved. - * - * Redistribution and use in source and binary forms, with or - * without modification, is hereby granted without fee provided + * + * Redistribution and use in source and binary forms, with or + * without modification, is hereby granted without fee provided * that the following conditions are met: - * - * 1. Redistributions of source code must retain the above - * copyright notice, this list of conditions and the + * + * 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 + * 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 of Cogito LLC nor the names of its - * contributors may be used to endorse or promote products - * derived from this software without specific prior + * 3. Neither the name of Cogito LLC 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 COGITO LLC AND CONTRIBUTERS 'AS IS' - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED - * TO, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A - * PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL COGITO LLC - * OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARAY, 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 + * + * THIS SOFTWARE IS PROVIDED BY COGITO LLC AND CONTRIBUTERS 'AS IS' + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED + * TO, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A + * PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL COGITO LLC + * OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARAY, 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. ****************************************************************************/ diff --git a/apps/netutils/xmlrpc/xmlparser.c b/apps/netutils/xmlrpc/xmlparser.c index 72387a08e..98ce3a903 100644 --- a/apps/netutils/xmlrpc/xmlparser.c +++ b/apps/netutils/xmlrpc/xmlparser.c @@ -1,6 +1,6 @@ /**************************************************************************** * apps/netutils/xmlrpc/xmlparser.c - * + * * Copyright (C) 2012 Max Holtzberg. All rights reserved. * Author: Max Holtzberg <mh@uvc.de> * @@ -9,34 +9,34 @@ * an-embeddable-lightweight-xml-rpc-server/184405364 * * Copyright (c) 2002 Cogito LLC. All rights reserved. - * - * Redistribution and use in source and binary forms, with or - * without modification, is hereby granted without fee provided + * + * Redistribution and use in source and binary forms, with or + * without modification, is hereby granted without fee provided * that the following conditions are met: - * - * 1. Redistributions of source code must retain the above - * copyright notice, this list of conditions and the + * + * 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 + * 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 of Cogito LLC nor the names of its - * contributors may be used to endorse or promote products - * derived from this software without specific prior + * 3. Neither the name of Cogito LLC 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 COGITO LLC AND CONTRIBUTERS 'AS IS' - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED - * TO, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A - * PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL COGITO LLC - * OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARAY, 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 + * + * THIS SOFTWARE IS PROVIDED BY COGITO LLC AND CONTRIBUTERS 'AS IS' + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED + * TO, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A + * PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL COGITO LLC + * OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARAY, 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. ****************************************************************************/ diff --git a/apps/nshlib/nsh_consolemain.c b/apps/nshlib/nsh_consolemain.c index 27e9d6db9..42353d3f4 100644 --- a/apps/nshlib/nsh_consolemain.c +++ b/apps/nshlib/nsh_consolemain.c @@ -95,7 +95,7 @@ * This function does not normally return. exit() is usually called to * terminate the NSH session. This function will return in the event of * an error. In that case, a nonzero value is returned (EXIT_FAILURE=1). - * + * ****************************************************************************/ int nsh_consolemain(int argc, char *argv[]) diff --git a/apps/nshlib/nsh_ddcmd.c b/apps/nshlib/nsh_ddcmd.c index ce6b47a47..4ab80bef1 100644 --- a/apps/nshlib/nsh_ddcmd.c +++ b/apps/nshlib/nsh_ddcmd.c @@ -113,7 +113,7 @@ struct dd_s int fd; /* File descriptor of the character device */ } inf; #else - int infd; /* File descriptor of the input device */ + int infd; /* File descriptor of the input device */ #endif #ifndef CONFIG_DISABLE_MOUNTPOINT @@ -123,7 +123,7 @@ struct dd_s int fd; /* File descriptor of the character device */ } outf; #else - int outfd; /* File descriptor of the output device */ + int outfd; /* File descriptor of the output device */ #endif uint32_t nsectors; /* Number of sectors to transfer */ diff --git a/apps/nshlib/nsh_fileapps.c b/apps/nshlib/nsh_fileapps.c index 9ff230f1a..6e35a97d2 100644 --- a/apps/nshlib/nsh_fileapps.c +++ b/apps/nshlib/nsh_fileapps.c @@ -168,7 +168,7 @@ int nsh_fileapp(FAR struct nsh_vtbl_s *vtbl, FAR const char *cmd, { /* The application was successfully started with pre-emption disabled. * In the simplest cases, the application will not have run because the - * the scheduler is locked. But in the case where I/O was redirected, a + * the scheduler is locked. But in the case where I/O was redirected, a * proxy task ran and broke our lock. As result, the application may * have aso ran if its priority was higher than than the priority of * this thread. @@ -232,7 +232,7 @@ int nsh_fileapp(FAR struct nsh_vtbl_s *vtbl, FAR const char *cmd, else { /* We can't return the exact status (nsh has nowhere to put it) - * so just pass back zero/nonzero in a fashion that doesn't look + * so just pass back zero/nonzero in a fashion that doesn't look * like an error. */ diff --git a/apps/nshlib/nsh_proccmds.c b/apps/nshlib/nsh_proccmds.c index 35010a8ac..399609688 100644 --- a/apps/nshlib/nsh_proccmds.c +++ b/apps/nshlib/nsh_proccmds.c @@ -86,15 +86,15 @@ static const char *g_statenames[] = { "INVALID ", "PENDING ", - "READY ", - "RUNNING ", - "INACTIVE", - "WAITSEM ", + "READY ", + "RUNNING ", + "INACTIVE", + "WAITSEM ", #ifndef CONFIG_DISABLE_MQUEUE - "WAITSIG ", + "WAITSIG ", #endif #ifndef CONFIG_DISABLE_MQUEUE - "MQNEMPTY", + "MQNEMPTY", "MQNFULL " #endif }; @@ -182,7 +182,7 @@ static int readfile(FAR const char *filename, FAR char *buffer, size_t buflen) else { /* Successful read. Make sure that the buffer is null terminated */ - + DEBUGASSERT(nread <= remaining); ntotal += nread; buffer[ntotal] = '\0'; @@ -200,7 +200,7 @@ static int readfile(FAR const char *filename, FAR char *buffer, size_t buflen) /* Close the file and return. */ close(fd); - return ret; + return ret; } #endif diff --git a/apps/nshlib/nsh_telnetd.c b/apps/nshlib/nsh_telnetd.c index c77e256a4..61a196601 100644 --- a/apps/nshlib/nsh_telnetd.c +++ b/apps/nshlib/nsh_telnetd.c @@ -136,7 +136,7 @@ int nsh_telnetlogin(struct console_stdio_s *pstate) } /* Ask for the login password */ - + fputs(g_passwordprompt, pstate->cn_outstream); fflush(pstate->cn_outstream); nsh_telnetecho(pstate, TELNET_NOTUSE_ECHO); @@ -277,7 +277,7 @@ int nsh_telnetmain(int argc, char *argv[]) * Returned Values: * The task ID of the Telnet daemon was successfully started. A negated * errno value will be returned on failure. - * + * ****************************************************************************/ int nsh_telnetstart(void) diff --git a/apps/nshlib/nsh_test.c b/apps/nshlib/nsh_test.c index 6e1b65e5f..f76da5417 100644 --- a/apps/nshlib/nsh_test.c +++ b/apps/nshlib/nsh_test.c @@ -398,7 +398,7 @@ static int expression(FAR struct nsh_vtbl_s *vtbl, int argc, char **argv) goto errout_syntax; } } - return value; + return value; errout_syntax: nsh_output(vtbl, g_nshsyntax, "test"); diff --git a/apps/nshlib/nsh_usbdev.c b/apps/nshlib/nsh_usbdev.c index ed6b928c2..ec80df481 100644 --- a/apps/nshlib/nsh_usbdev.c +++ b/apps/nshlib/nsh_usbdev.c @@ -291,7 +291,7 @@ static int nsh_waitusbready(void) * single an NSH instance that operates on stdin and stdout. This * function does not return. * - * This function handles generic /dev/console character devices, or + * This function handles generic /dev/console character devices, or * special USB console devices. The USB console requires some special * operations to handle the cases where the session is lost when the * USB device is unplugged and restarted when the USB device is plugged @@ -304,7 +304,7 @@ static int nsh_waitusbready(void) * Returned Values: * This function does not return nor does it ever exit (unless the user * executes the NSH exit command). - * + * ****************************************************************************/ #ifdef HAVE_USB_CONSOLE @@ -384,7 +384,7 @@ int nsh_consolemain(int argc, char *argv[]) * * Returned Values: * None - * + * ****************************************************************************/ #ifdef CONFIG_NSH_USBDEV_TRACE diff --git a/apps/system/cdcacm/Makefile b/apps/system/cdcacm/Makefile index b72bb9fae..283add323 100644 --- a/apps/system/cdcacm/Makefile +++ b/apps/system/cdcacm/Makefile @@ -72,7 +72,7 @@ STACKSIZE2 = 2048 # Common build -VPATH = +VPATH = all: .built .PHONY: context clean depend distclean diff --git a/apps/system/cle/Makefile b/apps/system/cle/Makefile index cce4bb109..78b1ffd35 100644 --- a/apps/system/cle/Makefile +++ b/apps/system/cle/Makefile @@ -66,7 +66,7 @@ ROOTDEPPATH = --dep-path . # Common build -VPATH = +VPATH = all: .built .PHONY: context depend clean distclean diff --git a/apps/system/composite/Makefile b/apps/system/composite/Makefile index 83d36d5e8..a4ca37871 100644 --- a/apps/system/composite/Makefile +++ b/apps/system/composite/Makefile @@ -72,7 +72,7 @@ STACKSIZE2 = 2048 # Common build -VPATH = +VPATH = all: .built .PHONY: context clean depend distclean diff --git a/apps/system/composite/composite_main.c b/apps/system/composite/composite_main.c index 28d8e38aa..5bba46132 100644 --- a/apps/system/composite/composite_main.c +++ b/apps/system/composite/composite_main.c @@ -793,7 +793,7 @@ int conn_main(int argc, char *argv[]) #endif /* Dump debug memory usage */ - + message("conn_main: Exiting\n"); #if !defined(CONFIG_NSH_BUILTIN_APPS) && !defined(CONFIG_DISABLE_SIGNALS) close(g_composite.infd); diff --git a/apps/system/flash_eraseall/Makefile b/apps/system/flash_eraseall/Makefile index 0d4d7c9fe..6b51aed35 100644 --- a/apps/system/flash_eraseall/Makefile +++ b/apps/system/flash_eraseall/Makefile @@ -76,7 +76,7 @@ ROOTDEPPATH = --dep-path . # Common build -VPATH = +VPATH = all: .built .PHONY: context depend clean distclean diff --git a/apps/system/free/Makefile b/apps/system/free/Makefile index f085497cb..737d111af 100644 --- a/apps/system/free/Makefile +++ b/apps/system/free/Makefile @@ -72,7 +72,7 @@ ROOTDEPPATH = --dep-path . # Common build -VPATH = +VPATH = all: .built .PHONY: context depend clean distclean diff --git a/apps/system/i2c/Makefile b/apps/system/i2c/Makefile index 1ed7a2fae..4cad67ecf 100644 --- a/apps/system/i2c/Makefile +++ b/apps/system/i2c/Makefile @@ -59,7 +59,7 @@ endif endif ROOTDEPPATH = --dep-path . -VPATH = +VPATH = APPNAME = i2c PRIORITY = SCHED_PRIORITY_DEFAULT diff --git a/apps/system/i2c/i2c_common.c b/apps/system/i2c/i2c_common.c index 4af648c7d..aa4868ffe 100644 --- a/apps/system/i2c/i2c_common.c +++ b/apps/system/i2c/i2c_common.c @@ -209,7 +209,7 @@ int arg_hex(FAR char **arg, FAR long *value) { FAR char *string; int ret; - + ret = arg_string(arg, &string); *value = strtol(string, NULL, 16); return ret; diff --git a/apps/system/i2c/i2c_dev.c b/apps/system/i2c/i2c_dev.c index 3d0480a15..a9da1a03f 100644 --- a/apps/system/i2c/i2c_dev.c +++ b/apps/system/i2c/i2c_dev.c @@ -177,7 +177,7 @@ int i2ccmd_dev(FAR struct i2ctool_s *i2ctool, int argc, char **argv) i2ctool_printf(i2ctool, " "); continue; } - + /* Set the I2C address */ I2C_SETADDRESS(dev, addr, 7); diff --git a/apps/system/i2c/i2c_main.c b/apps/system/i2c/i2c_main.c index 0cf6786cb..47e60ec1d 100644 --- a/apps/system/i2c/i2c_main.c +++ b/apps/system/i2c/i2c_main.c @@ -70,7 +70,7 @@ static int i2ccmd_unrecognized(FAR struct i2ctool_s *i2ctool, int argc, char **a /**************************************************************************** * Private Data ****************************************************************************/ - + struct i2ctool_s g_i2ctool; static const struct cmdmap_s g_i2ccmds[] = @@ -379,7 +379,7 @@ int i2c_main(int argc, char *argv[]) { g_i2ctool.freq = CONFIG_I2CTOOL_DEFFREQ; } - + /* Parse process the command line */ i2c_setup(&g_i2ctool); @@ -406,7 +406,7 @@ int i2ctool_printf(FAR struct i2ctool_s *i2ctool, const char *fmt, ...) va_start(ap, fmt); ret = vfprintf(OUTSTREAM(i2ctool), fmt, ap); va_end(ap); - + return ret; } diff --git a/apps/system/inifile/Makefile b/apps/system/inifile/Makefile index c867c114d..d7611b4dd 100644 --- a/apps/system/inifile/Makefile +++ b/apps/system/inifile/Makefile @@ -59,7 +59,7 @@ endif endif ROOTDEPPATH = --dep-path . -VPATH = +VPATH = # Build targets diff --git a/apps/system/install/Makefile b/apps/system/install/Makefile index 07d42887a..fb7c4de05 100644 --- a/apps/system/install/Makefile +++ b/apps/system/install/Makefile @@ -76,7 +76,7 @@ ROOTDEPPATH = --dep-path . # Common build -VPATH = +VPATH = all: .built .PHONY: context depend clean distclean diff --git a/apps/system/install/README.txt b/apps/system/install/README.txt index 66e9b0939..114e9c5a3 100644 --- a/apps/system/install/README.txt +++ b/apps/system/install/README.txt @@ -11,9 +11,9 @@ the program memory (flash) area into free area and creates a start-up script into selected directory (i.e. /usr/bin/progname). Usage: - install [--stack RequiredStackSpace] [--priority Priority] + install [--stack RequiredStackSpace] [--priority Priority] source-file destination-directory - + If stackspace is not given default stack space of 4096 Bytes is used. If priority is not given system default is used. diff --git a/apps/system/nxplayer/nxplayer.c b/apps/system/nxplayer/nxplayer.c index 1c0f66c8a..58d2fb7ef 100644 --- a/apps/system/nxplayer/nxplayer.c +++ b/apps/system/nxplayer/nxplayer.c @@ -253,7 +253,7 @@ static int nxplayer_opendevice(FAR struct nxplayer_s *pPlayer, int format, caps.ac_subtype = format; caps.ac_format[0] = 0; - while (ioctl(pPlayer->devFd, AUDIOIOC_GETCAPS, + while (ioctl(pPlayer->devFd, AUDIOIOC_GETCAPS, (unsigned long) &caps) == caps.ac_len) { /* Check the next set of 4 controls to find the subformat */ diff --git a/apps/system/poweroff/Makefile b/apps/system/poweroff/Makefile index eb7518fbc..382911875 100644 --- a/apps/system/poweroff/Makefile +++ b/apps/system/poweroff/Makefile @@ -76,7 +76,7 @@ ROOTDEPPATH = --dep-path . # Common build -VPATH = +VPATH = all: .built .PHONY: context depend clean distclean diff --git a/apps/system/poweroff/poweroff.c b/apps/system/poweroff/poweroff.c index dd08b177a..916936a80 100644 --- a/apps/system/poweroff/poweroff.c +++ b/apps/system/poweroff/poweroff.c @@ -51,10 +51,10 @@ int poweroff_main(int argc, char *argv[]) * a new process with nsh poweroff) * - wait for some time (~0.5 second for VSN), that SDcard is flashed and synced * - call poweroff - * + * * TODO on boot: * - if external key is pressed, do not start the nsh! but wait until it is released - * (to get rid of bad mounts of the sdcard etc.) this could be handled in the + * (to get rid of bad mounts of the sdcard etc.) this could be handled in the * button driver immediately on system boot */ diff --git a/apps/system/ramtest/Makefile b/apps/system/ramtest/Makefile index 71d7558f5..a8263a89f 100644 --- a/apps/system/ramtest/Makefile +++ b/apps/system/ramtest/Makefile @@ -69,7 +69,7 @@ ROOTDEPPATH = --dep-path . # Common build -VPATH = +VPATH = all: .built .PHONY: context depend clean distclean diff --git a/apps/system/ramtron/Makefile b/apps/system/ramtron/Makefile index b47781095..4ac47431a 100644 --- a/apps/system/ramtron/Makefile +++ b/apps/system/ramtron/Makefile @@ -76,7 +76,7 @@ ROOTDEPPATH = --dep-path . # Common build -VPATH = +VPATH = all: .built .PHONY: context depend clean distclean diff --git a/apps/system/ramtron/ramtron.c b/apps/system/ramtron/ramtron.c index 2e1632cf1..f769a7ea7 100644 --- a/apps/system/ramtron/ramtron.c +++ b/apps/system/ramtron/ramtron.c @@ -56,7 +56,7 @@ int ramtron_start(int spino) int retval; /* Get the SPI port */ - + spi = up_spiinitialize(spino); if (!spi) { @@ -86,17 +86,17 @@ int ramtron_start(int spino) int ramtron_main(int argc, char *argv[]) { int spino; - + if (argc == 3) { spino = atoi(argv[2]); - + if (!strcmp(argv[1], "start")) { return ramtron_start(spino); } } - + /* todo: write protect */ printf("%s: <start> <spino>\n", argv[0]); diff --git a/apps/system/sdcard/Makefile b/apps/system/sdcard/Makefile index d748b2b04..87dfb697b 100644 --- a/apps/system/sdcard/Makefile +++ b/apps/system/sdcard/Makefile @@ -76,7 +76,7 @@ ROOTDEPPATH = --dep-path . # Common build -VPATH = +VPATH = all: .built .PHONY: context depend clean distclean diff --git a/apps/system/stackmonitor/Makefile b/apps/system/stackmonitor/Makefile index e38935d32..5e7102c4f 100644 --- a/apps/system/stackmonitor/Makefile +++ b/apps/system/stackmonitor/Makefile @@ -69,7 +69,7 @@ ROOTDEPPATH = --dep-path . # Common build -VPATH = +VPATH = all: .built .PHONY: context depend clean distclean diff --git a/apps/system/stackmonitor/stackmonitor.c b/apps/system/stackmonitor/stackmonitor.c index 653a2fdc4..2c912fcbf 100644 --- a/apps/system/stackmonitor/stackmonitor.c +++ b/apps/system/stackmonitor/stackmonitor.c @@ -146,7 +146,7 @@ int stackmonitor_start(int argc, char **argv) int ret; /* No.. start it now */ - + /* Then start the stack monitoring daemon */ g_stackmonitor.started = true; diff --git a/apps/system/sysinfo/Makefile b/apps/system/sysinfo/Makefile index bbac0415b..32edf1ab8 100644 --- a/apps/system/sysinfo/Makefile +++ b/apps/system/sysinfo/Makefile @@ -77,7 +77,7 @@ ROOTDEPPATH = --dep-path . # Common build -VPATH = +VPATH = all: .built .PHONY: context depend clean distclean diff --git a/apps/system/usbmonitor/Makefile b/apps/system/usbmonitor/Makefile index 56b6ccee1..4516d31d6 100644 --- a/apps/system/usbmonitor/Makefile +++ b/apps/system/usbmonitor/Makefile @@ -69,7 +69,7 @@ ROOTDEPPATH = --dep-path . # Common build -VPATH = +VPATH = all: .built .PHONY: context depend clean distclean diff --git a/apps/system/usbmonitor/usbmonitor.c b/apps/system/usbmonitor/usbmonitor.c index f223be540..252a5890d 100644 --- a/apps/system/usbmonitor/usbmonitor.c +++ b/apps/system/usbmonitor/usbmonitor.c @@ -185,7 +185,7 @@ int usbmonitor_start(int argc, char **argv) int ret; /* No.. start it now */ - + #ifdef CONFIG_USBDEV_TRACE /* First, initialize any USB tracing options that were requested */ diff --git a/apps/system/usbmsc/Makefile b/apps/system/usbmsc/Makefile index 842733ef7..7ee0765eb 100644 --- a/apps/system/usbmsc/Makefile +++ b/apps/system/usbmsc/Makefile @@ -75,7 +75,7 @@ STACKSIZE2 = $(CONFIG_SYSTEM_USBMSC_CMD_STACKSIZE) # Common build -VPATH = +VPATH = all: .built .PHONY: context clean depend distclean diff --git a/apps/system/usbmsc/usbmsc_main.c b/apps/system/usbmsc/usbmsc_main.c index 9dd0fb5ad..39eaebeff 100644 --- a/apps/system/usbmsc/usbmsc_main.c +++ b/apps/system/usbmsc/usbmsc_main.c @@ -549,11 +549,11 @@ int msconn_main(int argc, char *argv[]) #else /* defined(CONFIG_DISABLE_SIGNALS) */ /* Just exit */ - + message("mcsonn_main: Exiting\n"); /* Dump debug memory usage */ - + final_memory_usage("Final memory usage"); #endif diff --git a/apps/system/vi/Makefile b/apps/system/vi/Makefile index 8ece2628e..80ea483c8 100644 --- a/apps/system/vi/Makefile +++ b/apps/system/vi/Makefile @@ -73,7 +73,7 @@ ROOTDEPPATH = --dep-path . # Common build -VPATH = +VPATH = all: .built .PHONY: context depend clean distclean diff --git a/apps/system/zmodem/host/crc32.c b/apps/system/zmodem/host/crc32.c index 01b92a32c..d2b8815ff 100644 --- a/apps/system/zmodem/host/crc32.c +++ b/apps/system/zmodem/host/crc32.c @@ -50,7 +50,7 @@ /************************************************************************************************ * Private Data ************************************************************************************************/ - + static const uint32_t crc32_tab[] = { 0x00000000, 0x77073096, 0xee0e612c, 0x990951ba, 0x076dc419, 0x706af48f, 0xe963a535, 0x9e6495a3, diff --git a/apps/system/zmodem/host/nuttx/compiler.h b/apps/system/zmodem/host/nuttx/compiler.h index fc029063e..f71dcff09 100644 --- a/apps/system/zmodem/host/nuttx/compiler.h +++ b/apps/system/zmodem/host/nuttx/compiler.h @@ -102,7 +102,7 @@ */ # define naked_function __attribute__ ((naked,no_instrument_function)) - + /* The inline_function attribute informs GCC that the function should always * be inlined, regardless of the level of optimization. The noinline_function * indicates that the function should never be inlined. diff --git a/apps/system/zmodem/zm_proto.c b/apps/system/zmodem/zm_proto.c index f730a984c..05edc46f6 100644 --- a/apps/system/zmodem/zm_proto.c +++ b/apps/system/zmodem/zm_proto.c @@ -313,7 +313,7 @@ int zm_sendhexhdr(FAR struct zm_state_s *pzm, int type, } /* crc-1 crc-2 */ - + crc = crc16part(g_zeroes, 2, crc); ptr = zm_puthex8(ptr, (crc >> 8) & 0xff); ptr = zm_puthex8(ptr, crc & 0xff); @@ -346,7 +346,7 @@ int zm_sendhexhdr(FAR struct zm_state_s *pzm, int type, * 16-bit binary header: * ZPAD ZDLE ZBIN type f3/p0 f2/p1 f1/p2 f0/p3 crc-1 crc-2 * Payload length: 7 (type, 4 bytes data, 2 byte CRC) - * + * * Input Parameters: * pzm - Zmodem session state * type - Header type {ZSINIT, ZFILE, ZDATA, ZDATA} |