Fix several cosmetic, C coding style issues

examples/buttons/buttons_main.c

@@ -183,7 +183,7 @@ static int button7_handler(int irq, FAR void *context);
  * Private Data
  ****************************************************************************/
 
- /* Button Names */
+/* Button Names */
 
 static const struct button_info_s g_buttoninfo[NUM_BUTTONS] =
 {

examples/cc3000/board.h

@@ -1,31 +1,36 @@
 /****************************************************************************
-*
-*  This file is part of the ArduinoCC3000 library.
+ *  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
+ *  modification, are permitted provided that the following conditions
+ *  are met:
+ *
+ *  Don't sue me if my code blows up your board and burns down your house
+ *
+ *  This file is the main module for the Arduino CC3000 library.
+ *  Your program must call CC3000_Init() before any other API calls.
+ *
+ ****************************************************************************/
 
-*  Version 1.0.1b
-*
-*  Copyright (C) 2013 Chris Magagna - cmagagna@yahoo.com
-*
-*  Redistribution and use in source and binary forms, with or without
-*  modification, are permitted provided that the following conditions
-*  are met:
-*
-*  Don't sue me if my code blows up your board and burns down your house
-*
-*  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.
-*/
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
 
 #include <stdint.h>
 
+/****************************************************************************
+ * Pre-processor Definitions
+ ****************************************************************************/
+
+/* Some things are different for the Teensy 3.0, so set a flag if we're using
+ * that hardware.
+ */
+
 #if defined(__arm__) && defined(CORE_TEENSY) && defined(__MK20DX128__)
-#define TEENSY3   1
+#  define TEENSY3   1
 #endif
 
 /* I used the Teensy 3.0 to get the Arduino CC3000 library working but the
@@ -68,29 +73,28 @@
 
 #endif
 
-/*
-	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.
-	
-	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
-	the interrupt routine and read the pins directly. Because digitalRead()
-	/ Write() are so slow once in a while the Arduino will be in the middle of
-	its pin code and the CC3000 will flip another pin's state and it will be
-	missed, and everything locks up.
-	
-	The upshot of all of this is we need to read & write the pin states
-	directly, which is very fast compared to the built in Arduino functions.
-	
-	The Teensy 3.0's library has built in macros called digitalReadFast()
-	& digitalWriteFast() that compile down to direct port manipulations but
-	are still readable, so use those if possible.
-	
-	There's a digitalReadFast() / digitalWriteFast() library for Arduino but
-	it looks like it hasn't been updated since 2010 so I think it's best to
-	just use the direct port manipulations.
-*/
+/* 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.
+ *
+ * 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
+ * the interrupt routine and read the pins directly. Because digitalRead()
+ * / Write() are so slow once in a while the Arduino will be in the middle of
+ * its pin code and the CC3000 will flip another pin's state and it will be
+ * missed, and everything locks up.
+ *
+ * The upshot of all of this is we need to read & write the pin states
+ * directly, which is very fast compared to the built in Arduino functions.
+ *
+ * The Teensy 3.0's library has built in macros called digitalReadFast()
+ * & digitalWriteFast() that compile down to direct port manipulations but
+ * are still readable, so use those if possible.
+ *
+ * There's a digitalReadFast() / digitalWriteFast() library for Arduino but
+ * it looks like it hasn't been updated since 2010 so I think it's best to
+ * just use the direct port manipulations.
+ */
 
 #ifdef TEENSY3
 
@@ -102,6 +106,7 @@
 
 // This is hardcoded for an ATMega328 and pin 3. You will need to change this
 // for other MCUs or pins
+
 #define Read_CC3000_IRQ_Pin()     ((PIND & B00001000) ? 1 : 0)
 
 // This is hardcoded for an ATMega328 and pin 10. You will need to change this
@@ -115,33 +120,45 @@
 #define DISABLE          (0)
 #define ENABLE           (1)
 
-//AES key "smartconfigAES16"
-//const uint8_t smartconfigkey[] = {0x73,0x6d,0x61,0x72,0x74,0x63,0x6f,0x6e,0x66,0x69,0x67,0x41,0x45,0x53,0x31,0x36};
+/****************************************************************************
+ * Public Data
+ ****************************************************************************/
+
+#if 0
+/* AES key "smartconfigAES16" */
+
+const uint8_t smartconfigkey[] =
+  {
+    0x73, 0x6d, 0x61, 0x72, 0x74, 0x63, 0x6f, 0x6e,
+    0x66, 0x69, 0x67, 0x41, 0x45, 0x53, 0x31, 0x36
+  };
+#endif
 
 /* 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. */
+ * 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.
+ */
 
 //#define CC3000_TINY_DRIVER  1
 
@@ -155,4 +172,8 @@ extern volatile unsigned long OkToDoShutDown;
 extern volatile unsigned long ulCC3000DHCP_configured;
 extern volatile uint8_t ucStopSmartConfig;
 
+/****************************************************************************
+ * Public Function Prototypes
+ ****************************************************************************/
+
 void CC3000_Init(void);

examples/elf/tests/task/task.c

@@ -67,7 +67,7 @@ static char no_name[] = "<noname>";
  * a relocation type that is not supported by ELF is generated by GCC.
  */
 
- int child_task(int argc, char **argv)
+int child_task(int argc, char **argv)
 {
   printf("Child: execv was successful!\n");
   printf("Child: argc=%d\n", argc);

examples/ltdc/ltdc.h

@@ -112,7 +112,7 @@ static const uint32_t g_rgb16[LTDC_EXAMPLE_NCOLORS] =
 
 /****************************************************************************
  * Public Functions
-****************************************************************************/
+ ****************************************************************************/
 
 void ltdc_clrcolor(uint8_t *color, uint8_t value, size_t size);
 int ltdc_cmpcolor(uint8_t *color1, uint8_t *color2, size_t size);

examples/nxflat/tests/task/task.c

@@ -67,7 +67,7 @@ static char no_name[] = "<noname>";
  * a relocation type that is not supported by NXFLAT is generated by GCC.
  */
 
- int child_task(int argc, char **argv)
+int child_task(int argc, char **argv)
 {
   printf("Child: execv was successful!\n");
   printf("Child: argc=%d\n", argc);

examples/nxhello/nxhello_bkgd.c

@@ -327,7 +327,7 @@ static void nxhello_initglyph(FAR uint8_t *glyph, uint8_t height,
 #endif
 }
 
- /****************************************************************************
+/****************************************************************************
  * Public Functions
  ****************************************************************************/
 

examples/nximage/nximage_bitmap.c

@@ -1074,7 +1074,7 @@ static const struct pix_run_s g_nuttx[] =
   { 75,   0}, {  1,   5}, {  2,   4}, {  1,   3}, {  1, 163}, {  1,   6}, {  1,   4}, {  1,   5},  /* Row 158 */
   { 77,   0},
   { 76,   0}, {  1,   5}, {  4,   4}, {  1,   5}, { 78,   0}                                       /* Row 159 */
- };
+};
 
 #elif CONFIG_EXAMPLES_NXIMAGE_BPP == 16
 

examples/nxlines/nxlines_bkgd.c

@@ -197,7 +197,7 @@ static void nxlines_kbdin(NXWINDOW hwnd, uint8_t nch, FAR const uint8_t *ch,
 }
 #endif
 
- /****************************************************************************
+/****************************************************************************
  * Public Functions
  ****************************************************************************/
 

examples/pashello/hello.h

@@ -1,4 +1,5 @@
-unsigned char hello_pex[] = {
+unsigned char hello_pex[] =
+{
   0x50, 0x4f, 0x46, 0x46, 0x01, 0x01, 0x00, 0x00, 0x00, 0x14, 0x00, 0x05,
   0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18,
   0x01, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x11, 0x00, 0x00, 0x00, 0x00,
@@ -20,4 +21,5 @@ unsigned char hello_pex[] = {
   0x2e, 0x6c, 0x69, 0x6e, 0x65, 0x6e, 0x6f, 0x00, 0x2e, 0x73, 0x74, 0x72,
   0x74, 0x61, 0x62, 0x00
 };
+
 unsigned int hello_pex_len = 232;

examples/relays/relays_main.c

@@ -61,7 +61,7 @@
 #  define CONFIG_EXAMPLES_RELAYS_NRELAYS  2
 #endif
 
- /****************************************************************************
+/****************************************************************************
  * Private Types
  ****************************************************************************/
 

examples/romfs/romfs_testdir.h

@@ -1,4 +1,5 @@
-unsigned char testdir_img[] = {
+unsigned char testdir_img[] =
+{
   0x2d, 0x72, 0x6f, 0x6d, 0x31, 0x66, 0x73, 0x2d, 0x00, 0x00, 0x02, 0x60,
   0x27, 0x43, 0x4a, 0x8a, 0x52, 0x4f, 0x4d, 0x46, 0x53, 0x5f, 0x54, 0x65,
   0x73, 0x74, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x49,
@@ -86,4 +87,5 @@ unsigned char testdir_img[] = {
   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
   0x00, 0x00, 0x00, 0x00
 };
+
 unsigned int testdir_img_len = 1024;

graphics/tiff/tiff_internal.h

@@ -114,7 +114,7 @@ extern "C"
  *
  ****************************************************************************/
 
-EXTERN ssize_t tiff_read(int fd, FAR void *buffer, size_t count);
+ssize_t tiff_read(int fd, FAR void *buffer, size_t count);
 
 /****************************************************************************
  * Name: tiff_write
@@ -132,7 +132,7 @@ EXTERN ssize_t tiff_read(int fd, FAR void *buffer, size_t count);
  *
  ****************************************************************************/
 
-EXTERN int tiff_write(int fd, FAR const void *buffer, size_t count);
+int tiff_write(int fd, FAR const void *buffer, size_t count);
 
 /****************************************************************************
  * Name: tiff_putint16
@@ -149,7 +149,7 @@ EXTERN int tiff_write(int fd, FAR const void *buffer, size_t count);
  *
  ****************************************************************************/
 
-EXTERN int tiff_putint16(int fd, uint16_t value);
+int tiff_putint16(int fd, uint16_t value);
 
 /****************************************************************************
  * Name: tiff_putint32
@@ -166,7 +166,7 @@ EXTERN int tiff_putint16(int fd, uint16_t value);
  *
  ****************************************************************************/
 
-EXTERN int tiff_putint32(int fd, uint32_t value);
+int tiff_putint32(int fd, uint32_t value);
 
 /****************************************************************************
  * Name: tiff_putstring
@@ -184,7 +184,7 @@ EXTERN int tiff_putint32(int fd, uint32_t value);
  *
  ****************************************************************************/
 
-EXTERN int tiff_putstring(int fd, FAR const char *string, int len);
+int tiff_putstring(int fd, FAR const char *string, int len);
 
 /****************************************************************************
  * Name: tiff_wordalign
@@ -201,7 +201,7 @@ EXTERN int tiff_putstring(int fd, FAR const char *string, int len);
  *
  ****************************************************************************/
 
-EXTERN ssize_t tiff_wordalign(int fd, size_t size);
+ssize_t tiff_wordalign(int fd, size_t size);
 
 #undef EXTERN
 #if defined(__cplusplus)
@@ -209,4 +209,3 @@ EXTERN ssize_t tiff_wordalign(int fd, size_t size);
 #endif
 
 #endif  /* __APPS_GRAPHICS_TIFF_TIFF_INTERNAL_H */
-

include/modbus/mb.h

@@ -237,6 +237,7 @@ eMBErrorCode eMBDisable(void);
  *   returns eMBErrorCode::MB_EILLSTATE. Otherwise it returns
  *   eMBErrorCode::MB_ENOERR.
  */
+
 eMBErrorCode eMBPoll(void);
 
 /* Configure the slave id of the device.
@@ -258,6 +259,7 @@ eMBErrorCode eMBPoll(void);
  *   is too small it returns eMBErrorCode::MB_ENORES. Otherwise
  *   it returns eMBErrorCode::MB_ENOERR.
  */
+
 eMBErrorCode eMBSetSlaveID(uint8_t ucSlaveID, bool xIsRunning,
                            uint8_t const *pucAdditional,
                            uint16_t usAdditionalLen);
@@ -283,6 +285,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,
                            pxMBFunctionHandler pxHandler);
 
@@ -326,6 +329,7 @@ eMBErrorCode eMBRegisterCB(uint8_t ucFunctionCode,
  *   - eMBErrorCode::MB_EIO If an unrecoverable error occurred. In this case
  *       a  SLAVE DEVICE FAILURE  exception is sent as a response.
  */
+
 eMBErrorCode eMBRegInputCB(uint8_t * pucRegBuffer, uint16_t usAddress,
                            uint16_t usNRegs);
 
@@ -361,6 +365,7 @@ eMBErrorCode eMBRegInputCB(uint8_t * pucRegBuffer, uint16_t usAddress,
  *   - eMBErrorCode::MB_EIO If an unrecoverable error occurred. In this case
  *       a  SLAVE DEVICE FAILURE  exception is sent as a response.
  */
+
 eMBErrorCode eMBRegHoldingCB(uint8_t * pucRegBuffer, uint16_t usAddress,
                              uint16_t usNRegs, eMBRegisterMode eMode);
 
@@ -397,6 +402,7 @@ eMBErrorCode eMBRegHoldingCB(uint8_t * pucRegBuffer, uint16_t usAddress,
  *   - eMBErrorCode::MB_EIO If an unrecoverable error occurred. In this case
  *       a  SLAVE DEVICE FAILURE  exception is sent as a response.
  */
+
 eMBErrorCode eMBRegCoilsCB(uint8_t *pucRegBuffer, uint16_t usAddress,
                            uint16_t usNCoils, eMBRegisterMode eMode);
 
@@ -428,6 +434,7 @@ eMBErrorCode eMBRegCoilsCB(uint8_t *pucRegBuffer, uint16_t usAddress,
  *   - eMBErrorCode::MB_EIO If an unrecoverable error occurred. In this case
  *       a  SLAVE DEVICE FAILURE  exception is sent as a response.
  */
+
 eMBErrorCode eMBRegDiscreteCB(uint8_t *pucRegBuffer, uint16_t usAddress,
                               uint16_t usNDiscrete);
 

interpreters/bas/bas_token.c

@@ -3626,6 +3626,7 @@ YY_RULE_SETUP
                         cur->statement=stmt_QUOTE_REM;
                         strcpy(cur->u.rem=malloc(strlen(yytext+1)+1),yytext+1);
                       } 
+
                     return T_QUOTE;
                   }
   YY_BREAK

interpreters/ficl/src/nuttx.c

@@ -26,10 +26,13 @@ void  ficlCallbackDefaultTextOut(ficlCallback *callback, char *message)
 {
   FICL_IGNORE(callback);
   if (message != NULL)
+    {
       fputs(message, stdout);
+    }
   else
+    {
       fflush(stdout);
-  return;
+    }
 }
 
 int ficlFileStatus(char *filename, int *status)
@@ -40,6 +43,7 @@ int ficlFileStatus(char *filename, int *status)
       *status = statbuf.st_mode;
       return 0;
     }
+
   *status = ENOENT;
   return -1;
 }
@@ -48,11 +52,15 @@ long ficlFileSize(ficlFile *ff)
 {
   struct stat statbuf;
   if (ff == NULL)
+    {
       return -1;
+    }
 
   statbuf.st_size = -1;
   if (fstat(fileno(ff->f), &statbuf) != 0)
+    {
       return -1;
+    }
 
   return statbuf.st_size;
 }
@@ -61,5 +69,3 @@ void ficlSystemCompilePlatform(ficlSystem *system)
 {
   return;
 }
-
-

netutils/ftpc/ftpc_transfer.c

@@ -322,9 +322,9 @@ int ftpc_xfrinit(FAR struct ftpc_session_s *session)
     }
   return OK;
 
- errout_with_data:
+errout_with_data:
   ftpc_sockclose(&session->data);
- errout:
+errout:
   return ERROR;
 }
 

nshlib/nsh_timcmds.c

@@ -338,6 +338,7 @@ int cmd_date(FAR struct nsh_vtbl_s *vtbl, int argc, char **argv)
     {
       ret = date_showtime(vtbl, argv[0]);
     }
+
   return ret;
 
 errout:

nshlib/nsh_usbconsole.c

@@ -63,7 +63,7 @@
  * Pre-processor Definitions
  ****************************************************************************/
 
- /****************************************************************************
+/****************************************************************************
  * Private Types
  ****************************************************************************/
 

nshlib/nsh_usbkeyboard.c

@@ -55,7 +55,7 @@
  * Pre-processor Definitions
  ****************************************************************************/
 
- /****************************************************************************
+/****************************************************************************
  * Private Types
  ****************************************************************************/
 

system/netdb/netdb_main.c

@@ -90,7 +90,7 @@ static void show_usage(FAR const char *progname, int exitcode)
   exit(exitcode);
 }
 
- /****************************************************************************
+/****************************************************************************
  * Public Functions
  ****************************************************************************/