This is an automated email from the ASF dual-hosted git repository.
pkarashchenko pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx-apps.git
The following commit(s) were added to refs/heads/master by this push:
new 893387b2c Fix the minor style issue
893387b2c is described below
commit 893387b2c590c4dda7eb0363ed67b0fbd5919b91
Author: Xiang Xiao <xiaoxi...@xiaomi.com>
AuthorDate: Sat Oct 8 16:31:21 2022 +0800
Fix the minor style issue
Signed-off-by: Xiang Xiao <xiaoxi...@xiaomi.com>
---
Makefile | 4 +-
audioutils/fmsynth/fmsynth_op.c | 2 +-
audioutils/fmsynth/test/fmsynth_alsa_test.c | 2 +-
examples/adxl372_test/adxl372_test_main.c | 8 +-
examples/apds9960/apds9960_main.c | 4 +-
examples/bridge/bridge_main.c | 14 +--
examples/bridge/host_main.c | 36 +++---
examples/camera/camera_main.c | 4 +-
examples/configdata/configdata_main.c | 4 +-
examples/elf/tests/helloxx/hello++5.cxx | 4 +-
examples/elf/tests/mutex/mutex.c | 4 +-
examples/foc/foc_main.c | 2 +-
examples/foc/foc_motor_b16.c | 2 +-
examples/foc/foc_motor_f32.c | 6 +-
examples/foc/foc_thr.c | 12 +-
examples/ft80x/ft80x_coprocessor.c | 2 +-
examples/mount/mount_main.c | 2 +-
examples/netloop/lo_listener.c | 6 +-
examples/nettest/nettest_server.c | 2 +-
examples/nrf24l01_btle/nrf24l01_btle.c | 2 +-
examples/nxdemo/nxdemo_bkgd.c | 2 +-
examples/nxflat/tests/mutex/mutex.c | 2 +-
examples/nxhello/nxhello_bkgd.c | 2 +-
examples/nximage/nximage_bitmap.c | 2 +-
examples/nximage/nximage_bkgd.c | 6 +-
examples/nxtext/nxtext_putc.c | 2 +-
examples/pdcurses/firework_main.c | 2 +-
examples/pdcurses/newdemo_main.c | 2 +-
examples/pipe/interlock_test.c | 11 +-
examples/pipe/redirect_test.c | 86 +++++++-------
examples/pipe/transfer_test.c | 26 ++---
examples/poll/host.c | 10 +-
examples/poll/net_listener.c | 47 +++++---
examples/pwfb/pwfb_main.c | 2 +-
examples/sotest/lib/modprint/modprint.c | 2 +-
examples/sotest/lib/sotest/sotest.c | 12 +-
examples/tcpblaster/README.md | 6 +-
examples/thttpd/content/Makefile.nxflat | 2 +-
examples/udp/udp_server.c | 2 +-
examples/usrsocktest/usrsocktest_block_recv.c | 3 +-
examples/usrsocktest/usrsocktest_block_send.c | 3 +-
examples/usrsocktest/usrsocktest_daemon.c | 4 +-
.../usrsocktest/usrsocktest_wake_with_signal.c | 16 +--
examples/ustream/ustream_client.c | 15 ++-
examples/ws2812/ws2812_main.c | 8 +-
examples/xmlrpc/xmlrpc_main.c | 2 +-
games/shift/shift_input_gesture.h | 2 +-
graphics/ft80x/ft80x_regs.c | 2 +-
graphics/nxwidgets/src/cmultilinetextbox.cxx | 2 +-
graphics/pdcurs34/pdcurses/pdc_panel.c | 2 +-
graphics/pdcurs34/pdcurses/pdc_terminfo.c | 2 +-
graphics/twm4nx/src/ciconmgr.cxx | 2 +-
include/audioutils/fmsynth_op.h | 2 +-
include/graphics/nxwidgets/crlepalettebitmap.hxx | 12 +-
include/graphics/nxwm/ccalibration.hxx | 4 +-
include/graphics/nxwm/cnxterm.hxx | 10 +-
include/graphics/tiff.h | 13 ++-
include/wireless/ieee802154.h | 2 +-
netutils/chat/chat.c | 2 +-
netutils/codecs/md5.c | 2 +-
netutils/discover/discover.c | 11 +-
netutils/esp8266/esp8266.c | 2 +-
netutils/libcurl4nx/curl4nx_easy_perform.c | 8 +-
netutils/libcurl4nx/curl4nx_private.h | 10 +-
netutils/netcat/netcat_main.c | 2 +-
netutils/netinit/netinit.c | 10 +-
netutils/ntpclient/ntpclient.c | 2 +-
netutils/pppd/ahdlc.c | 40 +++----
netutils/pppd/ipcp.c | 86 +++++++-------
netutils/pppd/ppp.c | 2 +-
netutils/telnetc/telnetc.c | 52 +++++----
netutils/thttpd/cgi-src/redirect.c | 2 +-
netutils/thttpd/cgi-src/ssi.c | 125 ++++++++++++---------
netutils/thttpd/libhttpd.c | 28 ++---
netutils/thttpd/thttpd.c | 6 +-
netutils/usrsock_rpmsg/usrsock_rpmsg_client.c | 2 +-
netutils/usrsock_rpmsg/usrsock_rpmsg_server.c | 2 +-
netutils/wakeonlan/wol_main.c | 2 +-
netutils/webclient/webclient.c | 6 +-
netutils/xmlrpc/xmlparser.c | 2 +-
nshlib/nsh_console.c | 8 +-
nshlib/nsh_console.h | 12 +-
nshlib/nsh_romfsetc.c | 2 +-
nshlib/nsh_telnetlogin.c | 4 +-
nshlib/nsh_test.c | 2 +-
platform/mikroe-stm32f4/mikroe_configdata.c | 12 +-
system/cfgdata/cfgdata_main.c | 38 +++----
system/i2c/i2ctool.h | 4 +-
system/nxlooper/nxlooper.c | 2 +-
system/nxplayer/nxplayer.c | 58 +++++-----
system/nxplayer/nxplayer_main.c | 2 +-
system/nxrecorder/nxrecorder.c | 35 +++---
system/popen/popen.c | 2 +-
system/spi/spi_exch.c | 2 +-
system/spi/spi_main.c | 4 +-
system/spi/spitool.h | 4 +-
system/termcurses/tcurses_vt100.c | 50 ++++-----
system/termcurses/termcurses.c | 16 +--
system/zmodem/host/crc16.c | 3 +-
system/zmodem/zm_receive.c | 4 +-
system/zmodem/zm_send.c | 4 +-
testing/ostest/pthread_cleanup.c | 8 +-
testing/ostest/pthread_rwlock.c | 8 +-
testing/ostest/pthread_rwlock_cancel.c | 4 +-
testing/ostest/timedmqueue.c | 4 +-
testing/smart_test/smart_test.c | 12 +-
tools/check-hash.sh | 4 +-
wireless/bluetooth/btsak/Makefile | 2 +-
wireless/ieee802154/i8sak/Makefile | 2 +-
wireless/ieee802154/i8sak/i8sak_events.c | 3 +-
wireless/ieee802154/i8sak/i8sak_main.c | 4 +-
wireless/ieee802154/libmac/sixlowpan_getreq.c | 4 +-
112 files changed, 605 insertions(+), 576 deletions(-)
diff --git a/Makefile b/Makefile
index beae68005..3f3d002bb 100644
--- a/Makefile
+++ b/Makefile
@@ -187,13 +187,13 @@ clean: $(foreach SDIR, $(CLEANDIRS), $(SDIR)_clean)
distclean: $(foreach SDIR, $(CLEANDIRS), $(SDIR)_distclean)
ifeq ($(CONFIG_WINDOWS_NATIVE),y)
- $(Q) ( if exist external ( \
+ $(Q) (if exist external ( \
echo ********************************************************" \
echo * The external directory/link must be removed manually *" \
echo ********************************************************" \
)
else
- $(Q) ( if [ -e external ]; then \
+ $(Q) (if [ -e external ]; then \
echo
"********************************************************"; \
echo "* The external directory/link must be removed manually
*"; \
echo
"********************************************************"; \
diff --git a/audioutils/fmsynth/fmsynth_op.c b/audioutils/fmsynth/fmsynth_op.c
index 3f5fda521..6bb200cd9 100644
--- a/audioutils/fmsynth/fmsynth_op.c
+++ b/audioutils/fmsynth/fmsynth_op.c
@@ -30,7 +30,7 @@
****************************************************************************/
#define PHASE_ADJUST(th) \
- ( ((th) < 0 ? (FMSYNTH_PI) - (th) : (th)) % (FMSYNTH_PI * 2) )
+ (((th) < 0 ? (FMSYNTH_PI) - (th) : (th)) % (FMSYNTH_PI * 2))
/****************************************************************************
* Private Data
diff --git a/audioutils/fmsynth/test/fmsynth_alsa_test.c
b/audioutils/fmsynth/test/fmsynth_alsa_test.c
index 1de8fcb3c..73e0b22dc 100644
--- a/audioutils/fmsynth/test/fmsynth_alsa_test.c
+++ b/audioutils/fmsynth/test/fmsynth_alsa_test.c
@@ -307,7 +307,7 @@ int main(void)
dump_count -= SAMPLE_NUM;
}
- snd_pcm_writei(hndl, (const void *)samples, SAMPLE_NUM);
+ snd_pcm_writei(hndl, samples, SAMPLE_NUM);
}
snd_pcm_drain(hndl);
diff --git a/examples/adxl372_test/adxl372_test_main.c
b/examples/adxl372_test/adxl372_test_main.c
index 4ebefb23b..e30155945 100644
--- a/examples/adxl372_test/adxl372_test_main.c
+++ b/examples/adxl372_test/adxl372_test_main.c
@@ -147,7 +147,7 @@ static int adxl372_test(int is_interactive, FAR char *path)
};
char bfr[32] __attribute__((aligned(2))); /* REVISIT: GCC dependent
attribute */
- FAR struct XYZ *pxyz = (FAR struct XYZ *) bfr;
+ FAR struct XYZ *pxyz = (FAR struct XYZ *)bfr;
int rc = PASSED;
int rc_step = PASSED;
@@ -335,11 +335,11 @@ static int adxl372_test(int is_interactive, FAR char
*path)
goto error_exit;
}
- printf("ADXL372 = ( %6d, %6d, %6d))\n",
+ printf("ADXL372 = (%6d, %6d, %6d))\n",
pxyz->d[0], pxyz->d[1], pxyz->d[2]);
- printf("ADXL372 = ( 0x%04X, 0x%04X, 0x%04X)\n",
+ printf("ADXL372 = (0x%04X, 0x%04X, 0x%04X)\n",
pxyz->d[0], pxyz->d[1], pxyz->d[2]);
- printf("ADXL372 raw = ( 0x%02X%02X, 0x%02X%02X, 0x%02X%02X)\n",
+ printf("ADXL372 raw = (0x%02X%02X, 0x%02X%02X, 0x%02X%02X)\n",
bfr[1], bfr[0], bfr[3], bfr[2], bfr[5], bfr[4]);
if (is_interactive)
diff --git a/examples/apds9960/apds9960_main.c
b/examples/apds9960/apds9960_main.c
index a4cc30999..24963fe1c 100644
--- a/examples/apds9960/apds9960_main.c
+++ b/examples/apds9960/apds9960_main.c
@@ -53,7 +53,7 @@ int main(int argc, FAR char *argv[])
int nbytes;
char gest;
- fd = open(CONFIG_EXAMPLES_APDS9960_DEVNAME, O_RDONLY|O_NONBLOCK);
+ fd = open(CONFIG_EXAMPLES_APDS9960_DEVNAME, O_RDONLY | O_NONBLOCK);
if (fd < 0)
{
int errcode = errno;
@@ -64,7 +64,7 @@ int main(int argc, FAR char *argv[])
while (1)
{
- nbytes = read(fd, (void *)&gest, sizeof(gest));
+ nbytes = read(fd, &gest, sizeof(gest));
if (nbytes == 1)
{
switch (gest)
diff --git a/examples/bridge/bridge_main.c b/examples/bridge/bridge_main.c
index 948ef8d42..7eb932c2b 100644
--- a/examples/bridge/bridge_main.c
+++ b/examples/bridge/bridge_main.c
@@ -358,8 +358,8 @@ static int bridge_net1_worker(int argc, char *argv[])
/* Set socket to reuse address */
optval = 1;
- if (setsockopt(recvsd, SOL_SOCKET, SO_REUSEADDR, (void *)&optval,
- sizeof(int)) < 0)
+ if (setsockopt(recvsd, SOL_SOCKET, SO_REUSEADDR,
+ &optval, sizeof(int)) < 0)
{
fprintf(stderr, "NET1 ERROR: setsockopt SO_REUSEADDR failure: %d\n",
errno);
@@ -399,8 +399,8 @@ static int bridge_net1_worker(int argc, char *argv[])
/* Set socket to reuse address */
optval = 1;
- if (setsockopt(sndsd, SOL_SOCKET, SO_REUSEADDR, (void *)&optval,
- sizeof(int)) < 0)
+ if (setsockopt(sndsd, SOL_SOCKET, SO_REUSEADDR,
+ &optval, sizeof(int)) < 0)
{
fprintf(stderr, "NET1 ERROR: setsockopt SO_REUSEADDR failure: %d\n",
errno);
@@ -549,8 +549,8 @@ static int bridge_net2_worker(int argc, char *argv[])
/* Set socket to reuse address */
optval = 1;
- if (setsockopt(recvsd, SOL_SOCKET, SO_REUSEADDR, (void *)&optval,
- sizeof(int)) < 0)
+ if (setsockopt(recvsd, SOL_SOCKET, SO_REUSEADDR,
+ &optval, sizeof(int)) < 0)
{
fprintf(stderr, "NET2 ERROR: setsockopt SO_REUSEADDR failure: %d\n",
errno);
@@ -590,7 +590,7 @@ static int bridge_net2_worker(int argc, char *argv[])
/* Set socket to reuse address */
optval = 1;
- if (setsockopt(sndsd, SOL_SOCKET, SO_REUSEADDR, (void *)&optval,
+ if (setsockopt(sndsd, SOL_SOCKET, SO_REUSEADDR, &optval,
sizeof(int)) < 0)
{
fprintf(stderr, "NET2 ERROR: setsockopt SO_REUSEADDR failure: %d\n",
diff --git a/examples/bridge/host_main.c b/examples/bridge/host_main.c
index 29705397e..febb75081 100644
--- a/examples/bridge/host_main.c
+++ b/examples/bridge/host_main.c
@@ -80,16 +80,18 @@ int main(int argc, char *argv[])
sndsd = socket(PF_INET, SOCK_DGRAM, 0);
if (sndsd < 0)
{
- fprintf(stderr, LABEL "ERROR: Failed to create send socket: %d\n",
errno);
+ fprintf(stderr, LABEL "ERROR: Failed to create send socket: %d\n",
+ errno);
return EXIT_FAILURE;
}
/* Set socket to reuse address */
optval = 1;
- if (setsockopt(sndsd, SOL_SOCKET, SO_REUSEADDR, (void*)&optval, sizeof(int))
< 0)
+ if (setsockopt(sndsd, SOL_SOCKET, SO_REUSEADDR, &optval, sizeof(int)) < 0)
{
- fprintf(stderr, LABEL "ERROR: setsockopt SO_REUSEADDR failure: %d\n",
errno);
+ fprintf(stderr,
+ LABEL "ERROR: setsockopt SO_REUSEADDR failure: %d\n", errno);
goto errout_with_sendsd;
}
@@ -99,7 +101,8 @@ int main(int argc, char *argv[])
sender.sin_port = 0;
sender.sin_addr.s_addr = htonl(EXAMPLES_BRIDGE_SEND_IPHOST);
- if (bind(sndsd, (struct sockaddr*)&sender, sizeof(struct sockaddr_in)) < 0)
+ if (bind(sndsd, (struct sockaddr *)&sender,
+ sizeof(struct sockaddr_in)) < 0)
{
printf(LABEL "bind failure: %d\n", errno);
goto errout_with_sendsd;
@@ -113,16 +116,18 @@ int main(int argc, char *argv[])
recvsd = socket(PF_INET, SOCK_DGRAM, 0);
if (recvsd < 0)
{
- fprintf(stderr, LABEL "ERROR: Failed to create receive socket: %d\n",
errno);
+ fprintf(stderr,
+ LABEL "ERROR: Failed to create receive socket: %d\n", errno);
goto errout_with_sendsd;
}
/* Set socket to reuse address */
optval = 1;
- if (setsockopt(recvsd, SOL_SOCKET, SO_REUSEADDR, (void*)&optval,
sizeof(int)) < 0)
+ if (setsockopt(recvsd, SOL_SOCKET, SO_REUSEADDR, &optval, sizeof(int)) < 0)
{
- fprintf(stderr, LABEL "ERROR: setsockopt SO_REUSEADDR failure: %d\n",
errno);
+ fprintf(stderr,
+ LABEL "ERROR: setsockopt SO_REUSEADDR failure: %d\n", errno);
goto errout_with_recvsd;
}
@@ -132,7 +137,8 @@ int main(int argc, char *argv[])
receiver.sin_port = htons(EXAMPLES_BRIDGE_SEND_HOSTPORT);
receiver.sin_addr.s_addr = htonl(EXAMPLES_BRIDGE_RECV_IPHOST);
- if (bind(recvsd, (struct sockaddr*)&receiver, sizeof(struct sockaddr_in)) <
0)
+ if (bind(recvsd, (struct sockaddr *)&receiver,
+ sizeof(struct sockaddr_in)) < 0)
{
fprintf(stderr, LABEL "ERROR: bind failure: %d\n", errno);
goto errout_with_recvsd;
@@ -148,8 +154,8 @@ int main(int argc, char *argv[])
toaddr.sin_port = htons(EXAMPLES_BRIDGE_RECV_RECVPORT);
toaddr.sin_addr.s_addr = htonl(EXAMPLES_BRIDGE_RECV_IPADDR);
- nsent = sendto(sndsd, g_sndmessage, sizeof(g_sndmessage), 0,
- (struct sockaddr*)&toaddr, sizeof(struct sockaddr_in));
+ nsent = sendto(sndsd, g_sndmessage, sizeof(g_sndmessage), 0,
+ (struct sockaddr *)&toaddr, sizeof(struct sockaddr_in));
/* Check for send errors */
@@ -173,7 +179,7 @@ int main(int argc, char *argv[])
addrlen = sizeof(struct sockaddr_in);
nrecvd = recvfrom(recvsd, g_rdbuffer, EXAMPLES_BRIDGE_SEND_IOBUFIZE, 0,
- (struct sockaddr*)&fromaddr, &addrlen);
+ (struct sockaddr *)&fromaddr, &addrlen);
tmpaddr = ntohl(fromaddr.sin_addr.s_addr);
printf(LABEL "Received %ld bytes from %d.%d.%d.%d:%d\n",
@@ -207,7 +213,7 @@ int main(int argc, char *argv[])
for (i = 0, j = 0; i < nrecvd; i++)
{
- if ( g_rdbuffer[i] == ' ' && j >= 64)
+ if (g_rdbuffer[i] == ' ' && j >= 64)
{
putchar('\n');
j = 0;
@@ -234,8 +240,8 @@ int main(int argc, char *argv[])
return EXIT_SUCCESS;
errout_with_recvsd:
- close(recvsd);
+ close(recvsd);
errout_with_sendsd:
- close(sndsd);
- return EXIT_FAILURE;
+ close(sndsd);
+ return EXIT_FAILURE;
}
diff --git a/examples/camera/camera_main.c b/examples/camera/camera_main.c
index 54c6ab5b5..3a9bf1291 100644
--- a/examples/camera/camera_main.c
+++ b/examples/camera/camera_main.c
@@ -84,7 +84,7 @@ static int camera_prepare(int fd, enum v4l2_buf_type type,
uint16_t hsize, uint16_t vsize,
struct v_buffer **vbuf,
uint8_t buffernum, int buffersize);
-static void free_buffer(struct v_buffer *buffers, uint8_t bufnum);
+static void free_buffer(struct v_buffer *buffers, uint8_t bufnum);
static int parse_arguments(int argc, char *argv[],
int *capture_num, enum v4l2_buf_type *type);
static int get_camimage(int fd, struct v4l2_buffer *v4l2_buf,
@@ -246,7 +246,7 @@ static int camera_prepare(int fd, enum v4l2_buf_type type,
* All free allocated memory of v_buffer.
****************************************************************************/
-static void free_buffer(struct v_buffer *buffers, uint8_t bufnum)
+static void free_buffer(struct v_buffer *buffers, uint8_t bufnum)
{
uint8_t cnt;
if (buffers)
diff --git a/examples/configdata/configdata_main.c
b/examples/configdata/configdata_main.c
index a90118f25..128e03f47 100644
--- a/examples/configdata/configdata_main.c
+++ b/examples/configdata/configdata_main.c
@@ -302,7 +302,7 @@ static inline int
config.instance = entry->instance;
config.len = entry->len;
config.configdata = g_entryimage;
- ret = ioctl(g_fd, CFGDIOC_SETCONFIG, (unsigned long) &config);
+ ret = ioctl(g_fd, CFGDIOC_SETCONFIG, (unsigned long)&config);
if (ret < 0)
{
entry->id = 0;
@@ -368,7 +368,7 @@ static inline int
config.instance = entry->instance;
config.len = entry->len;
config.configdata = g_entryimage;
- ret = ioctl(g_fd, CFGDIOC_GETCONFIG, (unsigned long) &config);
+ ret = ioctl(g_fd, CFGDIOC_GETCONFIG, (unsigned long)&config);
if (ret < 0)
{
return ERROR;
diff --git a/examples/elf/tests/helloxx/hello++5.cxx
b/examples/elf/tests/helloxx/hello++5.cxx
index 153d05c3f..8a7a3ca28 100644
--- a/examples/elf/tests/helloxx/hello++5.cxx
+++ b/examples/elf/tests/helloxx/hello++5.cxx
@@ -89,7 +89,7 @@ static CThingSayer MyThingSayer;
MyException::MyException(std::string r = NULL) : reason(r)
{
- if( r.length() > 0 )
+ if(r.length() > 0)
{
cout << "MyException(" << r << "): constructing with reason." << endl;
}
@@ -154,7 +154,7 @@ void CThingSayer::ThrowThing(void)
void CThingSayer::ThrowMyThing(const char *czSayThis = NULL)
{
cout << "CThingSayer::ThrowMyThing: I am now throwing an MyException (with
reason)." << endl;
- throw MyException( string(czSayThis) );
+ throw MyException(tring(czSayThis));
}
/////////////////////////////////////////////////////////////////////////////
diff --git a/examples/elf/tests/mutex/mutex.c b/examples/elf/tests/mutex/mutex.c
index 752941cac..714dc94c6 100644
--- a/examples/elf/tests/mutex/mutex.c
+++ b/examples/elf/tests/mutex/mutex.c
@@ -42,7 +42,7 @@ static volatile bool bendoftest;
* Private Functions
****************************************************************************/
-/* NOTE: it is necessary for functions that are referred to by function
pointers
+/* NOTE: it is necessary for functions that are referred to by function
* pointer to be declared with global scope (at least for ARM). Otherwise,
* a relocation type that is not supported by ELF is generated by GCC.
*/
@@ -103,7 +103,7 @@ int main(int argc, char **argv)
printf("Starting thread 1\n");
bendoftest = false;
- if ((pthread_create(&thread1, NULL, (void*)thread_func, (void*)1)) != 0)
+ if ((pthread_create(&thread1, NULL, (void *)thread_func, (void *)1)) != 0)
{
fprintf(stderr, "Error in thread#1 creation\n");
}
diff --git a/examples/foc/foc_main.c b/examples/foc/foc_main.c
index a675ccd58..1bbbabbc2 100644
--- a/examples/foc/foc_main.c
+++ b/examples/foc/foc_main.c
@@ -217,7 +217,7 @@ static int foc_mq_send(mqd_t mqd, uint8_t msg, FAR void
*data)
/* Data max 4B */
- tmp = *((FAR uint32_t *) data);
+ tmp = *((FAR uint32_t *)data);
buffer[0] = msg;
buffer[1] = ((tmp & 0x000000ff) >> 0);
diff --git a/examples/foc/foc_motor_b16.c b/examples/foc/foc_motor_b16.c
index 503ac6167..a3996f6d1 100644
--- a/examples/foc/foc_motor_b16.c
+++ b/examples/foc/foc_motor_b16.c
@@ -948,7 +948,7 @@ int foc_motor_init(FAR struct foc_motor_b16_s *motor,
/* Initialize motor alignment data */
align_cfg.volt = ftob16(CONFIG_EXAMPLES_FOC_ALIGN_VOLT / 1000.0f);
- align_cfg.offset_steps = (CONFIG_EXAMPLES_FOC_NOTIFIER_FREQ * \
+ align_cfg.offset_steps = (CONFIG_EXAMPLES_FOC_NOTIFIER_FREQ * \
CONFIG_EXAMPLES_FOC_ALIGN_SEC / 1000);
/* Connect align callbacks */
diff --git a/examples/foc/foc_motor_f32.c b/examples/foc/foc_motor_f32.c
index 3cf39e923..6c9b54374 100644
--- a/examples/foc/foc_motor_f32.c
+++ b/examples/foc/foc_motor_f32.c
@@ -932,7 +932,7 @@ int foc_motor_init(FAR struct foc_motor_f32_s *motor,
/* Initialize motor alignment data */
align_cfg.volt = (CONFIG_EXAMPLES_FOC_ALIGN_VOLT / 1000.0f);
- align_cfg.offset_steps = (CONFIG_EXAMPLES_FOC_NOTIFIER_FREQ * \
+ align_cfg.offset_steps = (CONFIG_EXAMPLES_FOC_NOTIFIER_FREQ * \
CONFIG_EXAMPLES_FOC_ALIGN_SEC / 1000);
/* Connect align callbacks */
@@ -973,9 +973,9 @@ int foc_motor_init(FAR struct foc_motor_f32_s *motor,
ident_cfg.per = motor->per;
ident_cfg.res_current = (CONFIG_EXAMPLES_FOC_IDENT_RES_CURRENT / 1000.0f);
ident_cfg.ind_volt = (CONFIG_EXAMPLES_FOC_IDENT_IND_VOLTAGE / 1000.0f);
- ident_cfg.res_steps = (CONFIG_EXAMPLES_FOC_NOTIFIER_FREQ * \
+ ident_cfg.res_steps = (CONFIG_EXAMPLES_FOC_NOTIFIER_FREQ * \
CONFIG_EXAMPLES_FOC_IDENT_RES_SEC / 1000);
- ident_cfg.ind_steps = (CONFIG_EXAMPLES_FOC_NOTIFIER_FREQ * \
+ ident_cfg.ind_steps = (CONFIG_EXAMPLES_FOC_NOTIFIER_FREQ * \
CONFIG_EXAMPLES_FOC_IDENT_IND_SEC / 1000);
ident_cfg.idle_steps = CONFIG_EXAMPLES_FOC_IDENT_IDLE;
diff --git a/examples/foc/foc_thr.c b/examples/foc/foc_thr.c
index a510e8297..11cb71711 100644
--- a/examples/foc/foc_thr.c
+++ b/examples/foc/foc_thr.c
@@ -69,7 +69,7 @@ static int g_fixed16_thr_cntr = 0;
static FAR void *foc_control_thr(FAR void *arg)
{
- FAR struct foc_ctrl_env_s *envp = (FAR struct foc_ctrl_env_s *) arg;
+ FAR struct foc_ctrl_env_s *envp = (FAR struct foc_ctrl_env_s *)arg;
char buffer[CONTROL_MQ_MSGSIZE];
char mqname[10];
int ret = OK;
@@ -276,11 +276,11 @@ bool foc_threads_terminated(void)
int foc_ctrlthr_init(FAR struct foc_ctrl_env_s *foc, int i, FAR mqd_t *mqd,
FAR pthread_t *thread)
{
- char mqname[10];
- int ret = OK;
- pthread_attr_t attr;
- struct mq_attr mqattr;
- struct sched_param param;
+ char mqname[10];
+ int ret = OK;
+ pthread_attr_t attr;
+ struct mq_attr mqattr;
+ struct sched_param param;
DEBUGASSERT(foc);
DEBUGASSERT(mqd);
diff --git a/examples/ft80x/ft80x_coprocessor.c
b/examples/ft80x/ft80x_coprocessor.c
index d9caba6ba..1e56f0a88 100644
--- a/examples/ft80x/ft80x_coprocessor.c
+++ b/examples/ft80x/ft80x_coprocessor.c
@@ -2066,7 +2066,7 @@ int ft80x_coproc_interactive(int fd, FAR struct
ft80x_dlbuffer_s *buffer)
cmds.e.button.cmd = FT80X_CMD_BUTTON;
cmds.e.button.x = ydist;
cmds.e.button.y = yoffset;
- cmds.e.button.w = 10 *width;
+ cmds.e.button.w = 10 * width;
cmds.e.button.h = height;
cmds.e.button.font = fontid;
diff --git a/examples/mount/mount_main.c b/examples/mount/mount_main.c
index 510e5bb9d..f31dc181b 100644
--- a/examples/mount/mount_main.c
+++ b/examples/mount/mount_main.c
@@ -599,7 +599,7 @@ static void succeed_stat(const char *path)
int main(int argc, FAR char *argv[])
{
- int ret;
+ int ret;
#ifndef CONFIG_EXAMPLES_MOUNT_DEVNAME
/* Create a RAM disk for the test */
diff --git a/examples/netloop/lo_listener.c b/examples/netloop/lo_listener.c
index e1d2831d7..f10eb1cda 100644
--- a/examples/netloop/lo_listener.c
+++ b/examples/netloop/lo_listener.c
@@ -85,7 +85,9 @@ static bool net_closeclient(struct net_listener_s *nls, int
sd)
close(sd);
FD_CLR(sd, &nls->master);
- /* If we just closed the max SD, then search downward for the next biggest
SD. */
+ /* If we just closed the max SD, then search downward for the next
+ * biggest SD.
+ */
while (FD_ISSET(nls->mxsd, &nls->master) == false)
{
@@ -297,7 +299,7 @@ void *lo_listener(pthread_addr_t pvarg)
memset(&nls, 0, sizeof(struct net_listener_s));
if (!net_mksocket(&nls))
{
- return (void*)1;
+ return (void *)(uintptr_t)1;
}
/* Initialize the 'master' file descriptor set */
diff --git a/examples/nettest/nettest_server.c
b/examples/nettest/nettest_server.c
index aa2dd1ba1..1710af57b 100644
--- a/examples/nettest/nettest_server.c
+++ b/examples/nettest/nettest_server.c
@@ -87,7 +87,7 @@ void nettest_server(void)
optval = 1;
if (setsockopt(listensd, SOL_SOCKET, SO_REUSEADDR,
- (void *)&optval, sizeof(int)) < 0)
+ &optval, sizeof(int)) < 0)
{
printf("server: setsockopt SO_REUSEADDR failure: %d\n", errno);
goto errout_with_listensd;
diff --git a/examples/nrf24l01_btle/nrf24l01_btle.c
b/examples/nrf24l01_btle/nrf24l01_btle.c
index 49142cac1..9616a9a2f 100644
--- a/examples/nrf24l01_btle/nrf24l01_btle.c
+++ b/examples/nrf24l01_btle/nrf24l01_btle.c
@@ -468,7 +468,7 @@ static void adv_packet(int wl_fd)
FAR void *advertise(FAR void *arg)
{
- uint32_t wl_fd = *(uint32_t *)arg;
+ uint32_t wl_fd = *(FAR uint32_t *)arg;
while (!quit)
{
if (current == 2)
diff --git a/examples/nxdemo/nxdemo_bkgd.c b/examples/nxdemo/nxdemo_bkgd.c
index 7d93e2f8f..f94ed1e67 100644
--- a/examples/nxdemo/nxdemo_bkgd.c
+++ b/examples/nxdemo/nxdemo_bkgd.c
@@ -476,7 +476,7 @@ static void nxdemo_demo_4(NXWINDOW hwnd)
origin.x = 0;
origin.y = 0;
- src[0] = (FAR const void *)g_battery;
+ src[0] = g_battery;
ret = nx_bitmap((NXWINDOW)hwnd,
&rect,
diff --git a/examples/nxflat/tests/mutex/mutex.c
b/examples/nxflat/tests/mutex/mutex.c
index 9ca14fc3b..bbf7102c9 100644
--- a/examples/nxflat/tests/mutex/mutex.c
+++ b/examples/nxflat/tests/mutex/mutex.c
@@ -103,7 +103,7 @@ int main(int argc, char **argv)
printf("Starting thread 1\n");
bendoftest = false;
- if ((pthread_create(&thread1, NULL, (void*)thread_func, (void*)1)) != 0)
+ if ((pthread_create(&thread1, NULL, (void*)thread_func, (void *)1)) != 0)
{
fprintf(stderr, "Error in thread#1 creation\n");
}
diff --git a/examples/nxhello/nxhello_bkgd.c b/examples/nxhello/nxhello_bkgd.c
index 1a18925ca..3c224a398 100644
--- a/examples/nxhello/nxhello_bkgd.c
+++ b/examples/nxhello/nxhello_bkgd.c
@@ -399,7 +399,7 @@ void nxhello_hello(NXWINDOW hwnd)
/* Then put the font on the display */
- src[0] = (FAR const void *)glyph;
+ src[0] = glyph;
#if CONFIG_NX_NPLANES > 1
# warning "More logic is needed for the case where CONFIG_NX_PLANES > 1"
#endif
diff --git a/examples/nximage/nximage_bitmap.c
b/examples/nximage/nximage_bitmap.c
index 34d0bce18..16b339fea 100644
--- a/examples/nximage/nximage_bitmap.c
+++ b/examples/nximage/nximage_bitmap.c
@@ -3692,5 +3692,5 @@ void nximage_blitrow(FAR nxgl_mxpixel_t *run, FAR const
void **state)
/* Save the start of the next row and return success */
- *state = (FAR const void *)pos;
+ *state = pos;
}
diff --git a/examples/nximage/nximage_bkgd.c b/examples/nximage/nximage_bkgd.c
index f63ef144f..953d3f033 100644
--- a/examples/nximage/nximage_bkgd.c
+++ b/examples/nximage/nximage_bkgd.c
@@ -300,7 +300,7 @@ void nximage_image(NXWINDOW hwnd)
dest.pt1.y = pos.y;
dest.pt2.y = pos.y;
- src[0] = (FAR const void *)g_runs[0].run;
+ src[0] = g_runs[0].run;
#if CONFIG_NX_NPLANES > 1
# warning "More logic is needed for the case where CONFIG_NX_PLANES > 1"
#endif
@@ -342,7 +342,7 @@ void nximage_image(NXWINDOW hwnd)
dest.pt1.y = pos.y;
dest.pt2.y = pos.y;
- src[0] = (FAR const void *)g_runs[0].run;
+ src[0] = g_runs[0].run;
#if CONFIG_NX_NPLANES > 1
# warning "More logic is needed for the case where CONFIG_NX_PLANES > 1"
#endif
@@ -363,7 +363,7 @@ void nximage_image(NXWINDOW hwnd)
dest.pt1.y = pos.y;
dest.pt2.y = pos.y;
- src[0] = (FAR const void *)g_runs[1].run;
+ src[0] = g_runs[1].run;
#if CONFIG_NX_NPLANES > 1
# warning "More logic is needed for the case where CONFIG_NX_PLANES > 1"
#endif
diff --git a/examples/nxtext/nxtext_putc.c b/examples/nxtext/nxtext_putc.c
index b2727270f..93c8ca402 100644
--- a/examples/nxtext/nxtext_putc.c
+++ b/examples/nxtext/nxtext_putc.c
@@ -570,7 +570,7 @@ void nxtext_fillchar(NXWINDOW hwnd, FAR const struct
nxgl_rect_s *rect,
/* Blit the font bitmap into the window */
- src = (FAR const void *)glyph->bitmap;
+ src = glyph->bitmap;
ret = nx_bitmap((NXWINDOW)hwnd, &intersection, &src,
&bm->pos, (unsigned int)glyph->stride);
if (ret < 0)
diff --git a/examples/pdcurses/firework_main.c
b/examples/pdcurses/firework_main.c
index 7fe718ae3..b7c17992e 100644
--- a/examples/pdcurses/firework_main.c
+++ b/examples/pdcurses/firework_main.c
@@ -161,7 +161,7 @@ int main(int argc, FAR char *argv[])
init_pair(i, color_table[i], COLOR_BLACK);
}
- seed = time((time_t *) 0);
+ seed = time(NULL);
srand(seed);
flag = 0;
diff --git a/examples/pdcurses/newdemo_main.c b/examples/pdcurses/newdemo_main.c
index 1e34c9f01..962515d7a 100644
--- a/examples/pdcurses/newdemo_main.c
+++ b/examples/pdcurses/newdemo_main.c
@@ -303,7 +303,7 @@ int main(int argc, FAR char *argv[])
traceon();
initscr();
- seed = time((time_t *) 0);
+ seed = time(NULL);
srand(seed);
start_color();
diff --git a/examples/pipe/interlock_test.c b/examples/pipe/interlock_test.c
index 02c60b02d..9a7eabcc9 100644
--- a/examples/pipe/interlock_test.c
+++ b/examples/pipe/interlock_test.c
@@ -57,7 +57,6 @@
static void *null_writer(pthread_addr_t pvarg)
{
int fd;
- void *p;
/* Wait a bit */
@@ -73,8 +72,7 @@ static void *null_writer(pthread_addr_t pvarg)
fprintf(stderr, \
"null_writer: Failed to open FIFO %s for writing, errno=%d\n",
FIFO_PATH2, errno);
- p = (void *) 1;
- return p;
+ return (void *)(uintptr_t)1;
}
/* Wait a bit more */
@@ -93,8 +91,7 @@ static void *null_writer(pthread_addr_t pvarg)
sleep(5);
printf("null_writer: Returning success\n");
- p = (void *) 0;
- return p;
+ return NULL;
}
/****************************************************************************
@@ -113,7 +110,6 @@ int interlock_test(void)
ssize_t nbytes;
int fd;
int ret;
- void *p;
/* Create a FIFO */
@@ -202,8 +198,7 @@ int interlock_test(void)
else
{
printf("interlock_test: writer returned %p\n", value);
- p = (void *) 0;
- if (value != p)
+ if (value != NULL)
{
ret = 7;
goto errout_with_fifo;
diff --git a/examples/pipe/redirect_test.c b/examples/pipe/redirect_test.c
index 5e1dbb256..210894344 100644
--- a/examples/pipe/redirect_test.c
+++ b/examples/pipe/redirect_test.c
@@ -73,9 +73,9 @@ static int redirect_reader(int argc, char *argv[])
ret = close(fdout);
if (ret != 0)
{
- fprintf(stderr, "redirect_reader: failed to close fdout=%d\n",
- fdout);
- return 1;
+ fprintf(stderr, "redirect_reader: failed to close fdout=%d\n",
+ fdout);
+ return 1;
}
/* Re-direct the fdin to stdin */
@@ -83,9 +83,9 @@ static int redirect_reader(int argc, char *argv[])
ret = dup2(fdin, 0);
if (ret != 0)
{
- fprintf(stderr, "redirect_reader: dup2 failed: %d\n", errno);
- close(fdin);
- return 2;
+ fprintf(stderr, "redirect_reader: dup2 failed: %d\n", errno);
+ close(fdin);
+ return 2;
}
/* Close the original file descriptor */
@@ -93,23 +93,23 @@ static int redirect_reader(int argc, char *argv[])
ret = close(fdin);
if (ret != 0)
{
- fprintf(stderr, "redirect_reader: failed to close fdin=%d\n", fdin);
- return 3;
+ fprintf(stderr, "redirect_reader: failed to close fdin=%d\n", fdin);
+ return 3;
}
/* Then read from stdin until we hit the end of file */
fflush(stdout);
- for (;;)
+ for (; ; )
{
/* Read from stdin */
ret = read(0, buffer, READ_SIZE);
- if (ret < 0 )
+ if (ret < 0)
{
- fprintf(stderr, "redirect_reader: read failed, errno=%d\n",
- errno);
- return 4;
+ fprintf(stderr, "redirect_reader: read failed, errno=%d\n",
+ errno);
+ return 4;
}
else if (ret == 0)
{
@@ -123,9 +123,9 @@ static int redirect_reader(int argc, char *argv[])
ret = write(1, buffer, ret);
if (ret < 0)
{
- fprintf(stderr, "redirect_reader: read failed, errno=%d\n",
- errno);
- return 5;
+ fprintf(stderr, "redirect_reader: read failed, errno=%d\n",
+ errno);
+ return 5;
}
}
@@ -133,8 +133,8 @@ static int redirect_reader(int argc, char *argv[])
ret = close(0);
if (ret != 0)
{
- fprintf(stderr, "redirect_reader: failed to close fd=0\n");
- return 6;
+ fprintf(stderr, "redirect_reader: failed to close fd=0\n");
+ return 6;
}
sem_post(&g_rddone);
@@ -165,8 +165,8 @@ static int redirect_writer(int argc, char *argv[])
ret = close(fdin);
if (ret != 0)
{
- fprintf(stderr, "redirect_reader: failed to close fdin=%d\n", fdin);
- return 1;
+ fprintf(stderr, "redirect_reader: failed to close fdin=%d\n", fdin);
+ return 1;
}
/* Re-direct the fdout to stdout */
@@ -174,8 +174,8 @@ static int redirect_writer(int argc, char *argv[])
ret = dup2(fdout, 1);
if (ret != 0)
{
- fprintf(stderr, "redirect_writer: dup2 failed: %d\n", errno);
- return 2;
+ fprintf(stderr, "redirect_writer: dup2 failed: %d\n", errno);
+ return 2;
}
/* Close the original file descriptor */
@@ -183,9 +183,9 @@ static int redirect_writer(int argc, char *argv[])
ret = close(fdout);
if (ret != 0)
{
- fprintf(stderr, "redirect_reader: failed to close fdout=%d\n",
- fdout);
- return 3;
+ fprintf(stderr, "redirect_reader: failed to close fdout=%d\n",
+ fdout);
+ return 3;
}
/* Then write a bunch of stuff to stdout */
@@ -215,8 +215,8 @@ static int redirect_writer(int argc, char *argv[])
ret = close(1);
if (ret != 0)
{
- fprintf(stderr, "redirect_writer: failed to close fd=1\n");
- return 4;
+ fprintf(stderr, "redirect_writer: failed to close fd=1\n");
+ return 4;
}
fprintf(stderr, "redirect_writer: Returning success\n");
@@ -243,12 +243,13 @@ int redirection_test(void)
sem_init(&g_rddone, 0, 0);
- /* Create the pipe */
+ /* Create the pipe */
ret = pipe(fd);
if (ret < 0)
{
- fprintf(stderr, "redirection_test: pipe failed with errno=%d\n", errno);
+ fprintf(stderr, "redirection_test: pipe failed with errno=%d\n",
+ errno);
return 5;
}
@@ -260,34 +261,35 @@ int redirection_test(void)
/* Start redirect_reader thread */
- printf("redirection_test: Starting redirect_reader task with fd=%d\n",
fd[0]);
- readerid = task_create("redirect_reader", 50, CONFIG_EXAMPLES_PIPE_STACKSIZE,
+ printf("redirection_test: Starting redirect_reader task with fd=%d\n",
+ fd[0]);
+ readerid = task_create("redirect_reader",
+ 50, CONFIG_EXAMPLES_PIPE_STACKSIZE,
redirect_reader, (FAR char * const *)argv);
if (readerid < 0)
{
- fprintf(stderr,
- "redirection_test: Failed to create redirect_writer task: %d\n",
- errno);
+ fprintf(stderr, "redirection_test: "
+ "Failed to create redirect_writer task: %d\n", errno);
return 1;
}
/* Start redirect_writer task */
- printf("redirection_test: Starting redirect_writer task with fd=%d\n",
fd[1]);
- writerid = task_create("redirect_writer", 50, CONFIG_EXAMPLES_PIPE_STACKSIZE,
+ printf("redirection_test: Starting redirect_writer task with fd=%d\n",
+ fd[1]);
+ writerid = task_create("redirect_writer",
+ 50, CONFIG_EXAMPLES_PIPE_STACKSIZE,
redirect_writer, (FAR char * const *)argv);
if (writerid < 0)
{
- fprintf(stderr,
- "redirection_test: Failed to create redirect_writer task: %d\n",
- errno);
+ fprintf(stderr, "redirection_test: "
+ "Failed to create redirect_writer task: %d\n", errno);
ret = task_delete(readerid);
if (ret != 0)
{
- fprintf(stderr,
- "redirection_test: Failed to delete redirect_reader task
%d\n",
- errno);
+ fprintf(stderr, "redirection_test: "
+ "Failed to delete redirect_reader task %d\n", errno);
}
return 2;
diff --git a/examples/pipe/transfer_test.c b/examples/pipe/transfer_test.c
index b4348c077..1fe5ec03f 100644
--- a/examples/pipe/transfer_test.c
+++ b/examples/pipe/transfer_test.c
@@ -68,7 +68,6 @@ static void *transfer_reader(pthread_addr_t pvarg)
int nbytes;
int value;
int ndx;
- void *p;
printf("transfer_reader: started\n");
for (nbytes = 0, value = 0; nbytes < NREAD_BYTES; )
@@ -80,8 +79,7 @@ static void *transfer_reader(pthread_addr_t pvarg)
"transfer_reader: read failed, errno=%d\n", \
errno);
- p = (void *) 1;
- return p;
+ return (void *)(uintptr_t)1;
}
else if (ret == 0)
{
@@ -91,8 +89,7 @@ static void *transfer_reader(pthread_addr_t pvarg)
"transfer_reader: Too few bytes read -- aborting: %d\n", \
nbytes);
- p = (void *) 2;
- return p;
+ return (void *)(uintptr_t)2;
}
break;
}
@@ -110,8 +107,7 @@ static void *transfer_reader(pthread_addr_t pvarg)
"transfer_reader: Byte %d, expected %d, found %d\n",
nbytes + ndx, value, buffer[ndx]);
- p = (void *) 3;
- return p;
+ return (void *)(uintptr_t)3;
}
value++;
@@ -124,15 +120,13 @@ static void *transfer_reader(pthread_addr_t pvarg)
"transfer_reader: Too many bytes read -- aborting: %d\n", \
nbytes);
- p = (void *) 4;
- return p;
+ return (void *)(uintptr_t)4;
}
}
printf("transfer_reader: %d bytes read\n", nbytes);
- p = (void *) 0;
- return p;
+ return NULL;
}
/****************************************************************************
@@ -145,7 +139,6 @@ static void *transfer_writer(pthread_addr_t pvarg)
int fd = (intptr_t)pvarg;
int ret;
int i;
- void *p;
printf("transfer_writer: started\n");
for (i = 0; i < WRITE_SIZE; i++)
@@ -160,21 +153,18 @@ static void *transfer_writer(pthread_addr_t pvarg)
{
fprintf(stderr, \
"transfer_writer: write failed, errno=%d\n", errno);
- p = (void *) 1;
- return p;
+ return (void *)(uintptr_t)1;
}
else if (ret != WRITE_SIZE)
{
fprintf(stderr, \
"transfer_writer: Unexpected write size=%d\n", ret);
- p = (void *) 2;
- return p;
+ return (void *)(uintptr_t)2;
}
}
printf("transfer_writer: %d bytes written\n", NWRITE_BYTES);
- p = (void *) 0;
- return p;
+ return NULL;
}
/****************************************************************************
diff --git a/examples/poll/host.c b/examples/poll/host.c
index cd6edad5d..868fca718 100644
--- a/examples/poll/host.c
+++ b/examples/poll/host.c
@@ -85,11 +85,13 @@ int main(int argc, char **argv, char **envp)
myaddr.sin_addr.s_addr = inet_addr(TARGETIP);
printf("client: Connecting to %s...\n", TARGETIP);
- if (connect( sockfd, (struct sockaddr*)&myaddr, sizeof(struct sockaddr_in))
< 0)
+ if (connect(sockfd, (struct sockaddr *)&myaddr,
+ sizeof(struct sockaddr_in)) < 0)
{
printf("client: connect failure: %d\n", errno);
goto errout_with_socket;
}
+
printf("client: Connected\n");
/* Then send and receive messages */
@@ -110,7 +112,8 @@ int main(int argc, char **argv, char **envp)
}
else if (nbytessent != len)
{
- printf("client: Bad send length: %d Expected: %d\n", nbytessent,
len);
+ printf("client: Bad send length: %d Expected: %d\n",
+ nbytessent, len);
goto errout_with_socket;
}
@@ -133,7 +136,8 @@ int main(int argc, char **argv, char **envp)
if (nbytesrecvd != len)
{
- printf("client: Bad recv length: %d Expected: %d\n", nbytesrecvd,
len);
+ printf("client: Bad recv length: %d Expected: %d\n",
+ nbytesrecvd, len);
goto errout_with_socket;
}
else if (memcmp(inbuf, outbuf, len) != 0)
diff --git a/examples/poll/net_listener.c b/examples/poll/net_listener.c
index 3333f699d..f8d0617e5 100644
--- a/examples/poll/net_listener.c
+++ b/examples/poll/net_listener.c
@@ -85,12 +85,15 @@ static bool net_closeclient(struct net_listener_s *nls, int
sd)
close(sd);
FD_CLR(sd, &nls->master);
- /* If we just closed the max SD, then search downward for the next biggest
SD. */
+ /* If we just closed the max SD, then search downward for the next
+ * biggest SD.
+ */
while (FD_ISSET(nls->mxsd, &nls->master) == false)
{
nls->mxsd -= 1;
}
+
return true;
}
@@ -107,7 +110,7 @@ static inline bool net_incomingdata(struct net_listener_s
*nls, int sd)
/* Read data from the socket */
#ifdef FIONBIO
- for (;;)
+ for (; ; )
#endif
{
printf("net_listener: Read data from sd=%d\n", sd);
@@ -132,7 +135,7 @@ static inline bool net_incomingdata(struct net_listener_s
*nls, int sd)
}
else
{
- nls->buffer[ret]='\0';
+ nls->buffer[ret] = '\0';
printf("poll_listener: Read '%s' (%d bytes)\n", nls->buffer, ret);
/* Echo the data back to the client */
@@ -144,9 +147,10 @@ static inline bool net_incomingdata(struct net_listener_s
*nls, int sd)
{
if (errno != EINTR)
{
- printf("net_listener: Send failed sd=%d: %d\n", sd,
errno);
- net_closeclient(nls, sd);
- return false;
+ printf("net_listener: Send failed sd=%d: %d\n",
+ sd, errno);
+ net_closeclient(nls, sd);
+ return false;
}
}
else
@@ -157,6 +161,7 @@ static inline bool net_incomingdata(struct net_listener_s
*nls, int sd)
}
}
}
+
return 0;
}
@@ -171,10 +176,11 @@ static inline bool net_connection(struct net_listener_s
*nls)
/* Loop until all connections have been processed */
#ifdef FIONBIO
- for (;;)
+ for (; ; )
#endif
{
- printf("net_listener: Accepting new connection on sd=%d\n",
nls->listensd);
+ printf("net_listener: Accepting new connection on sd=%d\n",
+ nls->listensd);
sd = accept(nls->listensd, NULL, NULL);
if (sd < 0)
@@ -197,6 +203,7 @@ static inline bool net_connection(struct net_listener_s
*nls)
{
nls->mxsd = sd;
}
+
return true;
}
}
@@ -225,7 +232,8 @@ static inline bool net_mksocket(struct net_listener_s *nls)
/* Configure the socket */
value = 1;
- ret = setsockopt(nls->listensd, SOL_SOCKET, SO_REUSEADDR, (char*)&value,
sizeof(int));
+ ret = setsockopt(nls->listensd, SOL_SOCKET, SO_REUSEADDR,
+ (char *)&value, sizeof(int));
if (ret < 0)
{
printf("net_listener: setsockopt failed: %d\n", errno);
@@ -251,7 +259,8 @@ static inline bool net_mksocket(struct net_listener_s *nls)
nls->addr.sin_family = AF_INET;
nls->addr.sin_addr.s_addr = htonl(INADDR_ANY);
nls->addr.sin_port = htons(LISTENER_PORT);
- ret = bind(nls->listensd, (struct sockaddr *)&nls->addr, sizeof(struct
sockaddr_in));
+ ret = bind(nls->listensd, (struct sockaddr *)&nls->addr,
+ sizeof(struct sockaddr_in));
if (ret < 0)
{
printf("net_listener: bind failed: %d\n", errno);
@@ -283,8 +292,9 @@ static void net_configure(void)
uint8_t mac[IFHWADDRLEN];
#endif
- /* Configure the network */
- /* Many embedded network interfaces must have a software assigned MAC */
+ /* Configure the network
+ * Many embedded network interfaces must have a software assigned MAC
+ */
#ifdef CONFIG_EXAMPLES_POLL_NOMAC
mac[0] = 0x00;
@@ -343,7 +353,7 @@ void *net_listener(pthread_addr_t pvarg)
memset(&nls, 0, sizeof(struct net_listener_s));
if (!net_mksocket(&nls))
{
- return (void*)1;
+ return (void *)(uintptr_t)1;
}
/* Initialize the 'master' file descriptor set */
@@ -361,13 +371,15 @@ void *net_listener(pthread_addr_t pvarg)
* on any of the connect sockets.
*/
- for (;;)
+ for (; ; )
{
/* Wait on select */
- printf("net_listener: Calling select(), listener sd=%d\n", nls.listensd);
+ printf("net_listener: Calling select(), listener sd=%d\n",
+ nls.listensd);
memcpy(&nls.working, &nls.master, sizeof(fd_set));
- ret = select(nls.mxsd + 1, (FAR fd_set*)&nls.working, (FAR fd_set*)NULL,
(FAR fd_set*)NULL, &timeout);
+ ret = select(nls.mxsd + 1, (FAR fd_set *)&nls.working,
+ (FAR fd_set*)NULL, (FAR fd_set *)NULL, &timeout);
if (ret < 0)
{
printf("net_listener: select failed: %d\n", errno);
@@ -411,7 +423,7 @@ void *net_listener(pthread_addr_t pvarg)
/* Cleanup */
#if 0 /* Don't get here */
- for (i = 0; i <= nls.mxsd; +i++)
+ for (i = 0; i <= nls.mxsd; +i++)
{
if (FD_ISSET(i, &nls.master))
{
@@ -419,5 +431,6 @@ void *net_listener(pthread_addr_t pvarg)
}
}
#endif
+
return NULL; /* Keeps some compilers from complaining */
}
diff --git a/examples/pwfb/pwfb_main.c b/examples/pwfb/pwfb_main.c
index 0d05e1ac9..1683b600e 100644
--- a/examples/pwfb/pwfb_main.c
+++ b/examples/pwfb/pwfb_main.c
@@ -337,7 +337,7 @@ static bool pwfb_putc(FAR struct pwfb_state_s *st,
/* Render the glyph into the window */
- src = (FAR const void *)glyph->bitmap;
+ src = glyph->bitmap;
ret = nxtk_bitmapwindow(wndo->hwnd, &bounds, &src,
fpos, (unsigned int)glyph->stride);
if (ret < 0)
diff --git a/examples/sotest/lib/modprint/modprint.c
b/examples/sotest/lib/modprint/modprint.c
index f326c5cfe..45bf25e82 100644
--- a/examples/sotest/lib/modprint/modprint.c
+++ b/examples/sotest/lib/modprint/modprint.c
@@ -45,7 +45,7 @@ static void modprint(FAR const char *fmt, ...) printflike(1,
2);
static const struct symtab_s g_modprint_exports[1] =
{
{
- (FAR const char *)"modprint", (FAR const void *)modprint,
+ "modprint", (FAR const void *)modprint,
}
};
diff --git a/examples/sotest/lib/sotest/sotest.c
b/examples/sotest/lib/sotest/sotest.c
index cfca240d2..f4143c3b4 100644
--- a/examples/sotest/lib/sotest/sotest.c
+++ b/examples/sotest/lib/sotest/sotest.c
@@ -60,22 +60,22 @@ static const char g_msg3[] = "Yes, don't be a stranger!";
static const struct symtab_s g_sotest_exports[6] =
{
{
- (FAR const char *)"testfunc1", (FAR const void *)testfunc1,
+ "testfunc1", (FAR const void *)testfunc1,
},
{
- (FAR const char *)"testfunc2", (FAR const void *)testfunc2,
+ "testfunc2", (FAR const void *)testfunc2,
},
{
- (FAR const char *)"testfunc3", (FAR const void *)testfunc3,
+ "testfunc3", (FAR const void *)testfunc3,
},
{
- (FAR const char *)"g_msg1", (FAR const void *)g_msg1,
+ "g_msg1", (FAR const void *)g_msg1,
},
{
- (FAR const char *)"g_msg2", (FAR const void *)g_msg2,
+ "g_msg2", (FAR const void *)g_msg2,
},
{
- (FAR const char *)"g_msg3", (FAR const void *)g_msg3,
+ "g_msg3", (FAR const void *)g_msg3,
},
};
diff --git a/examples/tcpblaster/README.md b/examples/tcpblaster/README.md
index 4b699a782..1ad0e3f3d 100644
--- a/examples/tcpblaster/README.md
+++ b/examples/tcpblaster/README.md
@@ -21,7 +21,7 @@ On nuttx:
nsh> tcpclient
Connecting to IPv4 Address: 0100000a
client: Connected
-[2014-07-31 00:16:15.000] 0: Sent 200 4096-byte buffers: 800.0 KB (avg
4.0 KB) in 0.18 seconds ( 4444.4 KB/second)
+[2014-07-31 00:16:15.000] 0: Sent 200 4096-byte buffers: 800.0 KB (avg
4.0 KB) in 0.18 seconds (4444.4 KB/second)
```
Now on the host you should see something like:
@@ -31,8 +31,8 @@ $ ./tcpserver
Binding to IPv4 Address: 00000000
server: Accepting connections on port 5471
server: Connection accepted -- receiving
-[2020-02-22 16:17:07.000] 0: Received 200 buffers: 502.9 KB (buffer average
size: 2.5 KB) in 0.12 seconds ( 4194.8 KB/second)
-[2020-02-22 16:17:07.000] 1: Received 200 buffers: 393.1 KB (buffer average
size: 2.0 KB) in 0.09 seconds ( 4299.4 KB/second)
+[2020-02-22 16:17:07.000] 0: Received 200 buffers: 502.9 KB (buffer average
size: 2.5 KB) in 0.12 seconds (4194.8 KB/second)
+[2020-02-22 16:17:07.000] 1: Received 200 buffers: 393.1 KB (buffer average
size: 2.0 KB) in 0.09 seconds (4299.4 KB/second)
```
This will tell you the link speed in KB/sec – kilobytes per second. If you want
diff --git a/examples/thttpd/content/Makefile.nxflat
b/examples/thttpd/content/Makefile.nxflat
index 906a5c0fe..7d4c91961 100644
--- a/examples/thttpd/content/Makefile.nxflat
+++ b/examples/thttpd/content/Makefile.nxflat
@@ -45,7 +45,7 @@ $(foreach DIR, $(SUBDIRS), $(eval $(call
DIR_template,$(DIR),install)))
# Install each program in the romfs directory
install: $(foreach DIR, $(SUBDIRS), $(DIR)_install)
- $(Q) ( for file in $(INSTALL_FILES); do\
+ $(Q) (for file in $(INSTALL_FILES); do \
install -m 0644 -D $${file} $(ROMFS_DIR)/$${file}; \
done; )
diff --git a/examples/udp/udp_server.c b/examples/udp/udp_server.c
index abde7ad02..f06c0eb34 100644
--- a/examples/udp/udp_server.c
+++ b/examples/udp/udp_server.c
@@ -104,7 +104,7 @@ void udp_server(void)
/* Set socket to reuse address */
optval = 1;
- if (setsockopt(sockfd, SOL_SOCKET, SO_REUSEADDR, (void *)&optval,
+ if (setsockopt(sockfd, SOL_SOCKET, SO_REUSEADDR, &optval,
sizeof(int)) < 0)
{
printf("server: setsockopt SO_REUSEADDR failure: %d\n", errno);
diff --git a/examples/usrsocktest/usrsocktest_block_recv.c
b/examples/usrsocktest/usrsocktest_block_recv.c
index d08a3af84..7382a2465 100644
--- a/examples/usrsocktest/usrsocktest_block_recv.c
+++ b/examples/usrsocktest/usrsocktest_block_recv.c
@@ -356,8 +356,7 @@ static void receive_timeout(FAR struct
usrsocktest_daemon_conf_s *dconf)
tv.tv_sec = 0;
tv.tv_usec = 100 * 1000;
- ret = setsockopt(sd, SOL_SOCKET, SO_RCVTIMEO, (FAR const void *)&tv,
- sizeof(tv));
+ ret = setsockopt(sd, SOL_SOCKET, SO_RCVTIMEO, &tv, sizeof(tv));
TEST_ASSERT_EQUAL(0, ret);
/* Receive data from remote */
diff --git a/examples/usrsocktest/usrsocktest_block_send.c
b/examples/usrsocktest/usrsocktest_block_send.c
index d029ae465..4e6b799a2 100644
--- a/examples/usrsocktest/usrsocktest_block_send.c
+++ b/examples/usrsocktest/usrsocktest_block_send.c
@@ -284,8 +284,7 @@ static void send_timeout(FAR struct
usrsocktest_daemon_conf_s *dconf)
tv.tv_sec = 0;
tv.tv_usec = 100 * 1000;
- ret = setsockopt(sd, SOL_SOCKET, SO_SNDTIMEO, (FAR const void *)&tv,
- sizeof(tv));
+ ret = setsockopt(sd, SOL_SOCKET, SO_SNDTIMEO, &tv, sizeof(tv));
TEST_ASSERT_EQUAL(0, ret);
/* Try send data to remote. */
diff --git a/examples/usrsocktest/usrsocktest_daemon.c
b/examples/usrsocktest/usrsocktest_daemon.c
index 9bdd8ccfe..b91bc7122 100644
--- a/examples/usrsocktest/usrsocktest_daemon.c
+++ b/examples/usrsocktest/usrsocktest_daemon.c
@@ -2084,10 +2084,10 @@ int usrsocktest_daemon_stop(void)
goto out;
}
- item = (void *)sq_peek(&priv->delayed_cmd_threads);
+ item = (FAR struct delayed_cmd_s *)sq_peek(&priv->delayed_cmd_threads);
while (item)
{
- next = (void *)sq_next(&item->node);
+ next = (FAR struct delayed_cmd_s *)sq_next(&item->node);
pthread_mutex_unlock(&daemon_mutex);
pthread_join(item->tid, &retval);
diff --git a/examples/usrsocktest/usrsocktest_wake_with_signal.c
b/examples/usrsocktest/usrsocktest_wake_with_signal.c
index 7e49aa28a..8f08210b2 100644
--- a/examples/usrsocktest/usrsocktest_wake_with_signal.c
+++ b/examples/usrsocktest/usrsocktest_wake_with_signal.c
@@ -160,7 +160,7 @@ static void do_usrsock_blocking_socket_thread(FAR void
*param)
TEST_ASSERT_EQUAL(ENETDOWN, errno);
}
-static FAR void * usrsock_blocking_socket_thread(FAR void *param)
+static FAR void *usrsock_blocking_socket_thread(FAR void *param)
{
do_usrsock_blocking_socket_thread(param);
return NULL;
@@ -199,7 +199,7 @@ static void do_usrsock_blocking_close_thread(FAR void
*param)
test_sd[tidx] = -1;
}
-static FAR void * usrsock_blocking_close_thread(FAR void *param)
+static FAR void *usrsock_blocking_close_thread(FAR void *param)
{
do_usrsock_blocking_close_thread(param);
return NULL;
@@ -243,7 +243,7 @@ static void do_usrsock_blocking_connect_thread(FAR void
*param)
test_sd[tidx] = -1;
}
-static FAR void * usrsock_blocking_connect_thread(FAR void *param)
+static FAR void *usrsock_blocking_connect_thread(FAR void *param)
{
do_usrsock_blocking_connect_thread(param);
return NULL;
@@ -289,7 +289,7 @@ static void do_usrsock_blocking_setsockopt_thread(FAR void
*param)
test_sd[tidx] = -1;
}
-static FAR void * usrsock_blocking_setsockopt_thread(FAR void *param)
+static FAR void *usrsock_blocking_setsockopt_thread(FAR void *param)
{
do_usrsock_blocking_setsockopt_thread(param);
return NULL;
@@ -337,7 +337,7 @@ static void do_usrsock_blocking_getsockopt_thread(FAR void
*param)
test_sd[tidx] = -1;
}
-static FAR void * usrsock_blocking_getsockopt_thread(FAR void *param)
+static FAR void *usrsock_blocking_getsockopt_thread(FAR void *param)
{
do_usrsock_blocking_getsockopt_thread(param);
return NULL;
@@ -386,7 +386,7 @@ static void do_usrsock_blocking_send_thread(FAR void *param)
test_sd[tidx] = -1;
}
-static FAR void * usrsock_blocking_send_thread(FAR void *param)
+static FAR void *usrsock_blocking_send_thread(FAR void *param)
{
do_usrsock_blocking_send_thread(param);
return NULL;
@@ -435,7 +435,7 @@ static void do_usrsock_blocking_recv_thread(FAR void *param)
test_sd[tidx] = -1;
}
-static FAR void * usrsock_blocking_recv_thread(FAR void *param)
+static FAR void *usrsock_blocking_recv_thread(FAR void *param)
{
do_usrsock_blocking_recv_thread(param);
return NULL;
@@ -497,7 +497,7 @@ static void do_usrsock_blocking_poll_thread(FAR void *param)
test_sd[tidx] = -1;
}
-static FAR void * usrsock_blocking_poll_thread(FAR void *param)
+static FAR void *usrsock_blocking_poll_thread(FAR void *param)
{
do_usrsock_blocking_poll_thread(param);
return NULL;
diff --git a/examples/ustream/ustream_client.c
b/examples/ustream/ustream_client.c
index fb92c9af1..68d4698e4 100644
--- a/examples/ustream/ustream_client.c
+++ b/examples/ustream/ustream_client.c
@@ -59,8 +59,8 @@ int main(int argc, FAR char *argv[])
/* Allocate buffers */
- outbuf = (char*)malloc(SENDSIZE);
- inbuf = (char*)malloc(SENDSIZE);
+ outbuf = (FAR char *)malloc(SENDSIZE);
+ inbuf = (FAR char *)malloc(SENDSIZE);
if (!outbuf || !inbuf)
{
printf("client: failed to allocate buffers\n");
@@ -90,7 +90,7 @@ int main(int argc, FAR char *argv[])
printf("client: Connecting to %s...\n", CONFIG_EXAMPLES_USTREAM_ADDR);
addrlen += sizeof(sa_family_t) + 1;
- ret = connect( sockfd, (struct sockaddr *)&myaddr, addrlen);
+ ret = connect(sockfd, (struct sockaddr *)&myaddr, addrlen);
if (ret < 0)
{
printf("client: connect failure: %d\n", errno);
@@ -147,7 +147,8 @@ int main(int argc, FAR char *argv[])
}
else if (nbytessent != SENDSIZE)
{
- printf("client: Bad send length: %d Expected: %d\n", nbytessent,
SENDSIZE);
+ printf("client: Bad send length: %d Expected: %d\n",
+ nbytessent, SENDSIZE);
goto errout_with_socket;
}
@@ -178,7 +179,8 @@ int main(int argc, FAR char *argv[])
#endif
printf("client: Receiving...\n");
- nbytesrecvd = recv(sockfd, &inbuf[totalbytesrecvd], SENDSIZE -
totalbytesrecvd, 0);
+ nbytesrecvd = recv(sockfd, &inbuf[totalbytesrecvd],
+ SENDSIZE - totalbytesrecvd, 0);
if (nbytesrecvd < 0)
{
@@ -198,7 +200,8 @@ int main(int argc, FAR char *argv[])
if (totalbytesrecvd != SENDSIZE)
{
- printf("client: Bad recv length: %d Expected: %d\n", totalbytesrecvd,
SENDSIZE);
+ printf("client: Bad recv length: %d Expected: %d\n",
+ totalbytesrecvd, SENDSIZE);
goto errout_with_socket;
}
else if (memcmp(inbuf, outbuf, SENDSIZE) != 0)
diff --git a/examples/ws2812/ws2812_main.c b/examples/ws2812/ws2812_main.c
index c7fae92d1..0bef6d344 100644
--- a/examples/ws2812/ws2812_main.c
+++ b/examples/ws2812/ws2812_main.c
@@ -43,10 +43,10 @@
struct neo_config_s
{
- FAR char *path;
- int loops;
- int leds;
- int delay;
+ FAR char *path;
+ int loops;
+ int leds;
+ int delay;
};
/****************************************************************************
diff --git a/examples/xmlrpc/xmlrpc_main.c b/examples/xmlrpc/xmlrpc_main.c
index 0d75c5504..555e3928a 100644
--- a/examples/xmlrpc/xmlrpc_main.c
+++ b/examples/xmlrpc/xmlrpc_main.c
@@ -403,7 +403,7 @@ int main(int argc, FAR char *argv[])
setsockopt(listenfd, SOL_SOCKET, SO_REUSEADDR, &on, sizeof(on));
- memset((void *)&servaddr, 0, sizeof(servaddr));
+ memset(&servaddr, 0, sizeof(servaddr));
servaddr.sin_family = AF_INET;
servaddr.sin_addr.s_addr = htonl(INADDR_ANY);
servaddr.sin_port = htons(80);
diff --git a/games/shift/shift_input_gesture.h
b/games/shift/shift_input_gesture.h
index 3547b3cf6..54feb71c1 100644
--- a/games/shift/shift_input_gesture.h
+++ b/games/shift/shift_input_gesture.h
@@ -62,7 +62,7 @@ int dev_read_input(FAR struct input_state_s *dev)
int nbytes;
uint8_t gest;
- nbytes = read(dev->fd_gest, (void *)&gest, sizeof(gest));
+ nbytes = read(dev->fd_gest, &gest, sizeof(gest));
if (nbytes == sizeof(gest))
{
dev->dir = gest;
diff --git a/graphics/ft80x/ft80x_regs.c b/graphics/ft80x/ft80x_regs.c
index a811ae812..1e78e9ea3 100644
--- a/graphics/ft80x/ft80x_regs.c
+++ b/graphics/ft80x/ft80x_regs.c
@@ -43,7 +43,7 @@
#define DLSWAP_DELAY_USEC (10 * 1000)
-/* But timeout after 5 seconds ( 5 * 100 * 10 MS = 5 S) */
+/* But timeout after 5 seconds (5 * 100 * 10 MS = 5 S) */
#define DLSWAP_TIMEOUT_CSEC (5 * 100)
diff --git a/graphics/nxwidgets/src/cmultilinetextbox.cxx
b/graphics/nxwidgets/src/cmultilinetextbox.cxx
index c655ff1e5..6668db645 100644
--- a/graphics/nxwidgets/src/cmultilinetextbox.cxx
+++ b/graphics/nxwidgets/src/cmultilinetextbox.cxx
@@ -1225,7 +1225,7 @@ void CMultiLineTextBox::drawCursor(CGraphicsPort *port)
// Draw cursor
port->invert(cursorX, cursorY,
- m_text->getFont()->getCharWidth( getCursorChar()),
+ m_text->getFont()->getCharWidth(getCursorChar()),
m_text->getFont()->getHeight());
}
}
diff --git a/graphics/pdcurs34/pdcurses/pdc_panel.c
b/graphics/pdcurs34/pdcurses/pdc_panel.c
index 59ec33e01..03edaf490 100644
--- a/graphics/pdcurs34/pdcurses/pdc_panel.c
+++ b/graphics/pdcurs34/pdcurses/pdc_panel.c
@@ -164,7 +164,7 @@ typedef struct panel_ctx_s
#ifdef CONFIG_PDCURSES_MULTITHREAD
void *pdc_alloc_panel_ctx()
{
- return (void *) zalloc(sizeof(struct panel_ctx_s));
+ return zalloc(sizeof(struct panel_ctx_s));
}
#endif
diff --git a/graphics/pdcurs34/pdcurses/pdc_terminfo.c
b/graphics/pdcurs34/pdcurses/pdc_terminfo.c
index 87e1c787e..ebdc8c373 100644
--- a/graphics/pdcurs34/pdcurses/pdc_terminfo.c
+++ b/graphics/pdcurs34/pdcurses/pdc_terminfo.c
@@ -84,7 +84,7 @@ TERMINAL *cur_term = NULL;
#ifdef CONFIG_PDCURSES_MULTITHREAD
void *pdc_alloc_term_ctx(void)
{
- return (void *) zalloc(sizeof(TERMINAL));
+ return zalloc(sizeof(TERMINAL));
}
#endif
diff --git a/graphics/twm4nx/src/ciconmgr.cxx b/graphics/twm4nx/src/ciconmgr.cxx
index 5cffa328f..72c7c56fe 100644
--- a/graphics/twm4nx/src/ciconmgr.cxx
+++ b/graphics/twm4nx/src/ciconmgr.cxx
@@ -730,7 +730,7 @@ void CIconMgr::insertEntry(FAR struct SWindowEntry *wentry,
// Insert the new window mid-list, in name order
NXWidgets::CNxString windowName = cwin->getWindowName();
- if (windowName.compareTo( tmpwin->cwin->getWindowName()) > 0)
+ if (windowName.compareTo(tmpwin->cwin->getWindowName()) > 0)
{
wentry->flink = tmpwin;
wentry->blink = tmpwin->blink;
diff --git a/include/audioutils/fmsynth_op.h b/include/audioutils/fmsynth_op.h
index aad10de16..bbba43216 100644
--- a/include/audioutils/fmsynth_op.h
+++ b/include/audioutils/fmsynth_op.h
@@ -47,7 +47,7 @@ typedef CODE int (*opfunc_t)(int theta);
typedef struct fmsynth_op_s
{
- FAR fmsynth_eg_t *eg;
+ FAR fmsynth_eg_t *eg;
opfunc_t wavegen;
struct fmsynth_op_s *cascadeop;
struct fmsynth_op_s *parallelop;
diff --git a/include/graphics/nxwidgets/crlepalettebitmap.hxx
b/include/graphics/nxwidgets/crlepalettebitmap.hxx
index d14ba4cc0..627f565e1 100644
--- a/include/graphics/nxwidgets/crlepalettebitmap.hxx
+++ b/include/graphics/nxwidgets/crlepalettebitmap.hxx
@@ -63,12 +63,12 @@ namespace NXWidgets
struct SRlePaletteBitmap
{
- uint8_t bpp; /**< Bits per pixel */
- uint8_t fmt; /**< Color format */
- uint8_t nlut; /**< Number of colors in the Look-Up Table (LUT)
*/
- nxgl_coord_t width; /**< Width in pixels */
- nxgl_coord_t height; /**< Height in rows */
- FAR const void *lut[2]; /**< Pointers to the beginning of the Look-Up
Tables (LUTs) */
+ uint8_t bpp; /**< Bits per pixel */
+ uint8_t fmt; /**< Color format */
+ uint8_t nlut; /**< Number of colors in the Look-Up Table (LUT)
*/
+ nxgl_coord_t width; /**< Width in pixels */
+ nxgl_coord_t height; /**< Height in rows */
+ FAR const void *lut[2]; /**< Pointers to the beginning of the Look-Up
Tables (LUTs) */
/**
* The pointer to the beginning of the RLE data
diff --git a/include/graphics/nxwm/ccalibration.hxx
b/include/graphics/nxwm/ccalibration.hxx
index 8ee66f2c8..3e6251f53 100644
--- a/include/graphics/nxwm/ccalibration.hxx
+++ b/include/graphics/nxwm/ccalibration.hxx
@@ -396,8 +396,8 @@ namespace NxWM
class CCalibrationFactory : public IApplicationFactory
{
private:
- CTaskbar *m_taskbar; /**< The taskbar */
- CTouchscreen *m_touchscreen; /**< The touchscreen device */
+ CTaskbar *m_taskbar; /**< The taskbar */
+ CTouchscreen *m_touchscreen; /**< The touchscreen device */
public:
/**
diff --git a/include/graphics/nxwm/cnxterm.hxx
b/include/graphics/nxwm/cnxterm.hxx
index fb4acfbcb..4f78fd3ce 100644
--- a/include/graphics/nxwm/cnxterm.hxx
+++ b/include/graphics/nxwm/cnxterm.hxx
@@ -63,11 +63,11 @@ namespace NxWM
class CNxTerm : public IApplication, private IApplicationCallback
{
private:
- CTaskbar *m_taskbar; /**< Reference to the "parent" taskbar
*/
- CApplicationWindow *m_window; /**< Reference to the application
window */
- NXTERM m_nxterm; /**< NxTerm handle */
- pid_t m_pid; /**< Task ID of the NxTerm thread */
- int m_minor; /**< Terminal device minor number */
+ CTaskbar *m_taskbar; /**< Reference to the "parent" taskbar
*/
+ CApplicationWindow *m_window; /**< Reference to the application
window */
+ NXTERM m_nxterm; /**< NxTerm handle */
+ pid_t m_pid; /**< Task ID of the NxTerm thread */
+ int m_minor; /**< Terminal device minor number */
/**
* This is the NxTerm task. This function first redirects output to the
diff --git a/include/graphics/tiff.h b/include/graphics/tiff.h
index a857dd0fe..553434d98 100644
--- a/include/graphics/tiff.h
+++ b/include/graphics/tiff.h
@@ -66,10 +66,11 @@
/* Values for the IFD tag type */
-#define IFD_TAG_NEWSUBFILETYPE 254 /* NewSubfileType, LONG */
+#define IFD_TAG_NEWSUBFILETYPE 254 /* NewSubfileType, LONG */
# define TAG_NEWSUBFILETYPE_REDUCED (1 << 0) /* Bit 0: Reduced resolution
version of image */
# define TAG_NEWSUBFILETYPE_SINGLE (1 << 1) /* Bit 1: Single page of a
multi-page image */
# define TAG_NEWSUBFILETYPE_TRANSP (1 << 2) /* Bit 2: Defines a transparency
mask for image */
+
#define IFD_TAG_SUBFILETYPE 255 /* SubfileType, SHORT */
# define TAG_SUBFILETYPE_FULL 1 /* Full-resolution image data */
# define TAG_SUBFILETYPE_REDUCED 2 /* Reduced-resolution image data */
@@ -145,11 +146,11 @@
# define TAG_GRAYRESPUNIT_100KTHS 5 /* Number represents
hundred-thousandths of a unit */
#define IFD_TAG_GRAYRESPONSECURVE 291 /* GrayResponseCurve, SHORT */
#define IFD_TAG_T4OPTIONS 292 /* T4Options, LONG */
-# define TAG_T4OPTIONS_2D (1 << 0) /* 2-dimensional coding */
-# define TAG_T4OPTIONS_NONE (1 << 1) /* Uncompressed mode */
-# define TAG_T4OPTIONS_FILL (1 << 2) /* Fill bits have been added */
+# define TAG_T4OPTIONS_2D (1 << 0) /* 2-dimensional coding */
+# define TAG_T4OPTIONS_NONE (1 << 1) /* Uncompressed mode */
+# define TAG_T4OPTIONS_FILL (1 << 2) /* Fill bits have been added */
#define IFD_TAG_T6OPTIONS 293 /* T6Options, LONG */
-# define TAG_T6OPTIONS_NONE (1 << 1) /* Uncompressed mode allowed */
+# define TAG_T6OPTIONS_NONE (1 << 1) /* Uncompressed mode allowed */
#define IFD_TAG_RESUNIT 296 /* ResolutionUnit, SHORT (Required) */
# define TAG_RESUNIT_NONE 1 /* No absolute unit of measurement */
# define TAG_RESUNIT_INCH 2 /* Inch (default) */
@@ -244,7 +245,7 @@ struct tiff_ifdentry_s
/************************************************************************************/
-/* 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).
*/
diff --git a/include/wireless/ieee802154.h b/include/wireless/ieee802154.h
index 383aa3fcb..4049cf885 100644
--- a/include/wireless/ieee802154.h
+++ b/include/wireless/ieee802154.h
@@ -120,7 +120,7 @@ int sixlowpan_assoc_resp(int sock, FAR const char *ifname,
int sixlowpan_disassoc_req(int sock, FAR const char *ifname,
FAR const struct ieee802154_disassoc_req_s *req);
int sixlowpan_get_req(int sock, FAR const char *ifname,
- FAR const struct ieee802154_get_req_s *req);
+ FAR struct ieee802154_get_req_s *req);
int sixlowpan_gts_req(int sock, FAR const char *ifname,
FAR const struct ieee802154_gts_req_s *req);
int sixlowpan_orphan_resp(int sock, FAR const char *ifname,
diff --git a/netutils/chat/chat.c b/netutils/chat/chat.c
index df42aa537..3954498de 100644
--- a/netutils/chat/chat.c
+++ b/netutils/chat/chat.c
@@ -492,7 +492,7 @@ static void chat_flush(FAR struct chat *priv)
char c;
ninfo("starting\n");
- while (chat_readb(priv, (FAR char *) &c, 0) == 0);
+ while (chat_readb(priv, &c, 0) == 0);
ninfo("done\n");
}
diff --git a/netutils/codecs/md5.c b/netutils/codecs/md5.c
index 93133b27e..83e6dc0aa 100644
--- a/netutils/codecs/md5.c
+++ b/netutils/codecs/md5.c
@@ -84,7 +84,7 @@
/* This is the central step in the MD5 algorithm. */
# define MD5STEP(f, w, x, y, z, data, s) \
- ( w += f(x, y, z) + data, w = w<<s | w>>(32-s), w += x )
+ (w += f(x, y, z) + data, w = w<<s | w>>(32-s), w += x)
/****************************************************************************
* Private Functions
diff --git a/netutils/discover/discover.c b/netutils/discover/discover.c
index 7613f17a7..9e7aef9b7 100644
--- a/netutils/discover/discover.c
+++ b/netutils/discover/discover.c
@@ -144,7 +144,7 @@ static inline void discover_initresponse(void)
g_state.response[0] = DISCOVER_PROTO_ID;
g_state.response[1] = DISCOVER_RESPONSE;
- strncpy((char *) &g_state.response[2], g_state.info.description,
+ strncpy((char *)&g_state.response[2], g_state.info.description,
DISCOVER_RESPONSE_SIZE - 3);
for (i = 0; i < DISCOVER_RESPONSE_SIZE - 1; i++)
@@ -161,7 +161,7 @@ static int discover_daemon(int argc, char *argv[])
{
int sockfd = -1;
int nbytes;
- int addrlen = sizeof(struct sockaddr_in);
+ socklen_t addrlen = sizeof(struct sockaddr_in);
struct sockaddr_in srcaddr;
/* memset(&g_state, 0, sizeof(struct discover_state_s)); */
@@ -187,8 +187,7 @@ static int discover_daemon(int argc, char *argv[])
/* Read the next packet */
nbytes = recvfrom(sockfd, &g_state.request, sizeof(g_state.request), 0,
- (struct sockaddr *) &srcaddr,
- (socklen_t *) &addrlen);
+ (struct sockaddr *)&srcaddr, &addrlen);
if (nbytes < 0)
{
/* On errors (other EINTR), close the socket and try again */
@@ -305,7 +304,7 @@ static inline int discover_socket(void)
#ifdef HAVE_SO_REUSEADDR
optval = 1;
ret = setsockopt(sockfd, SOL_SOCKET,
- SO_REUSEADDR, (void *)&optval, sizeof(int));
+ SO_REUSEADDR, &optval, sizeof(int));
if (ret < 0)
{
nerr("ERROR: setsockopt SO_REUSEADDR failed: %d\n", errno);
@@ -317,7 +316,7 @@ static inline int discover_socket(void)
#ifdef HAVE_SO_BROADCAST
optval = 1;
ret = setsockopt(sockfd, SOL_SOCKET,
- SO_BROADCAST, (void *)&optval, sizeof(int));
+ SO_BROADCAST, &optval, sizeof(int));
if (ret < 0)
{
nerr("ERROR: setsockopt SO_BROADCAST failed: %d\n", errno);
diff --git a/netutils/esp8266/esp8266.c b/netutils/esp8266/esp8266.c
index 163b486d0..617d162a5 100644
--- a/netutils/esp8266/esp8266.c
+++ b/netutils/esp8266/esp8266.c
@@ -145,7 +145,7 @@ typedef struct
/* ESP Got only One ip + 1 for NULL that indicate end of list */
- in_addr_t * h_addr_list_buf[2];
+ in_addr_t *h_addr_list_buf[2];
in_addr_t in_addr;
} lesp_state_t;
diff --git a/netutils/libcurl4nx/curl4nx_easy_perform.c
b/netutils/libcurl4nx/curl4nx_easy_perform.c
index 06bb07277..a0db57afc 100644
--- a/netutils/libcurl4nx/curl4nx_easy_perform.c
+++ b/netutils/libcurl4nx/curl4nx_easy_perform.c
@@ -140,15 +140,15 @@ static int curl4nx_is_header(FAR char *buf, int len,
int curl4nx_easy_perform(FAR struct curl4nx_s *handle)
{
struct sockaddr_in server;
- FILE * stream; /* IOSTREAM used to printf in the socket TODO
avoid */
+ FAR FILE *stream; /* IOSTREAM used to printf in the socket TODO
avoid */
int rxoff; /* Current offset within RX buffer */
char tmpbuf[16]; /* Buffer to hold small strings */
int tmplen; /* Number of bytes used in tmpbuffer */
int state; /* Current state of the parser */
int ret; /* Return value from internal calls */
- char * headerbuf;
+ FAR char *headerbuf;
int headerlen;
- char * end;
+ FAR char *end;
int cret = CURL4NXE_OK; /* Public return value */
bool redirected = false; /* Boolean to manage HTTP
redirections */
bool chunked = false;
@@ -506,7 +506,7 @@ int curl4nx_easy_perform(FAR struct curl4nx_s *handle)
curl4nx_info(
"Too many redirections\n");
cret =
- CURL4NXE_TOO_MANY_REDIRECTS;
+ CURL4NXE_TOO_MANY_REDIRECTS;
goto close;
}
diff --git a/netutils/libcurl4nx/curl4nx_private.h
b/netutils/libcurl4nx/curl4nx_private.h
index cdc45f9c1..96fcdd93e 100644
--- a/netutils/libcurl4nx/curl4nx_private.h
+++ b/netutils/libcurl4nx/curl4nx_private.h
@@ -131,7 +131,7 @@ struct curl4nx_s
uint32_t flags;
bool verbose;
curl4nx_xferinfofunc_f progressfunc; /* Called when data chunks are
received */
- FAR void * progressdata;
+ FAR void *progressdata;
/* Request side */
@@ -145,21 +145,21 @@ struct curl4nx_s
int max_redirs;
curl4nx_iofunc_f writefunc; /* Called when data has to be
uploaded */
- FAR void * writedata;
+ FAR void *writedata;
/* Response side */
int rxbufsize;
- FAR char * rxbuf;
+ FAR char *rxbuf;
int status;
unsigned long long content_length;
curl4nx_iofunc_f readfunc; /* Called when data has to be
downloaded */
- FAR void * readdata;
+ FAR void *readdata;
curl4nx_iofunc_f headerfunc; /* Called when a complete HTTP
header has been received */
- FAR void * headerdata;
+ FAR void *headerdata;
};
/****************************************************************************
diff --git a/netutils/netcat/netcat_main.c b/netutils/netcat/netcat_main.c
index fc1343c6b..4b26c2449 100644
--- a/netutils/netcat/netcat_main.c
+++ b/netutils/netcat/netcat_main.c
@@ -269,7 +269,7 @@ int netcat_client(int argc, char * argv[])
goto out;
}
- if (connect(id, (struct sockaddr *) &server, sizeof(server)) < 0)
+ if (connect(id, (struct sockaddr *)&server, sizeof(server)) < 0)
{
perror("error: net: Failed to connect");
result = 4;
diff --git a/netutils/netinit/netinit.c b/netutils/netinit/netinit.c
index 5c16ff3c7..a742bbf6f 100644
--- a/netutils/netinit/netinit.c
+++ b/netutils/netinit/netinit.c
@@ -703,7 +703,7 @@ static void netinit_configure(void)
#ifdef CONFIG_NETINIT_MONITOR
static void netinit_signal(int signo, FAR siginfo_t *siginfo,
- FAR void * context)
+ FAR void *context)
{
int semcount;
int ret;
@@ -995,10 +995,10 @@ static pthread_addr_t netinit_thread(pthread_addr_t arg)
int netinit_bringup(void)
{
#ifdef CONFIG_NETINIT_THREAD
- struct sched_param sparam;
- pthread_attr_t attr;
- pthread_t tid;
- int ret;
+ struct sched_param sparam;
+ pthread_attr_t attr;
+ pthread_t tid;
+ int ret;
/* Start the network initialization thread to perform the network bring-up
* asynchronously.
diff --git a/netutils/ntpclient/ntpclient.c b/netutils/ntpclient/ntpclient.c
index c3c32a0da..5cb62fc75 100644
--- a/netutils/ntpclient/ntpclient.c
+++ b/netutils/ntpclient/ntpclient.c
@@ -1148,7 +1148,7 @@ static int ntpc_get_ntp_sample(FAR struct ntp_servers_s
*srvs,
* setsockopt() above)
*/
- nbytes = recvfrom(sd, (void *)&recv, sizeof(struct ntp_datagram_s),
+ nbytes = recvfrom(sd, &recv, sizeof(struct ntp_datagram_s),
0, &recvaddr.sa, &socklen);
recv_time = ntp_localtime();
diff --git a/netutils/pppd/ahdlc.c b/netutils/pppd/ahdlc.c
index 07ef997c3..1725cffc5 100644
--- a/netutils/pppd/ahdlc.c
+++ b/netutils/pppd/ahdlc.c
@@ -79,8 +79,8 @@ static uint16_t crcadd(uint16_t crcvalue, uint8_t c)
{
uint16_t b;
- b = (crcvalue ^ c) & 0xFF;
- b = (b ^ (b << 4)) & 0xFF;
+ b = (crcvalue ^ c) & 0xff;
+ b = (b ^ (b << 4)) & 0xff;
b = (b << 8) ^ (b << 3) ^ (b >> 4);
return ((crcvalue >> 8) ^ b);
@@ -149,7 +149,7 @@ uint8_t ahdlc_rx(FAR struct ppp_context_s *ctx, uint8_t c)
{
/* Discard character */
- DEBUG1(("Discard because char is < 0x20 hex and asysnc map is 0\n"));
+ DEBUG1(("Discard since char is < 0x20 hex and asysnc map is 0\n"));
return 0;
}
@@ -182,8 +182,8 @@ uint8_t ahdlc_rx(FAR struct ppp_context_s *ctx, uint8_t c)
DEBUG1(("\nReceiving packet with good crc value, len %d\n",
ctx->ahdlc_rx_count));
- /* we have a good packet, turn off CTS until we are done with
this
- * packet
+ /* we have a good packet, turn off CTS until we are done with
+ * this packet
*/
/* CTS_OFF(); */
@@ -212,7 +212,7 @@ uint8_t ahdlc_rx(FAR struct ppp_context_s *ctx, uint8_t c)
/* Send up packet */
ppp_upcall(ctx, (uint16_t)ctx->ahdlc_rx_buffer[0],
- (FAR uint8_t *) & ctx->ahdlc_rx_buffer[1],
+ (FAR uint8_t *)&ctx->ahdlc_rx_buffer[1],
(uint16_t)(ctx->ahdlc_rx_count - 1));
}
else
@@ -222,7 +222,7 @@ uint8_t ahdlc_rx(FAR struct ppp_context_s *ctx, uint8_t c)
ppp_upcall(ctx,
(uint16_t)(ctx->ahdlc_rx_buffer[0] << 8 | ctx->
ahdlc_rx_buffer[1]),
- (FAR uint8_t *) & ctx->ahdlc_rx_buffer[2],
+ (FAR uint8_t *)&ctx->ahdlc_rx_buffer[2],
(uint16_t)(ctx->ahdlc_rx_count - 2));
}
@@ -232,8 +232,8 @@ uint8_t ahdlc_rx(FAR struct ppp_context_s *ctx, uint8_t c)
}
else if (ctx->ahdlc_rx_count > 3)
{
- DEBUG1(("\nReceiving packet with bad crc value, was 0x%04x len
%d\n",
- ctx->ahdlc_rx_crc, ctx->ahdlc_rx_count));
+ DEBUG1(("\nReceiving packet with bad crc value, was 0x%04x "
+ "len %d\n", ctx->ahdlc_rx_crc, ctx->ahdlc_rx_count));
#ifdef PPP_STATISTICS
++ctx->ahdlc_crc_error;
#endif
@@ -312,16 +312,14 @@ void ahdlc_tx_char(struct ppp_context_s *ctx, uint16_t
protocol, uint8_t c)
ctx->ahdlc_tx_crc = crcadd(ctx->ahdlc_tx_crc, c);
- /* See if we need to escape char, we always escape 0x7d and 0x7e, in the case
- * of char < 0x20 we only support async map of default or none, so escape if
- * ASYNC map is not set. We may want to modify this to support a bitmap set
+ /* See if we need to escape char, we always escape 0x7d and 0x7e, in the
+ * case of char < 0x20 we only support async map of default or none, so
+ * escape if ASYNC map is not set. We may want to modify this to support
* ASYNC map.
*/
- if ((c == 0x7d) || (c == 0x7e) || ((c < 0x20) && ((protocol == LCP) ||
- (ctx->
- ahdlc_flags &
- PPP_TX_ASYNC_MAP) == 0)))
+ if ((c == 0x7d) || (c == 0x7e) || ((c < 0x20) &&
+ ((protocol == LCP) || (ctx->ahdlc_flags & PPP_TX_ASYNC_MAP) == 0)))
{
/* Send escape char and xor byte by 0x20 */
@@ -344,19 +342,21 @@ void ahdlc_tx_char(struct ppp_context_s *ctx, uint16_t
protocol, uint8_t c)
****************************************************************************/
uint8_t ahdlc_tx(struct ppp_context_s *ctx, uint16_t protocol,
- FAR uint8_t * header, FAR uint8_t * buffer, uint16_t
headerlen,
- uint16_t datalen)
+ FAR uint8_t * header, FAR uint8_t * buffer,
+ uint16_t headerlen, uint16_t datalen)
{
uint16_t i;
uint8_t c;
- DEBUG1(("\nAHDLC_TX - transmit frame, protocol 0x%04x, length %d offline
%d\n",
+ DEBUG1(("\nAHDLC_TX - transmit frame, protocol 0x%04x, length %d "
+ "offline %d\n",
protocol, datalen + headerlen, ctx->ahdlc_tx_offline));
if (AHDLC_TX_OFFLINE && (ctx->ahdlc_tx_offline++ > AHDLC_TX_OFFLINE))
{
ctx->ahdlc_tx_offline = 0;
- DEBUG1(("\nAHDLC_TX to many outstanding TX packets =>
ppp_reconnect()\n"));
+ DEBUG1(("\nAHDLC_TX to many outstanding TX packets => "
+ "ppp_reconnect()\n"));
ppp_reconnect(ctx);
return 0;
}
diff --git a/netutils/pppd/ipcp.c b/netutils/pppd/ipcp.c
index 3f1768f3a..b4f4fe34e 100644
--- a/netutils/pppd/ipcp.c
+++ b/netutils/pppd/ipcp.c
@@ -87,7 +87,7 @@ static const uint8_t g_ipcplist[] =
#if PPP_DEBUG
void printip(struct in_addr ip2)
{
- char *ip = (FAR uint8_t *) & ip2.s_addr;
+ FAR unt8_t *ip = (FAR uint8_t *)&ip2.s_addr;
DEBUG1((" %d.%d.%d.%d ", ip[0], ip[1], ip[2], ip[3]));
}
#else
@@ -173,10 +173,10 @@ void ipcp_rx(FAR struct ppp_context_s *ctx, FAR uint8_t *
buffer,
++bptr;
#ifdef IPCP_GET_PEER_IP
- ((FAR uint8_t *) & ctx->peer_ip)[0] = *bptr++;
- ((FAR uint8_t *) & ctx->peer_ip)[1] = *bptr++;
- ((FAR uint8_t *) & ctx->peer_ip)[2] = *bptr++;
- ((FAR uint8_t *) & ctx->peer_ip)[3] = *bptr++;
+ ((FAR uint8_t *)&ctx->peer_ip)[0] = *bptr++;
+ ((FAR uint8_t *)&ctx->peer_ip)[1] = *bptr++;
+ ((FAR uint8_t *)&ctx->peer_ip)[2] = *bptr++;
+ ((FAR uint8_t *)&ctx->peer_ip)[3] = *bptr++;
DEBUG1(("Peer IP "));
printip(ctx->peer_ip);
@@ -275,29 +275,29 @@ void ipcp_rx(FAR struct ppp_context_s *ctx, FAR uint8_t *
buffer,
/* Dump length */
bptr++;
- ((FAR uint8_t *) & ctx->local_ip)[0] = *bptr++;
- ((FAR uint8_t *) & ctx->local_ip)[1] = *bptr++;
- ((FAR uint8_t *) & ctx->local_ip)[2] = *bptr++;
- ((FAR uint8_t *) & ctx->local_ip)[3] = *bptr++;
+ ((FAR uint8_t *)&ctx->local_ip)[0] = *bptr++;
+ ((FAR uint8_t *)&ctx->local_ip)[1] = *bptr++;
+ ((FAR uint8_t *)&ctx->local_ip)[2] = *bptr++;
+ ((FAR uint8_t *)&ctx->local_ip)[3] = *bptr++;
break;
# ifdef IPCP_GET_PRI_DNS
case IPCP_PRIMARY_DNS:
bptr++;
- ((FAR uint8_t *) & ctx->pri_dns_addr)[0] = *bptr++;
- ((FAR uint8_t *) & ctx->pri_dns_addr)[1] = *bptr++;
- ((FAR uint8_t *) & ctx->pri_dns_addr)[2] = *bptr++;
- ((FAR uint8_t *) & ctx->pri_dns_addr)[3] = *bptr++;
+ ((FAR uint8_t *)&ctx->pri_dns_addr)[0] = *bptr++;
+ ((FAR uint8_t *)&ctx->pri_dns_addr)[1] = *bptr++;
+ ((FAR uint8_t *)&ctx->pri_dns_addr)[2] = *bptr++;
+ ((FAR uint8_t *)&ctx->pri_dns_addr)[3] = *bptr++;
break;
# endif
# ifdef IPCP_GET_SEC_DNS
case IPCP_SECONDARY_DNS:
bptr++;
- ((FAR uint8_t *) & ctx->sec_dns_addr)[0] = *bptr++;
- ((FAR uint8_t *) & ctx->sec_dns_addr)[1] = *bptr++;
- ((FAR uint8_t *) & ctx->sec_dns_addr)[2] = *bptr++;
- ((FAR uint8_t *) & ctx->sec_dns_addr)[3] = *bptr++;
+ ((FAR uint8_t *)&ctx->sec_dns_addr)[0] = *bptr++;
+ ((FAR uint8_t *)&ctx->sec_dns_addr)[1] = *bptr++;
+ ((FAR uint8_t *)&ctx->sec_dns_addr)[2] = *bptr++;
+ ((FAR uint8_t *)&ctx->sec_dns_addr)[3] = *bptr++;
break;
# endif
@@ -346,22 +346,22 @@ void ipcp_rx(FAR struct ppp_context_s *ctx, FAR uint8_t *
buffer,
bptr++;
- ((FAR uint8_t *) & ctx->local_ip)[0] = (char)*bptr++;
- ((FAR uint8_t *) & ctx->local_ip)[1] = (char)*bptr++;
- ((FAR uint8_t *) & ctx->local_ip)[2] = (char)*bptr++;
- ((FAR uint8_t *) & ctx->local_ip)[3] = (char)*bptr++;
+ ((FAR uint8_t *)&ctx->local_ip)[0] = (char)*bptr++;
+ ((FAR uint8_t *)&ctx->local_ip)[1] = (char)*bptr++;
+ ((FAR uint8_t *)&ctx->local_ip)[2] = (char)*bptr++;
+ ((FAR uint8_t *)&ctx->local_ip)[3] = (char)*bptr++;
- netlib_ifup((char *)ctx->ifname);
- netlib_set_ipv4addr((char *)ctx->ifname, &ctx->local_ip);
+ netlib_ifup((FAR char *)ctx->ifname);
+ netlib_set_ipv4addr((FAR char *)ctx->ifname, &ctx->local_ip);
break;
#ifdef IPCP_GET_PRI_DNS
case IPCP_PRIMARY_DNS:
bptr++;
- ((FAR uint8_t *) & ctx->pri_dns_addr)[0] = *bptr++;
- ((FAR uint8_t *) & ctx->pri_dns_addr)[1] = *bptr++;
- ((FAR uint8_t *) & ctx->pri_dns_addr)[2] = *bptr++;
- ((FAR uint8_t *) & ctx->pri_dns_addr)[3] = *bptr++;
+ ((FAR uint8_t *)&ctx->pri_dns_addr)[0] = *bptr++;
+ ((FAR uint8_t *)&ctx->pri_dns_addr)[1] = *bptr++;
+ ((FAR uint8_t *)&ctx->pri_dns_addr)[2] = *bptr++;
+ ((FAR uint8_t *)&ctx->pri_dns_addr)[3] = *bptr++;
netlib_set_ipv4dnsaddr(&ctx->pri_dns_addr);
break;
#endif
@@ -369,10 +369,10 @@ void ipcp_rx(FAR struct ppp_context_s *ctx, FAR uint8_t *
buffer,
#ifdef IPCP_GET_SEC_DNS
case IPCP_SECONDARY_DNS:
bptr++;
- ((FAR uint8_t *) & ctx->sec_dns_addr)[0] = *bptr++;
- ((FAR uint8_t *) & ctx->sec_dns_addr)[1] = *bptr++;
- ((FAR uint8_t *) & ctx->sec_dns_addr)[2] = *bptr++;
- ((FAR uint8_t *) & ctx->sec_dns_addr)[3] = *bptr++;
+ ((FAR uint8_t *)&ctx->sec_dns_addr)[0] = *bptr++;
+ ((FAR uint8_t *)&ctx->sec_dns_addr)[1] = *bptr++;
+ ((FAR uint8_t *)&ctx->sec_dns_addr)[2] = *bptr++;
+ ((FAR uint8_t *)&ctx->sec_dns_addr)[3] = *bptr++;
netlib_set_ipv4dnsaddr(&ctx->sec_dns_addr);
break;
#endif
@@ -486,10 +486,10 @@ void ipcp_task(FAR struct ppp_context_s *ctx, FAR uint8_t
* buffer)
*bptr++ = IPCP_IPADDRESS;
*bptr++ = 0x6;
- *bptr++ = (uint8_t)((FAR uint8_t *) & ctx->local_ip)[0];
- *bptr++ = (uint8_t)((FAR uint8_t *) & ctx->local_ip)[1];
- *bptr++ = (uint8_t)((FAR uint8_t *) & ctx->local_ip)[2];
- *bptr++ = (uint8_t)((FAR uint8_t *) & ctx->local_ip)[3];
+ *bptr++ = (uint8_t)((FAR uint8_t *)&ctx->local_ip)[0];
+ *bptr++ = (uint8_t)((FAR uint8_t *)&ctx->local_ip)[1];
+ *bptr++ = (uint8_t)((FAR uint8_t *)&ctx->local_ip)[2];
+ *bptr++ = (uint8_t)((FAR uint8_t *)&ctx->local_ip)[3];
#ifdef IPCP_GET_PRI_DNS
if ((ctx->ipcp_state & IPCP_PRI_DNS_BIT) == 0)
@@ -498,10 +498,10 @@ void ipcp_task(FAR struct ppp_context_s *ctx, FAR uint8_t
* buffer)
*bptr++ = IPCP_PRIMARY_DNS;
*bptr++ = 0x6;
- *bptr++ = ((FAR uint8_t *) & ctx->pri_dns_addr)[0];
- *bptr++ = ((FAR uint8_t *) & ctx->pri_dns_addr)[1];
- *bptr++ = ((FAR uint8_t *) & ctx->pri_dns_addr)[2];
- *bptr++ = ((FAR uint8_t *) & ctx->pri_dns_addr)[3];
+ *bptr++ = ((FAR uint8_t *)&ctx->pri_dns_addr)[0];
+ *bptr++ = ((FAR uint8_t *)&ctx->pri_dns_addr)[1];
+ *bptr++ = ((FAR uint8_t *)&ctx->pri_dns_addr)[2];
+ *bptr++ = ((FAR uint8_t *)&ctx->pri_dns_addr)[3];
}
#endif
@@ -512,10 +512,10 @@ void ipcp_task(FAR struct ppp_context_s *ctx, FAR uint8_t
* buffer)
*bptr++ = IPCP_SECONDARY_DNS;
*bptr++ = 0x6;
- *bptr++ = ((FAR uint8_t *) & ctx->sec_dns_addr)[0];
- *bptr++ = ((FAR uint8_t *) & ctx->sec_dns_addr)[1];
- *bptr++ = ((FAR uint8_t *) & ctx->sec_dns_addr)[2];
- *bptr++ = ((FAR uint8_t *) & ctx->sec_dns_addr)[3];
+ *bptr++ = ((FAR uint8_t *)&ctx->sec_dns_addr)[0];
+ *bptr++ = ((FAR uint8_t *)&ctx->sec_dns_addr)[1];
+ *bptr++ = ((FAR uint8_t *)&ctx->sec_dns_addr)[2];
+ *bptr++ = ((FAR uint8_t *)&ctx->sec_dns_addr)[3];
}
#endif
diff --git a/netutils/pppd/ppp.c b/netutils/pppd/ppp.c
index 12a2349fe..0e27617fd 100644
--- a/netutils/pppd/ppp.c
+++ b/netutils/pppd/ppp.c
@@ -113,7 +113,7 @@ static void ppp_reject_protocol(FAR struct ppp_context_s
*ctx,
/* pkt->id = tid++; write tid */
pkt->len = htons(count + 6);
- *((FAR uint16_t *) (&pkt->data[0])) = htons(protocol);
+ *((FAR uint16_t *)(&pkt->data[0])) = htons(protocol);
ahdlc_tx(ctx, LCP, buffer, 0, (uint16_t)(count + 6), 0);
}
diff --git a/netutils/telnetc/telnetc.c b/netutils/telnetc/telnetc.c
index ce59bbad5..5051e3b8f 100644
--- a/netutils/telnetc/telnetc.c
+++ b/netutils/telnetc/telnetc.c
@@ -236,7 +236,7 @@ enum telnet_error_e _init_zlib(FAR struct telnet_s *telnet,
int deflate,
/* Allocate zstream box */
- if ((z = (z_stream *) calloc(1, sizeof(z_stream))) == 0)
+ if ((z = (z_stream *)calloc(1, sizeof(z_stream))) == 0)
{
return _error(telnet, __LINE__, __func__, TELNET_ENOMEM, err_fatal,
"malloc() failed: %d", errno);
@@ -381,8 +381,8 @@ static inline int _check_telopt(FAR struct telnet_s *telnet,
/* Retrieve RFC1143 option state */
-static inline struct telnet_rfc1143_s _get_rfc1143(FAR struct telnet_s *telnet,
- unsigned char telopt)
+static inline struct telnet_rfc1143_s
+_get_rfc1143(FAR struct telnet_s *telnet, unsigned char telopt)
{
struct telnet_rfc1143_s empty;
int i;
@@ -425,9 +425,9 @@ static inline void _set_rfc1143(FAR struct telnet_s *telnet,
/* we're going to need to track state for it, so grow the queue by 4 (four)
* elements and put the telopt into it; bail on allocation error. we go by
- * four because it seems like a reasonable guess as to the number of enabled
- * options for most simple code, and it allows for an acceptable number of
- * reallocations for complex code.
+ * four because it seems like a reasonable guess as to the number of
+ * enabled options for most simple code, and it allows for an acceptable
+ * number of reallocations for complex code.
*/
qtmp = (struct telnet_rfc1143_s *)
@@ -1307,7 +1307,9 @@ static void _process(FAR struct telnet_s *telnet, FAR
const char *buffer,
case TELNET_STATE_DATA:
- /* On an IAC byte, pass through all pending bytes and switch states
*/
+ /* On an IAC byte, pass through all pending bytes and switch
+ * states
+ */
if (byte == TELNET_IAC)
{
@@ -1421,8 +1423,9 @@ static void _process(FAR struct telnet_s *telnet, FAR
const char *buffer,
/* In 1998 MCCP used TELOPT 85 and the protocol defined an
* invalid subnegotiation sequence (IAC SB 85 WILL SE) to start
* compression. Subsequently MCCP version 2 was created in 2000
- * using TELOPT 86 and a valid subnegotiation (IAC SB 86 IAC SE).
- * libtelnet for now just captures and discards MCCPv1 sequences.
+ * using TELOPT 86 and a valid subnegotiation (IAC SB 86 IAC
+ * SE). libtelnet for now just captures and discards MCCPv1
+ * sequences.
*/
start = i + 2;
@@ -1455,10 +1458,11 @@ static void _process(FAR struct telnet_s *telnet, FAR
const char *buffer,
if (_subnegotiate(telnet) != 0)
{
- /* Any remaining bytes in the buffer are compressed. we have
- * to re-invoke telnet_recv to get those bytes inflated and
- * abort trying to process the remaining compressed bytes in
- * the current _process buffer argument.
+ /* Any remaining bytes in the buffer are compressed. we
+ * have to re-invoke telnet_recv to get those bytes
+ * inflated and abort trying to process the remaining
+ * compressed bytes in the current _process buffer
+ * argument.
*/
telnet_recv(telnet, &buffer[start], size - start);
@@ -1483,9 +1487,9 @@ static void _process(FAR struct telnet_s *telnet, FAR
const char *buffer,
}
break;
- /* Something else -- protocol error. attempt to process content
- * in subnegotiation buffer, then evaluate the given command as
- * an IAC code.
+ /* Something else -- protocol error. attempt to process
+ * content in subnegotiation buffer, then evaluate the given
+ * command as an IAC code.
*/
default:
@@ -1508,9 +1512,9 @@ static void _process(FAR struct telnet_s *telnet, FAR
const char *buffer,
}
else
{
- /* Recursive call to get the current input byte processed as
- * a regular IAC command. we could use a goto, but that
- * would be gross.
+ /* Recursive call to get the current input byte
+ * processed as a regular IAC command. we could use a
+ * goto, but that would be gross.
*/
_process(telnet, (char *)&byte, 1);
@@ -1877,8 +1881,8 @@ void telnet_subnegotiation(FAR struct telnet_s *telnet,
unsigned char telopt,
_sendu(telnet, bytes + 3, 2);
#if defined(HAVE_ZLIB)
- /* If we're a proxy and we just sent the COMPRESS2 marker, we must make sure
- * all further data is compressed if not already.
+ /* If we're a proxy and we just sent the COMPRESS2 marker, we must make
+ * sure all further data is compressed if not already.
*/
if (telnet->flags & TELNET_FLAG_PROXY && telopt == TELNET_TELOPT_COMPRESS2)
@@ -1934,9 +1938,9 @@ void telnet_begin_compress2(FAR struct telnet_s *telnet)
return;
}
- /* Send compression marker. we send directly to the event handler instead of
- * passing through _send because _send would result in the compress marker
- * itself being compressed.
+ /* Send compression marker. we send directly to the event handler instead
+ * of passing through _send because _send would result in the compress
+ * marker itself being compressed.
*/
ev.type = TELNET_EV_SEND;
diff --git a/netutils/thttpd/cgi-src/redirect.c
b/netutils/thttpd/cgi-src/redirect.c
index 42df5f650..943ac17c4 100644
--- a/netutils/thttpd/cgi-src/redirect.c
+++ b/netutils/thttpd/cgi-src/redirect.c
@@ -193,7 +193,7 @@ int main(int argc, char *argv[])
/* Open the redirects file. */
fp = fopen(".redirects", "r");
- if (fp == (FILE *) 0)
+ if (fp == NULL)
{
internal_error("Couldn't open .redirects file.");
errcode = 3;
diff --git a/netutils/thttpd/cgi-src/ssi.c b/netutils/thttpd/cgi-src/ssi.c
index 7104af2cc..9a2bb729f 100644
--- a/netutils/thttpd/cgi-src/ssi.c
+++ b/netutils/thttpd/cgi-src/ssi.c
@@ -99,81 +99,82 @@ static void internal_error(char *reason)
{
char *title = "500 Internal Error";
- printf("\
-<HTML><HEAD><TITLE>%s</TITLE></HEAD>\n\
-<BODY><H2>%s</H2>\n\
-Something unusual went wrong during a server-side-includes request:\n\
-<BLOCKQUOTE>\n\
-%s\n\
-</BLOCKQUOTE>\n\
-</BODY></HTML>\n", title, title, reason);
+ printf("<HTML><HEAD><TITLE>%s</TITLE></HEAD>\n"
+ "<BODY><H2>%s</H2>\n"
+ "Something unusual went wrong during a server-side-includes request:\n"
+ "<BLOCKQUOTE>\n"
+ "%s\n"
+ "</BLOCKQUOTE>\n"
+ "</BODY></HTML>\n",
+ title, title, reason);
}
static void not_found(char *filename)
{
char *title = "404 Not Found";
- printf("\
-<HTML><HEAD><TITLE>%s</TITLE></HEAD>\n\
-<BODY><H2>%s</H2>\n\
-The requested server-side-includes filename, %s,\n\
-does not seem to exist.\n\
-</BODY></HTML>\n", title, title, filename);
+ printf("<HTML><HEAD><TITLE>%s</TITLE></HEAD>\n"
+ "<BODY><H2>%s</H2>\n"
+ "The requested server-side-includes filename, %s,\n"
+ "does not seem to exist.\n"
+ "</BODY></HTML>\n",
+ title, title, filename);
}
static void not_found2(char *directive, char *tag, char *filename)
{
char *title = "Not Found";
- printf("\
-<HR><H2>%s</H2>\n\
-The filename requested in a %s %s directive, %s,\n\
-does not seem to exist.\n\
-<HR>\n", title, directive, tag, filename);
+ printf("<HR><H2>%s</H2>\n"
+ "The filename requested in a %s %s directive, %s,\n"
+ "does not seem to exist.\n"
+ "<HR>\n",
+ title, directive, tag, filename);
}
static void not_permitted(char *directive, char *tag, char *val)
{
char *title = "Not Permitted";
- printf("\
-<HR><H2>%s</H2>\n\
-The filename requested in the %s %s=%s directive\n\
-may not be fetched.\n\
-<HR>\n", title, directive, tag, val);
+ printf("<HR><H2>%s</H2>\n"
+ "The filename requested in the %s %s=%s directive\n"
+ "may not be fetched.\n"
+ "<HR>\n",
+ title, directive, tag, val);
}
static void unknown_directive(char *filename, char *directive)
{
char *title = "Unknown Directive";
- printf("\
-<HR><H2>%s</H2>\n\
-The requested server-side-includes filename, %s,\n\
-tried to use an unknown directive, %s.\n\
-<HR>\n", title, filename, directive);
+ printf("<HR><H2>%s</H2>\n"
+ "The requested server-side-includes filename, %s,\n"
+ "tried to use an unknown directive, %s.\n"
+ "<HR>\n",
+ title, filename, directive);
}
static void unknown_tag(char *filename, char *directive, char *tag)
{
char *title = "Unknown Tag";
- printf("\
-<HR><H2>%s</H2>\n\
-The requested server-side-includes filename, %s,\n\
-tried to use the directive %s with an unknown tag, %s.\n\
-<HR>\n", title, filename, directive, tag);
+ printf("<HR><H2>%s</H2>\n"
+ "The requested server-side-includes filename, %s,\n"
+ "tried to use the directive %s with an unknown tag, %s.\n"
+ "<HR>\n",
+ title, filename, directive, tag);
}
-static void unknown_value(char *filename, char *directive, char *tag, char
*val)
+static void unknown_value(char *filename, char *directive,
+ char *tag, char *val)
{
char *title = "Unknown Value";
- printf("\
-<HR><H2>%s</H2>\n\
-The requested server-side-includes filename, %s,\n\
-tried to use the directive %s %s with an unknown value, %s.\n\
-<HR>\n", title, filename, directive, tag, val);
+ printf("<HR><H2>%s</H2>\n"
+ "The requested server-side-includes filename, %s,\n"
+ "tried to use the directive %s %s with an unknown value, %s.\n"
+ "<HR>\n",
+ title, filename, directive, tag, val);
}
static int get_filename(char *vfilename, char *filename,
@@ -223,6 +224,7 @@ static int get_filename(char *vfilename, char *filename,
not_permitted(directive, tag, val);
return -1;
}
+
if (fl + 1 + strlen(val) >= fnsize)
{
return -1;
@@ -235,6 +237,7 @@ static int get_filename(char *vfilename, char *filename,
cp = &fn[strlen(fn)];
*cp = '/';
}
+
strcpy(++cp, val);
}
else
@@ -242,6 +245,7 @@ static int get_filename(char *vfilename, char *filename,
unknown_tag(filename, directive, tag);
return -1;
}
+
return 0;
}
@@ -269,12 +273,13 @@ static int check_filename(char *filename)
cgi_pattern = CGI_PATTERN;
}
#endif /* CGI_PATTERN */
+
inited = 1;
}
/* ../ is not permitted. */
- if (strstr(filename, "../") !=NULL)
+ if (strstr(filename, "../") != NULL)
{
return 0;
}
@@ -285,7 +290,8 @@ static int check_filename(char *filename)
fnl = strlen(filename);
if (strcmp(filename, CONFIG_AUTH_FILE) == 0 ||
(fnl >= sizeof(CONFIG_AUTH_FILE) &&
- strcmp(&filename[fnl - sizeof(CONFIG_AUTH_FILE) + 1], CONFIG_AUTH_FILE)
== 0 &&
+ strcmp(&filename[fnl - sizeof(CONFIG_AUTH_FILE) + 1],
+ CONFIG_AUTH_FILE) == 0 &&
filename[fnl - sizeof(CONFIG_AUTH_FILE)] == '/'))
{
return 0;
@@ -342,6 +348,7 @@ static int check_filename(char *filename)
{
return 0;
}
+
return 1;
}
@@ -440,7 +447,8 @@ static void do_include(FILE *instream, char *vfilename,
char *filename,
/* Inserts the text of another document into the parsed document. */
- ret = get_filename(vfilename, filename, directive, tag, val, g_iobuffer1,
BUFFER_SIZE);
+ ret = get_filename(vfilename, filename, directive, tag, val, g_iobuffer1,
+ BUFFER_SIZE);
if (ret < 0)
{
return;
@@ -453,7 +461,7 @@ static void do_include(FILE *instream, char *vfilename,
char *filename,
}
instream2 = fopen(g_iobuffer1, "r");
- if (instream2 == (FILE *) 0)
+ if (instream2 == NULL)
{
not_found2(directive, tag, g_iobuffer1);
return;
@@ -461,7 +469,7 @@ static void do_include(FILE *instream, char *vfilename,
char *filename,
if (strcmp(tag, "virtual") == 0)
{
- if (strlen(val) <BUFFER_SIZE)
+ if (strlen(val) < BUFFER_SIZE)
{
strcpy(g_iobuffer2, val);
}
@@ -482,6 +490,7 @@ static void do_include(FILE *instream, char *vfilename,
char *filename,
cp = &g_iobuffer2[strlen(g_iobuffer2)];
*cp = '/';
}
+
strcpy(++cp, val);
}
else
@@ -500,8 +509,9 @@ static void do_echo(FILE *instream, char *vfilename, char
*filename,
char *cp;
/* Prints the value of one of the include variables. Any dates are
- * printed subject to the currently configured g_timeformat. The only valid
- * tag is var, whose value is the name of the variable you wish to echo.
+ * printed subject to the currently configured g_timeformat. The only
+ * valid tag is var, whose value is the name of the variable you wish
+ * to echo.
*/
if (strcmp(tag, "var") != 0)
@@ -585,7 +595,8 @@ static void do_fsize(FILE *instream, char *vfilename, char
*filename,
/* Prints the size of the specified file. */
- ret = get_filename(vfilename, filename, directive, tag, val, g_iobuffer1,
BUFFER_SIZE);
+ ret = get_filename(vfilename, filename, directive, tag, val, g_iobuffer1,
+ BUFFER_SIZE);
if (ret < 0)
{
return;
@@ -607,7 +618,8 @@ static void do_flastmod(FILE *instream, char *vfilename,
char *filename,
/* Prints the last modification date of the specified file. */
- ret = get_filename(vfilename, filename, directive, tag, val, g_iobuffer1,
BUFFER_SIZE);
+ ret = get_filename(vfilename, filename, directive, tag, val, g_iobuffer1,
+ BUFFER_SIZE);
if (ret < 0)
{
return;
@@ -618,6 +630,7 @@ static void do_flastmod(FILE *instream, char *vfilename,
char *filename,
not_found2(directive, tag, g_iobuffer1);
return;
}
+
show_time(g_sb.st_mtime, 0);
}
@@ -635,7 +648,7 @@ static void parse(FILE *instream, char *vfilename, char
*filename, char *str)
ntags = 0;
cp = directive;
- for (;;)
+ for (; ; )
{
cp = strpbrk(cp, " \t\n\r\"");
if (cp == (char *)0)
@@ -718,11 +731,13 @@ static void parse(FILE *instream, char *vfilename, char
*filename, char *str)
switch (dirn)
{
case DI_CONFIG:
- do_config(instream, vfilename, filename, directive, g_tags[i], val);
+ do_config(instream, vfilename, filename, directive, g_tags[i],
+ val);
break;
case DI_INCLUDE:
- do_include(instream, vfilename, filename, directive, g_tags[i], val);
+ do_include(instream, vfilename, filename, directive, g_tags[i],
+ val);
break;
case DI_ECHO:
@@ -734,7 +749,8 @@ static void parse(FILE *instream, char *vfilename, char
*filename, char *str)
break;
case DI_FLASTMOD:
- do_flastmod(instream, vfilename, filename, directive, g_tags[i],
val);
+ do_flastmod(instream, vfilename, filename, directive, g_tags[i],
+ val);
break;
}
}
@@ -915,12 +931,13 @@ int main(int argc, char *argv[])
path_info = "";
}
- g_url = (char*)malloc(strlen(script_name) + strlen(path_info) + 1);
+ g_url = (char *)malloc(strlen(script_name) + strlen(path_info) + 1);
if (!g_url)
{
internal_error("Out of memory.");
return 2;
}
+
sprintf(g_url, "%s%s", script_name, path_info);
/* Get the name of the file to parse. */
diff --git a/netutils/thttpd/libhttpd.c b/netutils/thttpd/libhttpd.c
index 561256cad..eab4fdbd4 100644
--- a/netutils/thttpd/libhttpd.c
+++ b/netutils/thttpd/libhttpd.c
@@ -3123,21 +3123,21 @@ void httpd_destroy_conn(httpd_conn *hc)
{
if (hc->initialized)
{
- httpd_free((void *)hc->read_buf);
- httpd_free((void *)hc->decodedurl);
- httpd_free((void *)hc->origfilename);
- httpd_free((void *)hc->expnfilename);
- httpd_free((void *)hc->encodings);
- httpd_free((void *)hc->pathinfo);
- httpd_free((void *)hc->query);
- httpd_free((void *)hc->accept);
- httpd_free((void *)hc->accepte);
- httpd_free((void *)hc->reqhost);
- httpd_free((void *)hc->hostdir);
- httpd_free((void *)hc->remoteuser);
- httpd_free((void *)hc->buffer);
+ httpd_free(hc->read_buf);
+ httpd_free(hc->decodedurl);
+ httpd_free(hc->origfilename);
+ httpd_free(hc->expnfilename);
+ httpd_free(hc->encodings);
+ httpd_free(hc->pathinfo);
+ httpd_free(hc->query);
+ httpd_free(hc->accept);
+ httpd_free(hc->accepte);
+ httpd_free(hc->reqhost);
+ httpd_free(hc->hostdir);
+ httpd_free(hc->remoteuser);
+ httpd_free(hc->buffer);
#ifdef CONFIG_THTTPD_TILDE_MAP2
- httpd_free((void *)hc->altdir);
+ httpd_free(hc->altdir);
#endif /* CONFIG_THTTPD_TILDE_MAP2 */
hc->initialized = 0;
}
diff --git a/netutils/thttpd/thttpd.c b/netutils/thttpd/thttpd.c
index bc07f0ca0..07cb4da5f 100644
--- a/netutils/thttpd/thttpd.c
+++ b/netutils/thttpd/thttpd.c
@@ -152,7 +152,7 @@ static void shut_down(void)
if (connects[cnum].hc != NULL)
{
httpd_destroy_conn(connects[cnum].hc);
- httpd_free((void *)connects[cnum].hc);
+ httpd_free(connects[cnum].hc);
connects[cnum].hc = NULL;
}
}
@@ -170,7 +170,7 @@ static void shut_down(void)
}
tmr_destroy();
- httpd_free((void *)connects);
+ httpd_free(connects);
}
static int handle_newconnect(FAR struct timeval *tv, int listen_fd)
@@ -638,7 +638,7 @@ static void linger_clear_connection(ClientData client_data,
struct connect_s *conn;
ninfo("Clear connection\n");
- conn = (struct connect_s *) client_data.p;
+ conn = (struct connect_s *)client_data.p;
conn->linger_timer = NULL;
really_clear_connection(conn);
}
diff --git a/netutils/usrsock_rpmsg/usrsock_rpmsg_client.c
b/netutils/usrsock_rpmsg/usrsock_rpmsg_client.c
index 249f575b2..731cf976b 100644
--- a/netutils/usrsock_rpmsg/usrsock_rpmsg_client.c
+++ b/netutils/usrsock_rpmsg/usrsock_rpmsg_client.c
@@ -262,7 +262,7 @@ int main(int argc, char *argv[])
while (1)
{
struct pollfd pfd;
- void *buf;
+ FAR void *buf;
uint32_t len;
/* Wait the packet ready */
diff --git a/netutils/usrsock_rpmsg/usrsock_rpmsg_server.c
b/netutils/usrsock_rpmsg/usrsock_rpmsg_server.c
index dd37df9b0..4782636b0 100644
--- a/netutils/usrsock_rpmsg/usrsock_rpmsg_server.c
+++ b/netutils/usrsock_rpmsg/usrsock_rpmsg_server.c
@@ -442,7 +442,7 @@ static int usrsock_rpmsg_sendto_handler(struct
rpmsg_endpoint *ept,
else
{
ret = psock_sendto(&priv->socks[req->usockid],
- (const void *)(req + 1) + req->addrlen, req->buflen,
+ (const char *)(req + 1) + req->addrlen, req->buflen,
req->flags,
req->addrlen ? (const struct sockaddr *)(req + 1) : NULL,
req->addrlen);
diff --git a/netutils/wakeonlan/wol_main.c b/netutils/wakeonlan/wol_main.c
index 668e10a96..e756e1780 100644
--- a/netutils/wakeonlan/wol_main.c
+++ b/netutils/wakeonlan/wol_main.c
@@ -66,7 +66,7 @@ static int send_wol(FAR struct ether_addr *dest,
}
ret = setsockopt(sockfd, SOL_SOCKET, SO_BROADCAST,
- (void *)&optval, sizeof(optval));
+ &optval, sizeof(optval));
if (ret < 0)
{
fprintf(stderr, "failed to set socket options: %s\n", strerror(errno));
diff --git a/netutils/webclient/webclient.c b/netutils/webclient/webclient.c
index 95b72b469..a24c877cd 100644
--- a/netutils/webclient/webclient.c
+++ b/netutils/webclient/webclient.c
@@ -1420,8 +1420,7 @@ int webclient_perform(FAR struct webclient_context *ctx)
/* Check return value one by one */
ret = setsockopt(conn->sockfd, SOL_SOCKET, SO_RCVTIMEO,
- (FAR const void *)&tv,
- sizeof(struct timeval));
+ &tv, sizeof(struct timeval));
if (ret != 0)
{
ret = -errno;
@@ -1430,8 +1429,7 @@ int webclient_perform(FAR struct webclient_context *ctx)
}
ret = setsockopt(conn->sockfd, SOL_SOCKET, SO_SNDTIMEO,
- (FAR const void *)&tv,
- sizeof(struct timeval));
+ &tv, sizeof(struct timeval));
if (ret != 0)
{
ret = -errno;
diff --git a/netutils/xmlrpc/xmlparser.c b/netutils/xmlrpc/xmlparser.c
index 7405e8168..51e283cd6 100644
--- a/netutils/xmlrpc/xmlparser.c
+++ b/netutils/xmlrpc/xmlparser.c
@@ -310,7 +310,7 @@ static int xmlrpc_parsemethod(struct parsebuf_s *pbuf)
int ret = XMLRPC_PARSE_ERROR;
int type;
- memset((void *)&g_xmlcall, 0, sizeof(struct xmlrpc_s));
+ memset(&g_xmlcall, 0, sizeof(struct xmlrpc_s));
/* Look for the methodName tag */
diff --git a/nshlib/nsh_console.c b/nshlib/nsh_console.c
index d383c8e15..7fa918e3c 100644
--- a/nshlib/nsh_console.c
+++ b/nshlib/nsh_console.c
@@ -45,10 +45,10 @@
#ifdef CONFIG_FILE_STREAM
struct serialsave_s
{
- int cn_errfd; /* Re-directed error output file descriptor */
- int cn_outfd; /* Re-directed output file descriptor */
- FILE *cn_errstream; /* Re-directed error output stream */
- FILE *cn_outstream; /* Re-directed output stream */
+ int cn_errfd; /* Re-directed error output file descriptor */
+ int cn_outfd; /* Re-directed output file descriptor */
+ FILE *cn_errstream; /* Re-directed error output stream */
+ FILE *cn_outstream; /* Re-directed output stream */
};
#endif
diff --git a/nshlib/nsh_console.h b/nshlib/nsh_console.h
index 895f98d51..219ff5832 100644
--- a/nshlib/nsh_console.h
+++ b/nshlib/nsh_console.h
@@ -150,15 +150,15 @@ struct console_stdio_s
#ifdef CONFIG_FILE_STREAM
#ifdef CONFIG_NSH_ALTCONDEV
- int cn_confd; /* Console I/O file descriptor */
+ int cn_confd; /* Console I/O file descriptor */
#endif
- int cn_outfd; /* Output file descriptor (possibly redirected) */
- int cn_errfd; /* Error Output file descriptor (possibly redirected) */
+ int cn_outfd; /* Output file descriptor (possibly redirected) */
+ int cn_errfd; /* Error Output file descriptor (possibly redirected) */
#ifdef CONFIG_NSH_ALTCONDEV
- FILE *cn_constream; /* Console I/O stream (possibly redirected) */
+ FILE *cn_constream; /* Console I/O stream (possibly redirected) */
#endif
- FILE *cn_outstream; /* Output stream */
- FILE *cn_errstream; /* Error Output stream */
+ FILE *cn_outstream; /* Output stream */
+ FILE *cn_errstream; /* Error Output stream */
#endif
#ifdef CONFIG_NSH_VARS
diff --git a/nshlib/nsh_romfsetc.c b/nshlib/nsh_romfsetc.c
index 166ca075f..90d4e7a18 100644
--- a/nshlib/nsh_romfsetc.c
+++ b/nshlib/nsh_romfsetc.c
@@ -78,7 +78,7 @@
int nsh_romfsetc(void)
{
- int ret;
+ int ret;
#ifndef CONFIG_NSH_CROMFSETC
struct boardioc_romdisk_s desc;
diff --git a/nshlib/nsh_telnetlogin.c b/nshlib/nsh_telnetlogin.c
index 4b4b0b496..fc032cec6 100644
--- a/nshlib/nsh_telnetlogin.c
+++ b/nshlib/nsh_telnetlogin.c
@@ -58,12 +58,12 @@
static void nsh_telnetecho(FAR struct console_stdio_s *pstate,
uint8_t is_use)
{
- uint8_t optbuf[4];
+ char optbuf[4];
optbuf[0] = TELNET_IAC;
optbuf[1] = (is_use == TELNET_USE_ECHO) ? TELNET_WILL : TELNET_DO;
optbuf[2] = 1;
optbuf[3] = 0;
- fputs((char *)optbuf, pstate->cn_outstream);
+ fputs(optbuf, pstate->cn_outstream);
fflush(pstate->cn_outstream);
}
diff --git a/nshlib/nsh_test.c b/nshlib/nsh_test.c
index d2f48db1d..b23b3d7cd 100644
--- a/nshlib/nsh_test.c
+++ b/nshlib/nsh_test.c
@@ -181,7 +181,7 @@ static inline int unaryexpression(FAR struct nsh_vtbl_s
*vtbl,
{
struct stat buf;
FAR char *fullpath;
- int ret;
+ int ret;
/* -n STRING */
diff --git a/platform/mikroe-stm32f4/mikroe_configdata.c
b/platform/mikroe-stm32f4/mikroe_configdata.c
index 77cec6525..be54fd0bf 100644
--- a/platform/mikroe-stm32f4/mikroe_configdata.c
+++ b/platform/mikroe-stm32f4/mikroe_configdata.c
@@ -94,10 +94,10 @@ int platform_setconfig(enum config_data_e id, int instance,
config.id = (enum config_data_e)id;
config.instance = instance;
- config.configdata = (FAR uint8_t *) configdata;
+ config.configdata = (FAR uint8_t *)configdata;
config.len = datalen;
- ret = ioctl(fd, CFGDIOC_SETCONFIG, (unsigned long) &config);
+ ret = ioctl(fd, CFGDIOC_SETCONFIG, (unsigned long)&config);
close(fd);
return ret;
@@ -200,9 +200,9 @@ int platform_getconfig(enum config_data_e id, int instance,
#endif
#ifdef CONFIG_MIKROE_STM32F4_CONFIGDATA_PART
- struct config_data_s config;
- int ret;
- int fd;
+ struct config_data_s config;
+ int ret;
+ int fd;
/* Try to open the /dev/config device file */
@@ -220,7 +220,7 @@ int platform_getconfig(enum config_data_e id, int instance,
config.configdata = configdata;
config.len = datalen;
- ret = ioctl(fd, CFGDIOC_GETCONFIG, (unsigned long) &config);
+ ret = ioctl(fd, CFGDIOC_GETCONFIG, (unsigned long)&config);
close(fd);
return ret;
diff --git a/system/cfgdata/cfgdata_main.c b/system/cfgdata/cfgdata_main.c
index 2c93a9bb2..962fce1ce 100644
--- a/system/cfgdata/cfgdata_main.c
+++ b/system/cfgdata/cfgdata_main.c
@@ -237,11 +237,11 @@ static void cfgdatacmd_parse_byte_array(struct
config_data_s *cfg,
static void cfgdatacmd_set(int argc, char *argv[])
{
- int ret;
- int fd;
- int x;
- struct config_data_s cfg;
- uint8_t data[32];
+ int ret;
+ int fd;
+ int x;
+ struct config_data_s cfg;
+ uint8_t data[32];
#ifdef CONFIG_MTD_CONFIG_NAMED
@@ -369,9 +369,9 @@ static void cfgdatacmd_set(int argc, char *argv[])
static void cfgdatacmd_unset(int argc, char *argv[])
{
- int ret;
- int fd;
- struct config_data_s cfg;
+ int ret;
+ int fd;
+ struct config_data_s cfg;
#ifdef CONFIG_MTD_CONFIG_NAMED
/* Copy the name to the cfg struct */
@@ -432,11 +432,11 @@ static void cfgdatacmd_unset(int argc, char *argv[])
static void cfgdatacmd_print(int argc, char *argv[])
{
- int ret;
- int fd;
- int x;
- struct config_data_s cfg;
- bool isstring;
+ int ret;
+ int fd;
+ int x;
+ struct config_data_s cfg;
+ bool isstring;
#ifdef CONFIG_MTD_CONFIG_NAMED
@@ -541,12 +541,12 @@ static void cfgdatacmd_print(int argc, char *argv[])
static void cfgdatacmd_show_all_config_items(void)
{
- int ret;
- int fd;
- int x;
- struct config_data_s cfg;
- char fmtstr[24];
- bool isstring;
+ int ret;
+ int fd;
+ int x;
+ struct config_data_s cfg;
+ char fmtstr[24];
+ bool isstring;
/* Try to open the /dev/config file */
diff --git a/system/i2c/i2ctool.h b/system/i2c/i2ctool.h
index fdad24a70..e1596457a 100644
--- a/system/i2c/i2ctool.h
+++ b/system/i2c/i2ctool.h
@@ -134,8 +134,8 @@ struct i2ctool_s
/* Output streams */
#ifdef CONFIG_I2CTOOL_OUTDEV
- int ss_outfd; /* Output file descriptor */
- FILE *ss_outstream; /* Output stream */
+ int ss_outfd; /* Output file descriptor */
+ FILE *ss_outstream; /* Output stream */
#endif
};
diff --git a/system/nxlooper/nxlooper.c b/system/nxlooper/nxlooper.c
index 86ede96ff..5efb39d7f 100644
--- a/system/nxlooper/nxlooper.c
+++ b/system/nxlooper/nxlooper.c
@@ -759,7 +759,7 @@ int nxlooper_setvolume(FAR struct nxlooper_s *plooper,
uint16_t volume)
#ifndef CONFIG_AUDIO_EXCLUDE_PAUSE_RESUME
int nxlooper_pause(FAR struct nxlooper_s *plooper)
{
- int ret = OK;
+ int ret = OK;
if (plooper->loopstate == NXLOOPER_STATE_LOOPING)
{
diff --git a/system/nxplayer/nxplayer.c b/system/nxplayer/nxplayer.c
index 7c09fa7dd..64665db31 100644
--- a/system/nxplayer/nxplayer.c
+++ b/system/nxplayer/nxplayer.c
@@ -74,9 +74,9 @@
#ifdef CONFIG_NXPLAYER_FMT_FROM_EXT
struct nxplayer_ext_fmt_s
{
- const char *ext;
- uint16_t format;
- CODE int (*getsubformat)(int fd);
+ FAR const char *ext;
+ uint16_t format;
+ CODE int (*getsubformat)(int fd);
};
#endif
@@ -179,10 +179,8 @@ static int _open_with_http(const char *fullurl)
tv.tv_sec = 10; /* TODO */
tv.tv_usec = 0;
- setsockopt(s, SOL_SOCKET, SO_RCVTIMEO, (FAR const void *)&tv,
- sizeof(struct timeval));
- setsockopt(s, SOL_SOCKET, SO_SNDTIMEO, (FAR const void *)&tv,
- sizeof(struct timeval));
+ setsockopt(s, SOL_SOCKET, SO_RCVTIMEO, &tv, sizeof(struct timeval));
+ setsockopt(s, SOL_SOCKET, SO_SNDTIMEO, &tv, sizeof(struct timeval));
struct sockaddr_in server;
server.sin_family = AF_INET;
@@ -472,8 +470,8 @@ static int nxplayer_opendevice(FAR struct nxplayer_s
*pplayer, int format,
#ifdef CONFIG_AUDIO_FORMAT_MIDI
int nxplayer_getmidisubformat(int fd)
{
- char type[2];
- int ret;
+ char type[2];
+ int ret;
/* Seek to location 8 in the file (the format type) */
@@ -516,9 +514,9 @@ static inline int nxplayer_fmtfromextension(FAR struct
nxplayer_s *pplayer,
FAR const char *pfilename,
FAR int *subfmt)
{
- const char *pext;
- uint8_t x;
- uint8_t c;
+ FAR const char *pext;
+ uint8_t x;
+ uint8_t c;
/* Find the file extension, if any */
@@ -750,23 +748,23 @@ static int nxplayer_enqueuebuffer(FAR struct nxplayer_s
*pplayer,
*
****************************************************************************/
-static void *nxplayer_playthread(pthread_addr_t pvarg)
+static FAR void *nxplayer_playthread(pthread_addr_t pvarg)
{
- struct nxplayer_s *pplayer = (struct nxplayer_s *)pvarg;
- struct audio_msg_s msg;
- struct audio_buf_desc_s buf_desc;
- ssize_t size;
- bool running = true;
- bool streaming = true;
- bool failed = false;
- struct ap_buffer_info_s buf_info;
- FAR struct ap_buffer_s **buffers;
- unsigned int prio;
+ FAR struct nxplayer_s *pplayer = (FAR struct nxplayer_s *)pvarg;
+ struct audio_msg_s msg;
+ struct audio_buf_desc_s buf_desc;
+ ssize_t size;
+ bool running = true;
+ bool streaming = true;
+ bool failed = false;
+ struct ap_buffer_info_s buf_info;
+ FAR struct ap_buffer_s **buffers;
+ unsigned int prio;
#ifdef CONFIG_DEBUG_FEATURES
- int outstanding = 0;
+ int outstanding = 0;
#endif
- int x;
- int ret;
+ int x;
+ int ret;
audinfo("Entry\n");
@@ -1419,7 +1417,7 @@ int nxplayer_setbalance(FAR struct nxplayer_s *pplayer,
uint16_t balance)
#ifndef CONFIG_AUDIO_EXCLUDE_PAUSE_RESUME
int nxplayer_pause(FAR struct nxplayer_s *pplayer)
{
- int ret = OK;
+ int ret = OK;
if (pplayer->state == NXPLAYER_STATE_PLAYING)
{
@@ -1705,8 +1703,8 @@ int nxplayer_setdevice(FAR struct nxplayer_s *pplayer,
#ifndef CONFIG_AUDIO_EXCLUDE_STOP
int nxplayer_stop(FAR struct nxplayer_s *pplayer)
{
- struct audio_msg_s term_msg;
- FAR void *value;
+ struct audio_msg_s term_msg;
+ FAR void *value;
DEBUGASSERT(pplayer != NULL);
@@ -2111,7 +2109,7 @@ FAR struct nxplayer_s *nxplayer_create(void)
/* Allocate the memory */
- pplayer = (FAR struct nxplayer_s *) malloc(sizeof(struct nxplayer_s));
+ pplayer = (FAR struct nxplayer_s *)malloc(sizeof(struct nxplayer_s));
if (pplayer == NULL)
{
return NULL;
diff --git a/system/nxplayer/nxplayer_main.c b/system/nxplayer/nxplayer_main.c
index f7d9145f3..f28cfe239 100644
--- a/system/nxplayer/nxplayer_main.c
+++ b/system/nxplayer/nxplayer_main.c
@@ -256,7 +256,7 @@ static const int g_nxplayer_cmd_count =
sizeof(g_nxplayer_cmds) /
static int nxplayer_cmd_play(FAR struct nxplayer_s *pplayer, char *parg)
{
- int ret;
+ int ret;
/* Try to play the file specified */
diff --git a/system/nxrecorder/nxrecorder.c b/system/nxrecorder/nxrecorder.c
index b1527b82b..7f4054537 100644
--- a/system/nxrecorder/nxrecorder.c
+++ b/system/nxrecorder/nxrecorder.c
@@ -223,23 +223,23 @@ static int nxrecorder_enqueuebuffer(FAR struct
nxrecorder_s *precorder,
*
****************************************************************************/
-static void *nxrecorder_recordthread(pthread_addr_t pvarg)
+static FAR void *nxrecorder_recordthread(pthread_addr_t pvarg)
{
- struct nxrecorder_s *precorder = (struct nxrecorder_s *)pvarg;
- struct audio_msg_s msg;
- struct audio_buf_desc_s buf_desc;
- ssize_t size;
- bool running = true;
- bool streaming = true;
- bool failed = false;
- struct ap_buffer_info_s buf_info;
- FAR struct ap_buffer_s **pbuffers;
- unsigned int prio;
+ FAR struct nxrecorder_s *precorder = (FAR struct nxrecorder_s *)pvarg;
+ struct audio_msg_s msg;
+ struct audio_buf_desc_s buf_desc;
+ ssize_t size;
+ bool running = true;
+ bool streaming = true;
+ bool failed = false;
+ struct ap_buffer_info_s buf_info;
+ FAR struct ap_buffer_s **pbuffers;
+ unsigned int prio;
#ifdef CONFIG_DEBUG_FEATURES
- int outstanding = 0;
+ int outstanding = 0;
#endif
- int x;
- int ret;
+ int x;
+ int ret;
audinfo("Entry\n");
@@ -711,8 +711,8 @@ int nxrecorder_setdevice(FAR struct nxrecorder_s *precorder,
#ifndef CONFIG_AUDIO_EXCLUDE_STOP
int nxrecorder_stop(FAR struct nxrecorder_s *precorder)
{
- struct audio_msg_s term_msg;
- FAR void *value;
+ struct audio_msg_s term_msg;
+ FAR void *value;
DEBUGASSERT(precorder != NULL);
@@ -956,8 +956,7 @@ FAR struct nxrecorder_s *nxrecorder_create(void)
/* Allocate the memory */
- precorder = (FAR struct nxrecorder_s *) malloc(
- sizeof(struct nxrecorder_s));
+ precorder = (FAR struct nxrecorder_s *)malloc(sizeof(struct nxrecorder_s));
if (precorder == NULL)
{
return NULL;
diff --git a/system/popen/popen.c b/system/popen/popen.c
index f02ca3b81..338ce5dcb 100644
--- a/system/popen/popen.c
+++ b/system/popen/popen.c
@@ -68,7 +68,7 @@ struct popen_file_s
* were created within the popen() call using the fork() function, and the
* child invoked the sh utility using the call:
*
- * execl(shell path, "sh", "-c", command, (char *)0);
+ * execl(shell path, "sh", "-c", command, NULL);
*
* where shell path is an unspecified pathname for the sh utility.
*
diff --git a/system/spi/spi_exch.c b/system/spi/spi_exch.c
index 9b3772b93..768fccfca 100644
--- a/system/spi/spi_exch.c
+++ b/system/spi/spi_exch.c
@@ -41,7 +41,7 @@
****************************************************************************/
#define ISHEX(x) ((((x)>='0') && ((x)<='9')) || ((toupper(x)>='A') &&
(toupper(x)<='F')))
-#define HTOI(x) ( (((x)>='0') && ((x)<='9')) ? (x)-'0':toupper(x)-'A'+10 )
+#define HTOI(x) ((((x)>='0') && ((x)<='9')) ? (x)-'0':toupper(x)-'A'+10)
int spicmd_exch(FAR struct spitool_s *spitool, int argc, FAR char **argv)
{
diff --git a/system/spi/spi_main.c b/system/spi/spi_main.c
index 68a6461c3..63aa45d62 100644
--- a/system/spi/spi_main.c
+++ b/system/spi/spi_main.c
@@ -186,8 +186,8 @@ static int spi_execute(FAR struct spitool_s *spitool, int
argc,
{
FAR const struct cmdmap_s *cmdmap;
FAR const char *cmd;
- cmd_t handler;
- int ret;
+ cmd_t handler;
+ int ret;
/* The form of argv is:
*
diff --git a/system/spi/spitool.h b/system/spi/spitool.h
index b1cb66b43..7af9f7953 100644
--- a/system/spi/spitool.h
+++ b/system/spi/spitool.h
@@ -138,8 +138,8 @@ struct spitool_s
/* Output streams */
#ifdef CONFIG_SPITOOL_OUTDEV
- int ss_outfd; /* Output file descriptor */
- FILE *ss_outstream; /* Output stream */
+ int ss_outfd; /* Output file descriptor */
+ FILE *ss_outstream; /* Output stream */
#endif
};
diff --git a/system/termcurses/tcurses_vt100.c
b/system/termcurses/tcurses_vt100.c
index 3c7b49115..3ee01d4c7 100644
--- a/system/termcurses/tcurses_vt100.c
+++ b/system/termcurses/tcurses_vt100.c
@@ -736,7 +736,7 @@ static int tcurses_vt100_clear(FAR struct termcurses_s
*dev, int type)
int ret = -ENOSYS;
int fd;
- priv = (FAR struct tcurses_vt100_s *) dev;
+ priv = (FAR struct tcurses_vt100_s *)dev;
fd = priv->out_fd;
/* Perform operation based on type */
@@ -908,7 +908,7 @@ static int tcurses_vt100_setcolors(FAR struct termcurses_s
*dev,
int fd;
char str[48];
- priv = (FAR struct tcurses_vt100_s *) dev;
+ priv = (FAR struct tcurses_vt100_s *)dev;
fd = priv->out_fd;
/* Test if FG color to be set */
@@ -961,7 +961,7 @@ static int tcurses_vt100_getwinsize(FAR struct termcurses_s
*dev,
int delay;
int len;
- priv = (FAR struct tcurses_vt100_s *) dev;
+ priv = (FAR struct tcurses_vt100_s *)dev;
fd = priv->out_fd;
/* First try the TIOCGWINSZ ioctl */
@@ -1055,7 +1055,7 @@ static int tcurses_vt100_setattributes(FAR struct
termcurses_s *dev,
int fd;
char str[48];
- priv = (FAR struct tcurses_vt100_s *) dev;
+ priv = (FAR struct tcurses_vt100_s *)dev;
fd = priv->out_fd;
/* Test for cursor hide */
@@ -1127,22 +1127,22 @@ static int tcurses_vt100_getkeycode(FAR struct
termcurses_s *dev,
FAR int *keymodifiers)
{
FAR struct tcurses_vt100_s *priv;
- const struct keycodes_s *pkeycodes;
- int ret;
- int fd;
- bool esc_seq = false;
- bool ctrl_seq = false;
- bool ismodifier;
- int keycode;
- int k;
- int x;
- int start;
- fd_set rfds;
- struct timeval tv;
- char ch;
- char buildkey[16];
- int keybuildcount;
- static const char modtable[7] =
+ FAR const struct keycodes_s *pkeycodes;
+ int ret;
+ int fd;
+ bool esc_seq = false;
+ bool ctrl_seq = false;
+ bool ismodifier;
+ int keycode;
+ int k;
+ int x;
+ int start;
+ fd_set rfds;
+ struct timeval tv;
+ char ch;
+ char buildkey[16];
+ int keybuildcount;
+ static const char modtable[7] =
{
PDC_KEY_MODIFIER_SHIFT,
PDC_KEY_MODIFIER_ALT,
@@ -1153,7 +1153,7 @@ static int tcurses_vt100_getkeycode(FAR struct
termcurses_s *dev,
PDC_KEY_MODIFIER_ALT | PDC_KEY_MODIFIER_CONTROL | PDC_KEY_MODIFIER_SHIFT
};
- priv = (FAR struct tcurses_vt100_s *) dev;
+ priv = (FAR struct tcurses_vt100_s *)dev;
fd = priv->in_fd;
/* Watch stdin (fd 0) to see when it has input. */
@@ -1414,13 +1414,13 @@ static int tcurses_vt100_getkeycode(FAR struct
termcurses_s *dev,
static bool tcurses_vt100_checkkey(FAR struct termcurses_s *dev)
{
- FAR struct tcurses_vt100_s *priv;
+ FAR struct tcurses_vt100_s *priv;
int ret;
int fd;
fd_set rfds;
struct timeval tv;
- priv = (FAR struct tcurses_vt100_s *) dev;
+ priv = (FAR struct tcurses_vt100_s *)dev;
fd = priv->in_fd;
/* Test for queued characters */
@@ -1483,7 +1483,7 @@ FAR struct termcurses_s *tcurses_vt100_initialize(int
in_fd, int out_fd)
priv->out_fd = out_fd;
priv->keycount = 0;
- return (FAR struct termcurses_s *) priv;
+ return (FAR struct termcurses_s *)priv;
}
/************************************************************************************
@@ -1499,7 +1499,7 @@ static int tcurses_vt100_terminate(FAR struct
termcurses_s *dev)
FAR struct tcurses_vt100_s *priv;
int fd;
- priv = (FAR struct tcurses_vt100_s *) dev;
+ priv = (FAR struct tcurses_vt100_s *)dev;
fd = priv->out_fd;
/* Set default foreground and background colors.
diff --git a/system/termcurses/termcurses.c b/system/termcurses/termcurses.c
index 0b7b7692c..c9d49be4e 100644
--- a/system/termcurses/termcurses.c
+++ b/system/termcurses/termcurses.c
@@ -78,7 +78,7 @@ int termcurses_initterm(FAR const char *term_type, int in_fd,
int out_fd,
{
/* Default to vt100 as a last resort */
- term_type = (FAR const char *) "vt100";
+ term_type = "vt100";
}
}
@@ -126,7 +126,7 @@ int termcurses_initterm(FAR const char *term_type, int
in_fd, int out_fd,
int termcurses_deinitterm(FAR struct termcurses_s *term)
{
- FAR struct termcurses_dev_s *dev = (FAR struct termcurses_dev_s *) term;
+ FAR struct termcurses_dev_s *dev = (FAR struct termcurses_dev_s *)term;
int result = OK;
/* Call the dev function */
@@ -154,7 +154,7 @@ int termcurses_deinitterm(FAR struct termcurses_s *term)
int termcurses_moveyx(FAR struct termcurses_s *term, int row, int col)
{
- FAR struct termcurses_dev_s *dev = (FAR struct termcurses_dev_s *) term;
+ FAR struct termcurses_dev_s *dev = (FAR struct termcurses_dev_s *)term;
/* Call the dev function */
@@ -177,7 +177,7 @@ int termcurses_moveyx(FAR struct termcurses_s *term, int
row, int col)
int termcurses_setcolors(FAR struct termcurses_s *term,
FAR struct termcurses_colors_s *colors)
{
- FAR struct termcurses_dev_s *dev = (FAR struct termcurses_dev_s *) term;
+ FAR struct termcurses_dev_s *dev = (FAR struct termcurses_dev_s *)term;
/* Call the dev function */
@@ -199,7 +199,7 @@ int termcurses_setcolors(FAR struct termcurses_s *term,
int termcurses_setattribute(FAR struct termcurses_s *term, unsigned long
attrib)
{
- FAR struct termcurses_dev_s *dev = (FAR struct termcurses_dev_s *) term;
+ FAR struct termcurses_dev_s *dev = (FAR struct termcurses_dev_s *)term;
/* Call the dev function */
@@ -221,7 +221,7 @@ int termcurses_setattribute(FAR struct termcurses_s *term,
unsigned long attrib)
int termcurses_getwinsize(FAR struct termcurses_s *term, FAR struct winsize
*winsz)
{
- FAR struct termcurses_dev_s *dev = (FAR struct termcurses_dev_s *) term;
+ FAR struct termcurses_dev_s *dev = (FAR struct termcurses_dev_s *)term;
/* Call the dev function */
@@ -244,7 +244,7 @@ int termcurses_getwinsize(FAR struct termcurses_s *term,
FAR struct winsize *win
int termcurses_getkeycode(FAR struct termcurses_s *term, FAR int *specialkey,
int *keymodifiers)
{
- FAR struct termcurses_dev_s *dev = (FAR struct termcurses_dev_s *) term;
+ FAR struct termcurses_dev_s *dev = (FAR struct termcurses_dev_s *)term;
/* Call the dev function */
@@ -266,7 +266,7 @@ int termcurses_getkeycode(FAR struct termcurses_s *term,
FAR int *specialkey,
bool termcurses_checkkey(FAR struct termcurses_s *term)
{
- FAR struct termcurses_dev_s *dev = (FAR struct termcurses_dev_s *) term;
+ FAR struct termcurses_dev_s *dev = (FAR struct termcurses_dev_s *)term;
/* Call the dev function */
diff --git a/system/zmodem/host/crc16.c b/system/zmodem/host/crc16.c
index f37609996..0f353001c 100644
--- a/system/zmodem/host/crc16.c
+++ b/system/zmodem/host/crc16.c
@@ -99,11 +99,12 @@ static uint16_t crc16_tab[256] =
0x6e17, 0x7e36, 0x4e55, 0x5e74, 0x2e93, 0x3eb2, 0x0ed1, 0x1ef0
};
-#define updcrc(cp, crc) ( crc16_tab[((crc >> 8) & 255)] ^ (crc << 8) ^ cp)
+#define updcrc(cp, crc) (crc16_tab[((crc >> 8) & 255)] ^ (crc << 8) ^ cp)
/************************************************************************************************
* Public Functions
************************************************************************************************/
+
/************************************************************************************************
* Name: crc16part
*
diff --git a/system/zmodem/zm_receive.c b/system/zmodem/zm_receive.c
index b8ab47bf3..47568aaf7 100644
--- a/system/zmodem/zm_receive.c
+++ b/system/zmodem/zm_receive.c
@@ -422,7 +422,7 @@ static int zmr_zsrintdata(FAR struct zm_state_s *pzm)
pzmr->attn = NULL;
if (pzm->pktbuf[0] != '\0')
{
- pzmr->attn = strdup((char *)pzm->pktbuf);
+ pzmr->attn = strdup((FAR char *)pzm->pktbuf);
}
/* And send ZACK */
@@ -1057,7 +1057,7 @@ static int zmr_zstderr(FAR struct zm_state_s *pzm)
zmdbg("ZMR_STATE %d\n", pzm->state);
pzm->pktbuf[pzm->pktlen] = '\0';
- fprintf(stderr, "Message: %s", (char *)pzm->pktbuf);
+ fprintf(stderr, "Message: %s", (FAR char *)pzm->pktbuf);
return OK;
}
diff --git a/system/zmodem/zm_send.c b/system/zmodem/zm_send.c
index 32555c539..02e6eeee6 100644
--- a/system/zmodem/zm_send.c
+++ b/system/zmodem/zm_send.c
@@ -777,7 +777,7 @@ static int zms_sendfilename(FAR struct zm_state_s *pzm)
(unsigned long)pzms->filesize);
#endif
- ptr += strlen((char *)ptr);
+ ptr += strlen((FAR char *)ptr);
*ptr++ = '\0';
len = ptr - pzm->scratch;
@@ -1596,7 +1596,7 @@ ZMSHANDLE zms_initialize(int remfd)
* or command if it were not already active.
*/
- nwritten = zm_remwrite(pzm->remfd, (uint8_t *) "rz\r", 3);
+ nwritten = zm_remwrite(pzm->remfd, (FAR uint8_t *)"rz\r", 3);
if (nwritten < 0)
{
zmdbg("ERROR: zm_remwrite failed: %d\n", (int)nwritten);
diff --git a/testing/ostest/pthread_cleanup.c b/testing/ostest/pthread_cleanup.c
index ccb8fe957..61b19743b 100644
--- a/testing/ostest/pthread_cleanup.c
+++ b/testing/ostest/pthread_cleanup.c
@@ -40,9 +40,9 @@ struct sync_s
* Private Functions
****************************************************************************/
-static void cleanup(FAR void * data)
+static void cleanup(FAR void *data)
{
- FAR struct sync_s *sync = (FAR struct sync_s *) data;
+ FAR struct sync_s *sync = (FAR struct sync_s *)data;
int status;
/* Note: The behavior of canceling pthread_cond_wait() with asynchronous
@@ -69,9 +69,9 @@ static void cleanup(FAR void * data)
}
}
-static void *cleanup_thread(FAR void * data)
+static void *cleanup_thread(FAR void *data)
{
- FAR struct sync_s *sync = (FAR struct sync_s *) data;
+ FAR struct sync_s *sync = (FAR struct sync_s *)data;
int status;
status = pthread_mutex_lock(&sync->lock);
diff --git a/testing/ostest/pthread_rwlock.c b/testing/ostest/pthread_rwlock.c
index 326fa3cd8..89de53a31 100644
--- a/testing/ostest/pthread_rwlock.c
+++ b/testing/ostest/pthread_rwlock.c
@@ -49,7 +49,7 @@ static int g_race_cond_thread_pos;
static FAR void *race_cond_thread1(FAR void *data)
{
- FAR struct race_cond_s *rc = (FAR struct race_cond_s *) data;
+ FAR struct race_cond_s *rc = (FAR struct race_cond_s *)data;
int status;
/* Runs 1st */
@@ -147,7 +147,7 @@ static FAR void *race_cond_thread1(FAR void *data)
static FAR void *race_cond_thread2(FAR void *data)
{
- FAR struct race_cond_s *rc = (FAR struct race_cond_s *) data;
+ FAR struct race_cond_s *rc = (FAR struct race_cond_s *)data;
int status;
status = sem_wait(rc->sem2);
@@ -294,7 +294,7 @@ static void test_two_threads(void)
pthread_join(thread2, NULL);
}
-static void * timeout_thread1(FAR void * data)
+static FAR void *timeout_thread1(FAR void *data)
{
FAR struct race_cond_s *rc = (FAR struct race_cond_s *)data;
int status;
@@ -320,7 +320,7 @@ static void * timeout_thread1(FAR void * data)
return NULL;
}
-static void * timeout_thread2(FAR void * data)
+static FAR void *timeout_thread2(FAR void *data)
{
FAR struct race_cond_s *rc = (FAR struct race_cond_s *)data;
struct timespec time;
diff --git a/testing/ostest/pthread_rwlock_cancel.c
b/testing/ostest/pthread_rwlock_cancel.c
index b087e47e3..c3ff042da 100644
--- a/testing/ostest/pthread_rwlock_cancel.c
+++ b/testing/ostest/pthread_rwlock_cancel.c
@@ -40,7 +40,7 @@ struct sync_s
* Private Functions
****************************************************************************/
-static void * timeout_thread1(FAR void * data)
+static FAR void *timeout_thread1(FAR void *data)
{
FAR struct sync_s *sync = (FAR struct sync_s *)data;
struct timespec time;
@@ -63,7 +63,7 @@ static void * timeout_thread1(FAR void * data)
return NULL;
}
-static void * timeout_thread2(FAR void * data)
+static FAR void *timeout_thread2(FAR void *data)
{
FAR struct sync_s *sync = (FAR struct sync_s *)data;
struct timespec time;
diff --git a/testing/ostest/timedmqueue.c b/testing/ostest/timedmqueue.c
index 15a421ef5..7c9289407 100644
--- a/testing/ostest/timedmqueue.c
+++ b/testing/ostest/timedmqueue.c
@@ -358,7 +358,7 @@ void timedmqueue_test(void)
printf("timedmqueue_test: Waiting for sender to complete\n");
pthread_join(sender, &result);
- if (result != (void *)0)
+ if (result != NULL)
{
printf("timedmqueue_test: ERROR sender thread exited with %d errors\n",
(int)((intptr_t)result));
@@ -396,7 +396,7 @@ void timedmqueue_test(void)
printf("timedmqueue_test: Waiting for receiver to complete\n");
pthread_join(receiver, &result);
- if (result != (void *)0)
+ if (result != NULL)
{
printf("timedmqueue_test: ERROR receiver thread exited "
"with %d errors\n", (int)((intptr_t)result));
diff --git a/testing/smart_test/smart_test.c b/testing/smart_test/smart_test.c
index da7d0a25f..38d63d66f 100644
--- a/testing/smart_test/smart_test.c
+++ b/testing/smart_test/smart_test.c
@@ -117,12 +117,12 @@ static int smart_create_test_file(char *filename)
static int smart_seek_test(char *filename)
{
- FILE *fd;
- char readstring[80];
- char cmpstring[80];
- int index;
- int x;
- int ret = OK;
+ FILE *fd;
+ char readstring[80];
+ char cmpstring[80];
+ int index;
+ int x;
+ int ret = OK;
fd = fopen(filename, "r");
if (fd == NULL)
diff --git a/tools/check-hash.sh b/tools/check-hash.sh
index df5b2e5aa..cdf56bb05 100755
--- a/tools/check-hash.sh
+++ b/tools/check-hash.sh
@@ -59,11 +59,11 @@ esac
if [ `which ${hash_algo}sum 2> /dev/null` ]; then
hash_algo_cmd="${hash_algo}sum"
elif [ `which shasum 2> /dev/null` ]; then
- hash_algo_len=$( echo ${hash_algo} | cut -c 4- )
+ hash_algo_len=$(echo ${hash_algo} | cut -c 4-)
hash_algo_cmd="shasum -a ${hash_algo_len}"
fi
-calc_hash=$( ${hash_algo_cmd} "${file_to_check}" | cut -d' ' -f1 )
+calc_hash=$(${hash_algo_cmd} "${file_to_check}" | cut -d' ' -f1)
# Does it match expected hash?
diff --git a/wireless/bluetooth/btsak/Makefile
b/wireless/bluetooth/btsak/Makefile
index 9edd1f4c0..cd483f8f5 100644
--- a/wireless/bluetooth/btsak/Makefile
+++ b/wireless/bluetooth/btsak/Makefile
@@ -20,7 +20,7 @@
include $(APPDIR)/Make.defs
-# Bluetooth SAK (swiss army knife )
+# Bluetooth SAK (swiss army knife)
CSRCS = btsak_advertise.c btsak_features.c btsak_gatt.c btsak_info.c
CSRCS += btsak_scan.c btsak_security.c
diff --git a/wireless/ieee802154/i8sak/Makefile
b/wireless/ieee802154/i8sak/Makefile
index 5238b4169..b120e2154 100644
--- a/wireless/ieee802154/i8sak/Makefile
+++ b/wireless/ieee802154/i8sak/Makefile
@@ -20,7 +20,7 @@
include $(APPDIR)/Make.defs
-# IEEE 802.15.4 SAK (swiss army knife )
+# IEEE 802.15.4 SAK (swiss army knife)
PROGNAME = $(CONFIG_IEEE802154_I8SAK_PROGNAME)
PRIORITY = $(CONFIG_IEEE802154_I8SAK_PRIORITY)
diff --git a/wireless/ieee802154/i8sak/i8sak_events.c
b/wireless/ieee802154/i8sak/i8sak_events.c
index 7b9ad57e6..25b42cf73 100644
--- a/wireless/ieee802154/i8sak/i8sak_events.c
+++ b/wireless/ieee802154/i8sak/i8sak_events.c
@@ -222,8 +222,7 @@ int i8sak_eventlistener_start(FAR struct i8sak_s *i8sak)
i8sak->eventlistener_run = true;
ret = pthread_create(&i8sak->eventlistener_threadid,
- NULL, i8sak_eventthread,
- (void *)i8sak);
+ NULL, i8sak_eventthread, i8sak);
if (ret != 0)
{
fprintf(stderr, "failed to start event thread: %d\n", ret);
diff --git a/wireless/ieee802154/i8sak/i8sak_main.c
b/wireless/ieee802154/i8sak/i8sak_main.c
index ed255910e..7c1841f9c 100644
--- a/wireless/ieee802154/i8sak/i8sak_main.c
+++ b/wireless/ieee802154/i8sak/i8sak_main.c
@@ -765,7 +765,7 @@ static int i8sak_daemon(int argc, FAR char *argv[])
i8sak->startblaster = false;
ret = pthread_create(&i8sak->blaster_threadid, NULL,
- i8sak_blaster_thread, (void *)i8sak);
+ i8sak_blaster_thread, i8sak);
if (ret != 0)
{
fprintf(stderr, "failed to start blaster thread: %d\n", ret);
@@ -779,7 +779,7 @@ static int i8sak_daemon(int argc, FAR char *argv[])
i8sak->startsniffer = false;
ret = pthread_create(&i8sak->sniffer_threadid, NULL,
- i8sak_sniffer_thread, (void *)i8sak);
+ i8sak_sniffer_thread, i8sak);
if (ret != 0)
{
fprintf(stderr, "failed to start sniffer thread: %d\n", ret);
diff --git a/wireless/ieee802154/libmac/sixlowpan_getreq.c
b/wireless/ieee802154/libmac/sixlowpan_getreq.c
index 071e72b8d..9f07f5ca1 100644
--- a/wireless/ieee802154/libmac/sixlowpan_getreq.c
+++ b/wireless/ieee802154/libmac/sixlowpan_getreq.c
@@ -40,7 +40,7 @@
****************************************************************************/
int sixlowpan_get_req(int sock, FAR const char *ifname,
- FAR const struct ieee802154_get_req_s *req)
+ FAR struct ieee802154_get_req_s *req)
{
struct ieee802154_netmac_s arg;
int ret;
@@ -61,7 +61,7 @@ int sixlowpan_get_req(int sock, FAR const char *ifname,
fprintf(stderr, "MAC802154IOC_MLME_GET_REQUEST failed: %d\n", ret);
}
- memcpy((void *)req, &arg.u.getreq, sizeof(struct ieee802154_get_req_s));
+ memcpy(req, &arg.u.getreq, sizeof(struct ieee802154_get_req_s));
return ret;
}
