pkarashchenko commented on code in PR #1340:
URL:
https://github.com/apache/incubator-nuttx-apps/pull/1340#discussion_r992661169
##########
examples/netloop/lo_listener.c:
##########
@@ -297,7 +297,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 *)1;
Review Comment:
Please fix long line at line 88 as well
##########
examples/pipe/transfer_test.c:
##########
@@ -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 *)1;
Review Comment:
ditto
##########
examples/pipe/transfer_test.c:
##########
@@ -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 *)1;
Review Comment:
ditto
##########
examples/pipe/transfer_test.c:
##########
@@ -204,26 +195,49 @@ int transfer_test(int fdin, int fdout)
fprintf(stderr, \
"transfer_test: Failed to create transfer_reader thread, \
error=%d\n", ret);
+=======
+ printf("transfer_test: Starting transfer_reader thread\n");
+ ret = pthread_create(&readerid, NULL,
+ transfer_reader, (pthread_addr_t)fdin);
+ if (ret != 0)
+ {
+ fprintf(stderr, "transfer_test: Failed to create transfer_reader"
+ " thread, error=%d\n", ret);
+>>>>>>> Fix the minor style issue
return 1;
}
/* Start transfer_writer thread */
printf("transfer_test: Starting transfer_writer thread\n");
+<<<<<<< HEAD
ret = pthread_create(&writerid, \
NULL, transfer_writer, (void *)(intptr_t)fdout);
if (ret != 0)
{
fprintf(stderr, \
"transfer_test: Failed to create transfer_writer thread, \
error=%d\n", ret);
+=======
+ ret = pthread_create(&writerid, NULL,
+ transfer_writer, (pthread_addr_t)fdout);
+ if (ret != 0)
+ {
+ fprintf(stderr, "transfer_test: Failed to create transfer_writer "
+ "thread, error=%d\n", ret);
+>>>>>>> Fix the minor style issue
pthread_detach(readerid);
ret = pthread_cancel(readerid);
if (ret != 0)
{
+<<<<<<< HEAD
fprintf(stderr, \
"transfer_test: Failed to cancel transfer_reader thread, \
error=%d\n", ret);
+=======
Review Comment:
ditto
##########
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));
Review Comment:
```suggestion
&optval, sizeof(optval));
```
##########
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;
+ char *ip = (FAR uint8_t *)&ip2.s_addr;
Review Comment:
quite a strange cast
##########
examples/pipe/transfer_test.c:
##########
@@ -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 *)2;
Review Comment:
ditto
##########
examples/poll/net_listener.c:
##########
@@ -343,7 +343,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 *)1;
Review Comment:
ditto
##########
examples/pipe/transfer_test.c:
##########
@@ -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 *)4;
Review Comment:
ditto
##########
examples/pipe/interlock_test.c:
##########
@@ -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 *)1;
Review Comment:
seems to be a revert of recently merged change. Maybe we need additional
cast to `uintptr_t`?
##########
examples/pipe/transfer_test.c:
##########
@@ -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 *)1;
}
else if (ret != WRITE_SIZE)
{
fprintf(stderr, \
"transfer_writer: Unexpected write size=%d\n", ret);
- p = (void *) 2;
- return p;
+ return (void *)2;
Review Comment:
ditto
##########
examples/pipe/transfer_test.c:
##########
@@ -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 *)3;
Review Comment:
ditto
##########
examples/pipe/transfer_test.c:
##########
@@ -204,26 +195,49 @@ int transfer_test(int fdin, int fdout)
fprintf(stderr, \
"transfer_test: Failed to create transfer_reader thread, \
error=%d\n", ret);
+=======
+ printf("transfer_test: Starting transfer_reader thread\n");
+ ret = pthread_create(&readerid, NULL,
+ transfer_reader, (pthread_addr_t)fdin);
+ if (ret != 0)
+ {
+ fprintf(stderr, "transfer_test: Failed to create transfer_reader"
+ " thread, error=%d\n", ret);
+>>>>>>> Fix the minor style issue
return 1;
}
/* Start transfer_writer thread */
printf("transfer_test: Starting transfer_writer thread\n");
+<<<<<<< HEAD
ret = pthread_create(&writerid, \
NULL, transfer_writer, (void *)(intptr_t)fdout);
if (ret != 0)
{
fprintf(stderr, \
"transfer_test: Failed to create transfer_writer thread, \
error=%d\n", ret);
+=======
Review Comment:
ditto
##########
examples/pipe/transfer_test.c:
##########
@@ -204,26 +195,49 @@ int transfer_test(int fdin, int fdout)
fprintf(stderr, \
"transfer_test: Failed to create transfer_reader thread, \
error=%d\n", ret);
+=======
Review Comment:
Please resolve merge conflict
##########
netutils/pppd/ipcp.c:
##########
@@ -346,10 +346,10 @@ 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);
Review Comment:
```suggestion
netlib_ifup((FAR char *)ctx->ifname);
netlib_set_ipv4addr((FAR char *)ctx->ifname, &ctx->local_ip);
```
##########
platform/mikroe-stm32f4/mikroe_configdata.c:
##########
@@ -94,7 +94,7 @@ 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);
Review Comment:
```suggestion
ret = ioctl(fd, CFGDIOC_SETCONFIG, (unsigned long)&config);
```
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscr...@nuttx.apache.org
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
