sergiotarxz/nuttx-apps
sergiotarxz/nuttx-apps
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Eliminate some warnings

Browse Source
This commit is contained in:
Gregory Nutt 2016-06-12 17:33:49 -06:00
parent 586b0aa7e0
commit 4a0db11565
4 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
netutils/tftpc/tftpc_get.c
View File

@ -119,12 +119,13 @@ static inline int tftp_parsedatapacket(const uint8_t *packet,
*blockno = (uint16_t)packet[2] << 8 | (uint16_t)packet[3]; *blockno = (uint16_t)packet[2] << 8 | (uint16_t)packet[3];
return OK; return OK;
} }
#if defined(CONFIG_DEBUG_FEATURES) && defined(CONFIG_DEBUG_NET) #ifdef CONFIG_DEBUG_NET_WARN
else if (*opcode == TFTP_ERR) else if (*opcode == TFTP_ERR)
{ {
(void)tftp_parseerrpacket(packet); (void)tftp_parseerrpacket(packet);
} }
#endif #endif
return ERROR; return ERROR;
} }

2
netutils/tftpc/tftpc_internal.h
View File

@ -162,7 +162,7 @@ extern int tftp_sockinit(struct sockaddr_in *server, in_addr_t addr);
extern int tftp_mkreqpacket(uint8_t *buffer, int opcode, const char *path, bool binary); extern int tftp_mkreqpacket(uint8_t *buffer, int opcode, const char *path, bool binary);
extern int tftp_mkackpacket(uint8_t *buffer, uint16_t blockno); extern int tftp_mkackpacket(uint8_t *buffer, uint16_t blockno);
extern int tftp_mkerrpacket(uint8_t *buffer, uint16_t errorcode, const char *errormsg); extern int tftp_mkerrpacket(uint8_t *buffer, uint16_t errorcode, const char *errormsg);
#if defined(CONFIG_DEBUG_FEATURES) && defined(CONFIG_DEBUG_NET) #ifdef CONFIG_DEBUG_NET_WARN
extern int tftp_parseerrpacket(const uint8_t *packet); extern int tftp_parseerrpacket(const uint8_t *packet);
#endif #endif

11
netutils/tftpc/tftpc_packets.c
View File

@ -207,18 +207,19 @@ int tftp_mkerrpacket(uint8_t *buffer, uint16_t errorcode, const char *errormsg)
* *
****************************************************************************/ ****************************************************************************/
#if defined(CONFIG_DEBUG_FEATURES) && defined(CONFIG_DEBUG_NET) #ifdef CONFIG_DEBUG_NET_WARN
int tftp_parseerrpacket(const uint8_t *buffer) int tftp_parseerrpacket(const uint8_t *buffer)
{ {
uint16_t opcode = (uint16_t)buffer[0] << 8 | (uint16_t)buffer[1]; uint16_t opcode = (uint16_t)buffer[0] << 8 | (uint16_t)buffer[1];
uint16_t errcode = (uint16_t)buffer[2] << 8 | (uint16_t)buffer[3]; uint16_t errcode = (uint16_t)buffer[2] << 8 | (uint16_t)buffer[3];
const char *errmsg = (const char *)&buffer[4]; FAR const char *errmsg = (const char *)&buffer[4];
if (opcode == TFTP_ERR) if (opcode == TFTP_ERR)
{ {
nerr("ERR message: %s (%d)\n", errmsg, errcode); ninfo("ERR message: %s (%d)\n", errmsg, errcode);
return OK; return OK;
} }
return ERROR; return ERROR;
} }
#endif #endif

5
netutils/tftpc/tftpc_put.c
View File

@ -270,8 +270,9 @@ static int tftp_rcvack(int sd, uint8_t *packet, struct sockaddr_in *server,
if (opcode != TFTP_ACK) if (opcode != TFTP_ACK)
{ {
ninfo("Bad opcode\n"); nwarn("WARNING: Bad opcode\n");
#if defined(CONFIG_DEBUG_FEATURES) && defined(CONFIG_DEBUG_NET)
#ifdef CONFIG_DEBUG_NET_WARN
if (opcode == TFTP_ERR) if (opcode == TFTP_ERR)
{ {
(void)tftp_parseerrpacket(packet); (void)tftp_parseerrpacket(packet);